Skip to content

Commit 306abcb

Browse files
mytangyingmytangying
committed
Merge remote-tracking branch 'upstream/develop' into add_stablewallet
2 parents 4a3655d + ed43a00 commit 306abcb

File tree

34 files changed

+225
-50
lines changed

34 files changed

+225
-50
lines changed

‎.github/ISSUE_TEMPLATE/BUG.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ body:
4646
- '@web3-onboard/decent'
4747
- '@web3-onboard/formatic'
4848
- '@web3-onboard/gnosis'
49-
- '@web3-onboard/injected'
49+
- '@web3-onboard/injected-wallets'
5050
- '@web3-onboard/keepkey'
5151
- '@web3-onboard/keystone'
5252
- '@web3-onboard/ledger'

‎docs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@web3-onboard/capsule": "^2.0.1",
5959
"@web3-onboard/cede-store": "^2.2.0",
6060
"@web3-onboard/coinbase": "^2.2.7",
61-
"@web3-onboard/core": "^2.21.4",
61+
"@web3-onboard/core": "^2.21.5",
6262
"@web3-onboard/dcent": "^2.2.7",
6363
"@web3-onboard/enkrypt": "^2.0.4",
6464
"@web3-onboard/fortmatic": "^2.0.19",
@@ -67,12 +67,12 @@
6767
"@web3-onboard/gas": "^2.1.8",
6868
"@web3-onboard/gnosis": "^2.1.10",
6969
"@web3-onboard/infinity-wallet": "^2.0.4",
70-
"@web3-onboard/injected-wallets": "^2.10.14-alpha.1",
70+
"@web3-onboard/injected-wallets": "^2.10.15",
7171
"@web3-onboard/keepkey": "^2.3.7",
7272
"@web3-onboard/keystone": "^2.3.7",
7373
"@web3-onboard/ledger": "^2.6.0",
7474
"@web3-onboard/magic": "^2.1.7",
75-
"@web3-onboard/metamask": "^2.0.4-alpha.1",
75+
"@web3-onboard/metamask": "^2.0.4",
7676
"@web3-onboard/mew-wallet": "^2.0.4",
7777
"@web3-onboard/phantom": "^2.0.3",
7878
"@web3-onboard/portis": "^2.1.7",

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,12 @@ const intiOnboard = async (theme) => {
247247
token: 'OETH',
248248
label: 'Optimism',
249249
rpcUrl: 'https://mainnet.optimism.io'
250+
},
251+
{
252+
id: 666666666,
253+
token: 'DEGEN',
254+
label: 'Degen',
255+
rpcUrl: 'https://rpc.degen.tips'
250256
}
251257
],
252258
appMetadata: {

‎docs/src/routes/+page.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<TabPanel value="npm">
1414

1515
```sh copy
16-
npm i @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
16+
npm i @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
1717
```
1818

1919
</TabPanel>
2020
<TabPanel value="yarn">
2121

2222
```sh copy
23-
yarn add @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
23+
yarn add @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
2424
```
2525

2626
</TabPanel>
@@ -32,14 +32,14 @@ yarn add @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-pre
3232
<TabPanel value="npm">
3333

3434
```sh copy
35-
npm i @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
35+
npm i @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
3636
```
3737

3838
</TabPanel>
3939
<TabPanel value="yarn">
4040

4141
```sh copy
42-
yarn add @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
42+
yarn add @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
4343
```
4444

4545
</TabPanel>
@@ -48,14 +48,14 @@ yarn add @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-pre
4848
<TabPanel value="npm">
4949

5050
```sh copy
51-
npm i @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
51+
npm i @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
5252
```
5353

5454
</TabPanel>
5555
<TabPanel value="yarn">
5656

5757
```sh copy
58-
yarn add @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
58+
yarn add @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
5959
```
6060

6161
</TabPanel>

‎docs/src/routes/docs/[...1]overview/[...1]introduction/+page.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ web3-onboard supports ALL EVM networks. Supporting a new network is simply a mat
4545
- Avalanche
4646
- BNB Chain
4747
- Celo
48+
- Degen
4849
- Fantom
4950
- Gnosis Chain
5051
- Harmony One
@@ -132,6 +133,12 @@ const onboard = Onboard({
132133
token: 'ETH',
133134
label: 'Celo',
134135
rpcUrl: 'https://1rpc.io/celo'
136+
},
137+
{
138+
id: 666666666,
139+
token: 'DEGEN',
140+
label: 'Degen',
141+
rpcUrl: 'https://rpc.degen.tips'
135142
}
136143
]
137144
})

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,12 @@ const onboard = Onboard({
677677
token: 'ETH',
678678
label: 'Celo',
679679
rpcUrl: 'https://1rpc.io/celo'
680+
},
681+
{
682+
id: 666666666,
683+
token: 'DEGEN',
684+
label: 'Degen',
685+
rpcUrl: 'https://rpc.degen.tips'
680686
}
681687
],
682688
appMetadata: {

‎docs/src/routes/docs/[...3]modules/[...5]transaction-preview/+page.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ Full Simulation Platform API documentation can be found [here](https://docs.bloc
2727
<TabPanel value="yarn">
2828

2929
```sh copy
30-
yarn add @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
30+
yarn add @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
3131
```
3232

3333
</TabPanel>
3434
<TabPanel value="npm">
3535

3636
```sh copy
37-
npm i @web3-onboard/core @web3-onboard/injected @web3-onboard/transaction-preview
37+
npm i @web3-onboard/core @web3-onboard/injected-wallets @web3-onboard/transaction-preview
3838
```
3939

4040
</TabPanel>
@@ -48,7 +48,7 @@ To use the Transaction Preview package with web3-onboard all a developer needs t
4848

4949
```typescript copy
5050
import Onboard from '@web3-onboard/core'
51-
import injectedModule from '@web3-onboard/injected'
51+
import injectedModule from '@web3-onboard/injected-wallets'
5252
import transactionPreviewModule from '@web3-onboard/transaction-preview'
5353

5454
const injected = injectedModule()

‎docs/src/routes/examples/[...1]connect-wallet/+page.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,12 @@ const chains = [
161161
token: 'ETH',
162162
label: 'Celo',
163163
rpcUrl: 'https://1rpc.io/celo'
164+
},
165+
{
166+
id: 666666666,
167+
token: 'DEGEN',
168+
label: 'Degen',
169+
rpcUrl: 'https://rpc.degen.tips'
164170
}
165171
]
166172

@@ -423,6 +429,12 @@ const chains = [
423429
token: 'ETH',
424430
label: 'Celo',
425431
rpcUrl: 'https://1rpc.io/celo'
432+
},
433+
{
434+
id: 666666666,
435+
token: 'DEGEN',
436+
label: 'Degen',
437+
rpcUrl: 'https://rpc.degen.tips'
426438
}
427439
]
428440

@@ -511,4 +523,4 @@ Now that we have our wallet connected, let's display some basic information, suc
511523
512524
## Interacting with the providers - Transfer, Send, Sign using ethers.js
513525
514-
For examples of interacting with the wallet providers please see our demo project [here](https://github.com/blocknative/web3-onboard/blob/9b871a1b3117e92a7c87285677fa5b35c544a8e0/packages/demo/src/App.svelte#L447)
526+
For examples of interacting with the wallet providers please see our demo project [here](https://github.com/blocknative/web3-onboard/blob/9b871a1b3117e92a7c87285677fa5b35c544a8e0/packages/demo/src/App.svelte#L447)

‎docs/src/routes/examples/[...2]uniswap-widget/+page.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ const polygonMainnet = {
5959
rpcUrl: 'https://matic-mainnet.chainstacklabs.com'
6060
}
6161

62+
const degenChain = {
63+
id: 666666666,
64+
token: 'DEGEN',
65+
label: 'Degen',
66+
rpcUrl: 'https://rpc.degen.tips'
67+
}
68+
6269
const chains = [ethereumRopsten, polygonMainnet]
6370

6471
const wallets = [injectedModule()]

‎examples/with-ledger/pages/index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ init({
6464
token: 'FTM',
6565
label: 'Fantom',
6666
rpcUrl: 'https://rpc.ftm.tools/'
67+
},
68+
{
69+
id: 666666666,
70+
token: 'DEGEN',
71+
label: 'Degen',
72+
rpcUrl: 'https://rpc.degen.tips'
6773
}
6874
],
6975
appMetadata: {

‎examples/with-nextjs-13/web3-onboard.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@ export default init({
129129
token: 'ETH',
130130
label: 'Celo',
131131
rpcUrl: 'https://1rpc.io/celo'
132+
},
133+
{
134+
id: 666666666,
135+
token: 'DEGEN',
136+
label: 'Degen',
137+
rpcUrl: 'https://rpc.degen.tips'
132138
}
133139
],
134140
appMetadata: {

‎examples/with-nextjs/pages/_app.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ const celoMainnet = {
2828
token: 'ETH',
2929
label: 'Celo',
3030
rpcUrl: 'https://1rpc.io/celo'
31+
},
32+
{
33+
id: 666666666,
34+
token: 'DEGEN',
35+
label: 'Degen',
36+
rpcUrl: 'https://rpc.degen.tips'
3137
}
3238

3339
const chains = [ethereumRopsten, polygonMainnet, baseMainnet,celoMainnet]

‎examples/with-solidjs/src/providers/onboard-provider/options.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ export const chains = [
3434
token: 'ETH',
3535
label: 'Celo',
3636
rpcUrl: 'https://1rpc.io/celo'
37+
},
38+
{
39+
id: 666666666,
40+
token: 'DEGEN',
41+
label: 'Degen',
42+
rpcUrl: 'https://rpc.degen.tips'
3743
}
3844
];
3945

‎examples/with-sveltekit/src/lib/web3-onboard.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ const chains = [
3939
token: 'ETH',
4040
label: 'Celo',
4141
rpcUrl: 'https://1rpc.io/celo'
42+
},
43+
{
44+
id: 666666666,
45+
token: 'DEGEN',
46+
label: 'Degen',
47+
rpcUrl: 'https://rpc.degen.tips'
4248
}
4349
]
4450

‎examples/with-sveltekit/yarn.lock

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,6 +3018,16 @@ function-bind@^1.1.2:
30183018
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
30193019
integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
30203020

3021+
function-bind@^1.1.2:
3022+
version "1.1.2"
3023+
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
3024+
integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
3025+
3026+
function-bind@^1.1.2:
3027+
version "1.1.2"
3028+
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
3029+
integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
3030+
30213031
get-caller-file@^2.0.1:
30223032
version "2.0.5"
30233033
resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -3163,6 +3173,40 @@ hash-base@~3.0:
31633173
inherits "^2.0.1"
31643174
safe-buffer "^5.0.1"
31653175

3176+
hash-base@^3.0.0:
3177+
version "3.1.0"
3178+
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
3179+
integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
3180+
dependencies:
3181+
inherits "^2.0.4"
3182+
readable-stream "^3.6.0"
3183+
safe-buffer "^5.2.0"
3184+
3185+
hash-base@~3.0:
3186+
version "3.0.4"
3187+
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
3188+
integrity sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==
3189+
dependencies:
3190+
inherits "^2.0.1"
3191+
safe-buffer "^5.0.1"
3192+
3193+
hash-base@^3.0.0:
3194+
version "3.1.0"
3195+
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
3196+
integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
3197+
dependencies:
3198+
inherits "^2.0.4"
3199+
readable-stream "^3.6.0"
3200+
safe-buffer "^5.2.0"
3201+
3202+
hash-base@~3.0:
3203+
version "3.0.4"
3204+
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
3205+
integrity sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==
3206+
dependencies:
3207+
inherits "^2.0.1"
3208+
safe-buffer "^5.0.1"
3209+
31663210
hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3, hash.js@^1.1.7:
31673211
version "1.1.7"
31683212
resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
@@ -4300,6 +4344,16 @@ sourcemap-codec@^1.4.8:
43004344
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
43014345
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
43024346

4347+
sourcemap-codec@^1.4.8:
4348+
version "1.4.8"
4349+
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
4350+
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
4351+
4352+
sourcemap-codec@^1.4.8:
4353+
version "1.4.8"
4354+
resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
4355+
integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
4356+
43034357
split-on-first@^1.0.0:
43044358
version "1.1.0"
43054359
resolved "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"

‎examples/with-vanilla-js/src/onboard.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ const chains = [
3535
token: 'ETH',
3636
label: 'Celo',
3737
rpcUrl: 'https://1rpc.io/celo'
38+
},
39+
{
40+
id: 666666666,
41+
token: 'DEGEN',
42+
label: 'Degen',
43+
rpcUrl: 'https://rpc.degen.tips'
3844
}
3945
]
4046

‎examples/with-vite-react/src/web3-onboard.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,12 @@ export default init({
141141
token: 'ETH',
142142
label: 'Celo',
143143
rpcUrl: 'https://1rpc.io/celo'
144+
},
145+
{
146+
id: 666666666,
147+
token: 'DEGEN',
148+
label: 'Degen',
149+
rpcUrl: 'https://rpc.degen.tips'
144150
}
145151
],
146152
appMetadata: {

‎examples/with-vuejs-v2/src/components/HelloWorld.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ const web3Onboard = init({
6666
token: 'ETH',
6767
label: 'Celo',
6868
rpcUrl: 'https://1rpc.io/celo'
69+
},
70+
{
71+
id: 666666666,
72+
token: 'DEGEN',
73+
label: 'Degen',
74+
rpcUrl: 'https://rpc.degen.tips'
6975
}
7076
]
7177
})

‎examples/with-vuejs/src/App.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ init({
3434
token: 'ETH',
3535
label: 'Celo',
3636
rpcUrl: 'https://1rpc.io/celo'
37+
},
38+
{
39+
id: 666666666,
40+
token: 'DEGEN',
41+
label: 'Degen',
42+
rpcUrl: 'https://rpc.degen.tips'
3743
}
3844
]
3945
})

0 commit comments

Comments
 (0)