Skip to content

Commit b4820d0

Browse files
mmjeemmjee
authored
Merge branch 'develop' into feature/arcana-auth
2 parents 63a9772 + 64fe1c0 commit b4820d0

File tree

71 files changed

+4232
-2895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+4232
-2895
lines changed

‎.github/workflows/issue-to-notion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
STATE: ${{ github.event.issue.state }}
2222
ISSUE_URL: ${{ github.event.issue.html_url }}
2323
TITLE: ${{ github.event.issue.title }}
24-
FLAG: Next Sprint
24+
FLAG: Next Sprint,Github
2525
DATABASE_NAME: Product
2626
STATUS: Backlog
2727
# Product Work Board

‎docs/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,40 +45,40 @@
4545
"tslib": "^2.4.1",
4646
"typescript": "^5.0.4",
4747
"unplugin-icons": "^0.14.0",
48-
"vite": "^4.2.2"
48+
"vite": "^4.3.9"
4949
},
5050
"type": "module",
5151
"dependencies": {
5252
"@web3-onboard/arcana-auth": "^2.0.0-alpha.1",
53-
"@web3-onboard/blocto": "^2.0.0-alpha.1",
54-
"@web3-onboard/cede-store": "^2.0.2",
55-
"@web3-onboard/coinbase": "^2.2.4",
56-
"@web3-onboard/core": "^2.20.3-alpha.1",
53+
"@web3-onboard/blocto": "^2.0.0",
54+
"@web3-onboard/cede-store": "^2.1.0-alpha.1",
55+
"@web3-onboard/coinbase": "^2.2.5-alpha.1",
56+
"@web3-onboard/core": "^2.20.5-alpha.1",
5757
"@web3-onboard/dcent": "^2.2.7",
5858
"@web3-onboard/enkrypt": "^2.0.4",
5959
"@web3-onboard/fortmatic": "^2.0.19",
60-
"@web3-onboard/frame": "^2.0.1",
60+
"@web3-onboard/frame": "^2.0.2-alpha.1",
6161
"@web3-onboard/frontier": "^2.0.4",
6262
"@web3-onboard/gas": "^2.1.8",
6363
"@web3-onboard/gnosis": "^2.1.10",
6464
"@web3-onboard/infinity-wallet": "^2.0.4",
65-
"@web3-onboard/injected-wallets": "^2.10.1",
65+
"@web3-onboard/injected-wallets": "^2.10.2",
6666
"@web3-onboard/keepkey": "^2.3.7",
6767
"@web3-onboard/keystone": "^2.3.7",
68-
"@web3-onboard/ledger": "^2.4.6",
68+
"@web3-onboard/ledger": "^2.5.1",
6969
"@web3-onboard/magic": "^2.1.7",
7070
"@web3-onboard/mew-wallet": "^2.0.4",
71-
"@web3-onboard/phantom": "^2.0.2",
71+
"@web3-onboard/phantom": "^2.0.3",
7272
"@web3-onboard/portis": "^2.1.7",
7373
"@web3-onboard/sequence": "^2.0.8",
74-
"@web3-onboard/taho": "^2.0.4",
74+
"@web3-onboard/taho": "^2.0.5",
7575
"@web3-onboard/torus": "^2.2.5",
7676
"@web3-onboard/transaction-preview": "^2.0.8",
7777
"@web3-onboard/trezor": "^2.4.2",
7878
"@web3-onboard/trust": "^2.0.4",
79-
"@web3-onboard/uauth": "^2.0.5",
79+
"@web3-onboard/uauth": "^2.1.1",
8080
"@web3-onboard/venly": "^2.0.0",
81-
"@web3-onboard/walletconnect": "^2.3.9",
81+
"@web3-onboard/walletconnect": "^2.4.2-alpha.1",
8282
"@web3-onboard/web3auth": "^2.2.3",
8383
"@web3-onboard/xdefi": "^2.0.4",
8484
"@web3-onboard/zeal": "^2.0.4",

‎docs/src/app.html‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@
2121
<!-- Google tag (gtag.js) -->
2222
<script async src="https://www.googletagmanager.com/gtag/js?id=G-WQ8M55VX1Z"></script>
2323
<script>
24-
window.dataLayer = window.dataLayer || [];
25-
function gtag(){dataLayer.push(arguments);}
26-
gtag('js', new Date());
27-
gtag('config', 'G-WQ8M55VX1Z');
24+
window.dataLayer = window.dataLayer || []
25+
function gtag() {
26+
dataLayer.push(arguments)
27+
}
28+
gtag('js', new Date())
29+
gtag('config', 'G-WQ8M55VX1Z')
30+
</script>
31+
<script>
32+
var global = global || window
2833
</script>
2934
</head>
3035
<body data-sveltekit-preload-data="hover">

‎docs/src/lib/services/onboard.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,12 @@ const intiOnboard = async (theme) => {
6666
const coinbase = coinbaseModule()
6767
const dcent = dcentModule()
6868
const walletConnect = walletConnectModule({
69-
connectFirstChainId: true,
70-
version: 2,
71-
projectId: 'f6bd6e2911b56f5ac3bc8b2d0e2d7ad5',
72-
qrcodeModalOptions: {
73-
mobileLinks: ['rainbow', 'metamask', 'argent', 'trust', 'imtoken', 'pillar']
74-
}
69+
projectId: 'f6bd6e2911b56f5ac3bc8b2d0e2d7ad5'
70+
})
71+
const ledger = ledgerModule({
72+
walletConnectVersion: 2,
73+
projectId: 'f6bd6e2911b56f5ac3bc8b2d0e2d7ad5'
7574
})
76-
const ledger = ledgerModule()
7775
const keystone = keystoneModule()
7876
const keepkey = keepkeyModule()
7977
const gnosis = gnosisModule()
@@ -103,7 +101,8 @@ const intiOnboard = async (theme) => {
103101
const uauthOptions = {
104102
clientID: 'a25c3a65-a1f2-46cc-a515-a46fe7acb78c',
105103
redirectUri: 'http://localhost:8080/',
106-
scope: 'openid wallet email:optional humanity_check:optional profile:optional social:optional'
104+
scope: 'openid wallet email:optional humanity_check:optional profile:optional social:optional',
105+
walletConnectProjectId: 'f6bd6e2911b56f5ac3bc8b2d0e2d7ad5'
107106
}
108107
const uauth = uauthModule(uauthOptions)
109108

@@ -120,6 +119,7 @@ const intiOnboard = async (theme) => {
120119
})
121120

122121
return Onboard({
122+
connect: { autoConnectAllPreviousWallet: true },
123123
wallets: [
124124
injected,
125125
walletConnect,
@@ -226,7 +226,8 @@ const intiOnboard = async (theme) => {
226226
recommendedInjectedWallets: [
227227
{ name: 'MetaMask', url: 'https://metamask.io' },
228228
{ name: 'Coinbase', url: 'https://wallet.coinbase.com/' }
229-
]
229+
],
230+
explore: 'https://onboard.blocknative.com/'
230231
},
231232
accountCenter: { desktop: { enabled: true }, mobile: { enabled: true } },
232233
theme: theme || 'system',

‎docs/src/routes/docs/[...3]modules/[...1]core/+page.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ This is the core package that contains all of the UI and logic to be able to sea
1919

2020
:::admonition type="tip"
2121
_note: Release 2.24.0 moves the default position of the account center from topRight to bottomRight. To reset your application to topRight, include the following when initializing onboard:_
22+
2223
```typescript
2324
accountCenter: {
2425
desktop: {
@@ -31,6 +32,7 @@ _note: Release 2.24.0 moves the default position of the account center from topR
3132
}
3233
}
3334
```
35+
3436
:::
3537

3638
## Install
@@ -279,6 +281,16 @@ type ConnectModalOptions = {
279281
* Defaults to `https://www.blocknative.com/blog/metamask-wont-connect-web3-wallet-troubleshooting`
280282
*/
281283
wheresMyWalletLink?: string
284+
/**
285+
* Hide the "Where is my wallet?" link notice displayed in the connect modal
286+
* at the bottom of the wallets list
287+
*/
288+
removeWhereIsMyWalletWarning?: boolean
289+
/**
290+
* Hide the "I don't have a wallet" link displayed
291+
* on the left panel of the connect modal
292+
*/
293+
removeIDontHaveAWalletInfoLink?: boolean
282294
/**
283295
* @deprecated Has no effect unless `@web3-onboard/unstoppable-resolution`
284296
* package has been added and passed into the web3-onboard initialization

‎docs/src/routes/docs/[...4]wallets/[...10]injected/+page.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ const injected = injectedModule({
335335
- Safeheron - _Desktop_
336336
- Talisman - _Desktop_
337337
- OneKey - _Desktop & Mobile_
338+
- Fordefi - _Desktop_
338339

339340
## Build Environments
340341

‎docs/src/routes/docs/[...4]wallets/[...13]ledger/+page.md‎

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,44 @@ npm install @web3-onboard/core @web3-onboard/ledger
2828
## Options
2929

3030
```typescript
31-
interface LedgerOptions {
31+
type LedgerOptionsWCv1 = {
32+
/**
33+
* @deprecated
34+
* Version 1 of WalletConnect has been deprecated by the WC team and the WC bridge is not available.
35+
* To use version 1 a custom bridge url will need to be provided.
36+
* Support will be completely remove from Web3-Onboard in the future
37+
*/
38+
walletConnectVersion?: 1
39+
enableDebugLogs?: boolean
3240
chainId?: number
3341
bridge?: string
3442
infuraId?: string
3543
rpc?: { [chainId: number]: string }
3644
}
45+
46+
type LedgerOptionsWCv2 = {
47+
walletConnectVersion: 2
48+
enableDebugLogs?: boolean
49+
/**
50+
* Project ID associated with [WalletConnect account](https://cloud.walletconnect.com)
51+
*/
52+
projectId: string
53+
/**
54+
* List of Optional Chain(s) ID for wallets to support in number format (integer or hex)
55+
* Defaults to the chains provided within the web3-onboard init chain property
56+
*/
57+
requiredChains?: string[] | number[]
58+
requiredMethods?: string[]
59+
/**
60+
* Additional methods to be added to the default list of ['eth_sendTransaction', 'eth_signTransaction', 'personal_sign', 'eth_sign', 'eth_signTypedData', 'eth_signTypedData_v4']
61+
* Passed methods to be included along with the defaults methods - see https://docs.walletconnect.com/2.0/web/walletConnectModal/options
62+
*/
63+
optionalMethods?: string[]
64+
requiredEvents?: string[]
65+
optionalEvents?: string[]
66+
}
67+
68+
type LedgerOptions = LedgerOptionsWCv1 | LedgerOptionsWCv2
3769
```
3870
3971
## Usage
@@ -42,7 +74,16 @@ interface LedgerOptions {
4274
import Onboard from '@web3-onboard/core'
4375
import ledgerModule from '@web3-onboard/ledger'
4476

45-
const ledger = ledgerModule()
77+
const ledger = ledgerModule({
78+
/**
79+
* Project ID associated with [WalletConnect account](https://cloud.walletconnect.com)
80+
*/
81+
projectId: 'abc123...',
82+
/**
83+
* Chains required to be supported by all wallets connecting to your DApp
84+
*/
85+
requiredChains: [1, 137]
86+
})
4687

4788
const onboard = Onboard({
4889
// ... other Onboard options

‎docs/src/routes/docs/[...4]wallets/[...23]uauth/+page.md‎

Lines changed: 50 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,49 @@ Follow the [Login Client Congifuration Docs](https://docs.unstoppabledomains.com
3232

3333
```typescript
3434
type UauthInitOptions = {
35-
clientID: string // required and will throw an error if not included: links dapp to Unstoppable Domains for customization
36-
redirectUri: string // required and will throw an error if not included: used for pop-up and callback redirection
37-
scope?: string // default = 'openid wallet'
38-
shouldLoginWithRedirect?: boolean // if true, redirects to your callback page
39-
bridge?: string // default = 'https://bridge.walletconnect.org'
40-
qrcodeModalOptions?: {
41-
mobileLinks: string[] // set the order and list of mobile linking wallets
42-
}
43-
connectFirstChainId?: boolean // if true, connects to the first network chain provided
35+
/**
36+
* Required and will throw an error if not included: links dapp to Unstoppable Domains for customization
37+
*/
38+
clientID: string
39+
/**
40+
* Required and will throw an error if not included: used for pop-up and callback redirection
41+
*/
42+
redirectUri: string
43+
/**
44+
* Optional string: Default = 'openid wallet'
45+
*/
46+
scope?: string
47+
/**
48+
* Optional boolean: If true, redirects to your callback page
49+
*/
50+
shouldLoginWithRedirect?: boolean
51+
/**
52+
* Project ID associated with [WalletConnect account](https://cloud.walletconnect.com)
53+
*/
54+
walletConnectProjectId: string
55+
/**
56+
* Defaults to version: 2
57+
*/
58+
version?: 2
59+
/**
60+
* List of Required Chain(s) ID for wallets to support in number format (integer or hex)
61+
* Defaults to [1] - Ethereum
62+
*/
63+
requiredChains?: number[] | undefined
64+
/**
65+
* List of Optional Chain(s) ID for wallets to support in number format (integer or hex)
66+
* Defaults to the chains provided within the web3-onboard init chain property
67+
*/
68+
optionalChains?: number[] | undefined
69+
/**
70+
* Additional methods to be added to the default list of ['eth_sendTransaction', 'eth_signTransaction', 'personal_sign', 'eth_sign', 'eth_signTypedData', 'eth_signTypedData_v4']
71+
* Passed methods to be included along with the defaults methods - see https://docs.walletconnect.com/2.0/web/walletConnectModal/options
72+
*/
73+
additionalOptionalMethods?: string[] | undefined
74+
/**
75+
* Optional function to handle WalletConnect URI when it becomes available
76+
*/
77+
handleUri?: (uri: string) => Promise<unknown>
4478
}
4579
```
4680
@@ -52,21 +86,18 @@ import uauthModule from '@web3-onboard/uauth'
5286

5387
// initialize the module with options
5488
const uauth = uauthModule({
55-
clientID: 'YOUR_CLIENT_ID',
56-
redirectUri: 'YOUR_REDIRECT_URI',
57-
scope?: 'YOUR_SCOPES',
58-
shouldLoginWithRedirect?: false
59-
bridge?: 'YOUR_CUSTOM_BRIDGE_SERVER',
60-
qrcodeModalOptions?: {
61-
mobileLinks: ['rainbow', 'metamask', 'argent', 'trust', 'imtoken', 'pillar']
62-
},
63-
connectFirstChainId?: true
89+
clientID: 'a25c3a65-a1f2-46cc-a515-a46fe7acb78c',
90+
walletConnectProjectId: 'f6bd6e2911b56f5ac3bc8b2d0e2d7ad5',
91+
redirectUri: 'http://localhost:8080/',
92+
scope:
93+
'openid wallet email:optional humanity_check:optional profile:optional social:optional'
6494
})
6595

6696
// can also initialize with basic options...
6797
// const uauth = uauthModule({
6898
// clientID: "YOUR_CLIENT_ID",
69-
// redirectUri: "YOUR_REDIRECT_URI"
99+
// redirectUri: "YOUR_REDIRECT_URI",
100+
// walletConnectProjectId: 'f6bd6e2911b56f5ac3bc8b2d0e2d7ad5',
70101
// })
71102

72103
const onboard = Onboard({

0 commit comments

Comments
 (0)