Skip to content

Commit 7bc9361

Browse files
authored
Merge branch 'develop' into feat/add-bloom-wallet
2 parents 4f4f2bd + 83509c5 commit 7bc9361

File tree

4 files changed

+44
-83
lines changed

4 files changed

+44
-83
lines changed

packages/demo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@web3-onboard/keystone": "^2.3.8",
5050
"@web3-onboard/ledger": "^2.7.1",
5151
"@web3-onboard/magic": "^2.2.1",
52-
"@web3-onboard/metamask": "^2.1.1",
52+
"@web3-onboard/metamask": "^2.1.2-alpha.1",
5353
"@web3-onboard/mew-wallet": "^2.1.1",
5454
"@web3-onboard/okx": "2.0.0-alpha.1",
5555
"@web3-onboard/particle-network": "^2.1.1",

packages/demo/yarn.lock

Lines changed: 27 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
dependencies:
328328
regenerator-runtime "^0.14.0"
329329

330-
"@babel/runtime@^7.17.2", "@babel/runtime@^7.19.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.6", "@babel/runtime@^7.5.5":
330+
"@babel/runtime@^7.17.2", "@babel/runtime@^7.19.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.21.0", "@babel/runtime@^7.5.5":
331331
version "7.23.2"
332332
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
333333
integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
@@ -2217,7 +2217,7 @@
22172217
util "^0.12.4"
22182218
uuid "^8.3.2"
22192219

2220-
"@metamask/sdk@^0.20.3":
2220+
"@metamask/sdk@^0.20.5":
22212221
version "0.20.5"
22222222
resolved "https://registry.yarnpkg.com/@metamask/sdk/-/sdk-0.20.5.tgz#ae90b4e5108f2a0e5f5536e66354c3e31b121af9"
22232223
integrity sha512-BEL3BKbb0O09QgOzvyPH5xUONl2uicS9WT1AYhZ8yR4ytz5fhyHWJzs8Q/cwgm1qIdn3eumnjXfgA6pKirWa3A==
@@ -2372,7 +2372,7 @@
23722372
dependencies:
23732373
"@noble/hashes" "1.3.1"
23742374

2375-
"@noble/curves@1.2.0", "@noble/curves@^1.2.0", "@noble/curves@~1.2.0":
2375+
"@noble/curves@1.2.0", "@noble/curves@~1.2.0":
23762376
version "1.2.0"
23772377
resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35"
23782378
integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==
@@ -2851,35 +2851,14 @@
28512851
resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
28522852
integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
28532853

2854-
"@solana/buffer-layout@^4.0.0", "@solana/buffer-layout@^4.0.1":
2854+
"@solana/buffer-layout@^4.0.1":
28552855
version "4.0.1"
28562856
resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz#b996235eaec15b1e0b5092a8ed6028df77fa6c15"
28572857
integrity sha512-E1ImOIAD1tBZFRdjeM4/pzTiTApC0AOBGwyAMS4fwIodCWArzJ3DWdoh8cKxeFM2fElkxBh2Aqts1BPC373rHA==
28582858
dependencies:
28592859
buffer "~6.0.3"
28602860

2861-
"@solana/web3.js@^1.73.0", "@solana/web3.js@^1.78.0":
2862-
version "1.87.1"
2863-
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.87.1.tgz#da376cebbc4cc97ece0cb028d799163ea147f299"
2864-
integrity sha512-E8Y9bNlZ8TQlhOvCx1b7jG+TjA4SJLVwufmIk1+tcQctUhK5HiB1Q8ljd4yQDkFlk6OOeAlAeqvW0YntWJU94Q==
2865-
dependencies:
2866-
"@babel/runtime" "^7.22.6"
2867-
"@noble/curves" "^1.2.0"
2868-
"@noble/hashes" "^1.3.1"
2869-
"@solana/buffer-layout" "^4.0.0"
2870-
agentkeepalive "^4.3.0"
2871-
bigint-buffer "^1.1.5"
2872-
bn.js "^5.2.1"
2873-
borsh "^0.7.0"
2874-
bs58 "^4.0.1"
2875-
buffer "6.0.3"
2876-
fast-stable-stringify "^1.0.0"
2877-
jayson "^4.1.0"
2878-
node-fetch "^2.6.12"
2879-
rpc-websockets "^7.5.1"
2880-
superstruct "^0.14.2"
2881-
2882-
"@solana/web3.js@^1.87.3":
2861+
"@solana/web3.js@^1.73.0", "@solana/web3.js@^1.78.0", "@solana/web3.js@^1.87.3":
28832862
version "1.93.0"
28842863
resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.93.0.tgz#4b6975020993cec2f6626e4f2bf559ca042df8db"
28852864
integrity sha512-suf4VYwWxERz4tKoPpXCRHFRNst7jmcFUaD65kII+zg9urpy5PeeqgLV6G5eWGzcVzA9tZeXOju1A1Y+0ojEVw==
@@ -4692,10 +4671,10 @@
46924671
joi "17.9.1"
46934672
viem "2.12.0"
46944673

4695-
"@web3-onboard/core@2.22.1":
4696-
version "2.22.1"
4697-
resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.22.1.tgz#169b8300f609648034f41f6d6cd020a9aabfcaa1"
4698-
integrity sha512-FcwHnpfOQsHB0PBliYh6jdSrjyIrxGHfbnAzjUsInLJMFxjpmn8maexBfkGF9dFUh5UKRWTQauuWpzS0cJhh5w==
4674+
"@web3-onboard/core@2.22.2-alpha.2":
4675+
version "2.22.2-alpha.2"
4676+
resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.22.2-alpha.2.tgz#9b8830e6f2c42a2f22695077fdac247bc619547a"
4677+
integrity sha512-l3MmGNHUhwKs5QLncn8RH2vYnagxPq3CidCYv0vPqE/yCJu+L8+JER604COIVSkxrPcp5dEond1e/yRs/ERGEA==
46994678
dependencies:
47004679
"@web3-onboard/common" "^2.4.1"
47014680
bnc-sdk "^4.6.7"
@@ -4850,12 +4829,12 @@
48504829
magic-sdk "^8.1.0"
48514830
rxjs "^7.5.2"
48524831

4853-
"@web3-onboard/metamask@^2.1.1":
4854-
version "2.1.1"
4855-
resolved "https://registry.yarnpkg.com/@web3-onboard/metamask/-/metamask-2.1.1.tgz#1cfa6d2f8f0709dc6b76b86703cef926f98202eb"
4856-
integrity sha512-GFIGiR3OSFi/XdUOBps2NdPiWBSChUtkXZrkYizeEVLekZFA2pYMr03MCUr6fZJW4CVHuQfp0I+aoBTXPAk5tA==
4832+
"@web3-onboard/metamask@^2.1.2-alpha.1":
4833+
version "2.1.2-alpha.1"
4834+
resolved "https://registry.yarnpkg.com/@web3-onboard/metamask/-/metamask-2.1.2-alpha.1.tgz#cab8fa87df7619c4645b89f31ad0f095cd5341d2"
4835+
integrity sha512-6OZL2S6coURwX6cBtbRJr45mwNjhNfn/tRkWC7nwjOmNr8a51+a4s3a1C8vDOfDtAVDf/wy0iE+T6O8ukDCNQg==
48574836
dependencies:
4858-
"@metamask/sdk" "^0.20.3"
4837+
"@metamask/sdk" "^0.20.5"
48594838
"@web3-onboard/common" "^2.4.1"
48604839

48614840
"@web3-onboard/mew-wallet@^2.1.1":
@@ -5014,9 +4993,9 @@
50144993
rxjs "^7.5.2"
50154994

50164995
"@web3-onboard/web3auth@^2.4.0-alpha.2":
5017-
version "2.4.0-alpha.1"
5018-
resolved "https://registry.yarnpkg.com/@web3-onboard/web3auth/-/web3auth-2.4.0-alpha.1.tgz#592382f4280bb20faf66e6fa20d15f76024f6910"
5019-
integrity sha512-DXDtZOjYONinwTPL6lcMlsz8IVdpVPy4Te0YxJIa2VD98Y9ZfIxljkT7DVbgqxWSbYtAwDPLp4aVT110Nlv5AQ==
4996+
version "2.4.0-alpha.2"
4997+
resolved "https://registry.yarnpkg.com/@web3-onboard/web3auth/-/web3auth-2.4.0-alpha.2.tgz#6f9f166506faeb22a4a236d9f8e51f90d0d2ce2c"
4998+
integrity sha512-e3e+DwD31Q3kknunjnA6MbmdvltvBJSXtj+C0SKBHfIYf0PbTiG7XRAQwP0Fdn1L+DBfq8QSaTKtFp3/RMOKuQ==
50204999
dependencies:
50215000
"@solana/web3.js" "^1.73.0"
50225001
"@web3-onboard/common" "^2.4.1"
@@ -5388,7 +5367,7 @@ agent-base@6, agent-base@^6.0.2:
53885367
dependencies:
53895368
debug "4"
53905369

5391-
agentkeepalive@^4.3.0, agentkeepalive@^4.5.0:
5370+
agentkeepalive@^4.5.0:
53925371
version "4.5.0"
53935372
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
53945373
integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
@@ -5964,11 +5943,11 @@ brace-expansion@^1.1.7:
59645943
concat-map "0.0.1"
59655944

59665945
braces@^3.0.2, braces@~3.0.2:
5967-
version "3.0.2"
5968-
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
5969-
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
5946+
version "3.0.3"
5947+
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
5948+
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
59705949
dependencies:
5971-
fill-range "^7.0.1"
5950+
fill-range "^7.1.1"
59725951

59735952
brorand@^1.0.1, brorand@^1.0.5, brorand@^1.1.0:
59745953
version "1.1.0"
@@ -8172,10 +8151,10 @@ file-uri-to-path@1.0.0:
81728151
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
81738152
integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
81748153

8175-
fill-range@^7.0.1:
8176-
version "7.0.1"
8177-
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
8178-
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
8154+
fill-range@^7.1.1:
8155+
version "7.1.1"
8156+
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
8157+
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
81798158
dependencies:
81808159
to-regex-range "^5.0.1"
81818160

@@ -11237,7 +11216,7 @@ react@16.13.1:
1123711216
object-assign "^4.1.1"
1123811217
prop-types "^15.6.2"
1123911218

11240-
react@>=16, react@>=18.2, react@^18.2.0:
11219+
react@>=16, react@^18.2.0:
1124111220
version "18.3.1"
1124211221
resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
1124311222
integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
@@ -11554,19 +11533,6 @@ rollup-plugin-visualizer@^5.9.2:
1155411533
source-map "^0.7.4"
1155511534
yargs "^17.5.1"
1155611535

11557-
rpc-websockets@^7.5.1:
11558-
version "7.6.0"
11559-
resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.6.0.tgz#d3f4c0dac108ca35566b0e31552c32e58928cd04"
11560-
integrity sha512-Jgcs8q6t8Go98dEulww1x7RysgTkzpCMelVxZW4hvuyFtOGpeUz9prpr2KjUa/usqxgFCd9Tu3+yhHEP9GVmiQ==
11561-
dependencies:
11562-
"@babel/runtime" "^7.17.2"
11563-
eventemitter3 "^4.0.7"
11564-
uuid "^8.3.2"
11565-
ws "^8.5.0"
11566-
optionalDependencies:
11567-
bufferutil "^4.0.1"
11568-
utf-8-validate "^5.0.2"
11569-
1157011536
rpc-websockets@^9.0.0:
1157111537
version "9.0.1"
1157211538
resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-9.0.1.tgz#a69c83ffd5e26bdd6117f5b434ae68133c4805b6"
@@ -12295,11 +12261,6 @@ stylis@4.3.2:
1229512261
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444"
1229612262
integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==
1229712263

12298-
superstruct@^0.14.2:
12299-
version "0.14.2"
12300-
resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.14.2.tgz#0dbcdf3d83676588828f1cf5ed35cda02f59025b"
12301-
integrity sha512-nPewA6m9mR3d6k7WkZ8N8zpTWfenFH3q9pA2PkuiZxINr9DKB2+40wEQf0ixn8VaGuJ78AB6iWOtStI+/4FKZQ==
12302-
1230312264
superstruct@^0.15.3:
1230412265
version "0.15.5"
1230512266
resolved "https://registry.yarnpkg.com/superstruct/-/superstruct-0.15.5.tgz#0f0a8d3ce31313f0d84c6096cd4fa1bfdedc9dab"

packages/metamask/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@web3-onboard/metamask",
3-
"version": "2.1.1",
3+
"version": "2.1.2-alpha.1",
44
"description": "MetaMask SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
55
"keywords": [
66
"Ethereum",
@@ -60,7 +60,7 @@
6060
"typescript": "^5.2.2"
6161
},
6262
"dependencies": {
63-
"@metamask/sdk": "^0.20.3",
63+
"@metamask/sdk": "^0.20.5",
6464
"@web3-onboard/common": "^2.4.1"
6565
},
6666
"engines": {

yarn.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,10 +2247,10 @@
22472247
utf-8-validate "^6.0.3"
22482248
uuid "^8.3.2"
22492249

2250-
"@metamask/sdk-communication-layer@0.20.2":
2251-
version "0.20.2"
2252-
resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.20.2.tgz#7f7fd334b2d26abd1a5a1ec1ffadf823a9589344"
2253-
integrity sha512-TN+whYbCClFSkx52Ild1RcjoRyz8YZgwNvZeooIcZIvCfBM6U9W5273KGiY7WLc/oO4KKmFk17d7vMO4gNvhhw==
2250+
"@metamask/sdk-communication-layer@0.20.5":
2251+
version "0.20.5"
2252+
resolved "https://registry.yarnpkg.com/@metamask/sdk-communication-layer/-/sdk-communication-layer-0.20.5.tgz#b472fe223319a25a060155ea904f7c66062102b2"
2253+
integrity sha512-Y3pzg1GBB7tDUCUsyhvlhxQ+h/pDrTjO2yUwjCJj2S8Nx5OtdRv/foRGfbDHkfYt6Z9ANRfivWU2U6El17B24A==
22542254
dependencies:
22552255
bufferutil "^4.0.8"
22562256
date-fns "^2.29.3"
@@ -2271,10 +2271,10 @@
22712271
react-dom "^18.2.0"
22722272
react-i18next "^13.2.2"
22732273

2274-
"@metamask/sdk-install-modal-web@0.20.2":
2275-
version "0.20.2"
2276-
resolved "https://registry.yarnpkg.com/@metamask/sdk-install-modal-web/-/sdk-install-modal-web-0.20.2.tgz#1cf0eb3c26291de7598190878fa9a893c4eb2d66"
2277-
integrity sha512-0QiaZhV15AGdN1zU2jfTI32eC3YkwEpzDfR9+oiZ9bd2G72c6lYBhTsmDGUd01aP6A+bqJR5PjI8Wh2AWtoLeA==
2274+
"@metamask/sdk-install-modal-web@0.20.4":
2275+
version "0.20.4"
2276+
resolved "https://registry.yarnpkg.com/@metamask/sdk-install-modal-web/-/sdk-install-modal-web-0.20.4.tgz#50b97be4e3be17c3622281c2ad9fc49769e33216"
2277+
integrity sha512-AX3mTr0IDpS0ajV83okTaixG+2wIxTVbgvEuQgAj2Ed7PWAdiZ1aX93AVcaCgkOWhTf267z7mXCSuBDpBCje9g==
22782278
dependencies:
22792279
qr-code-styling "^1.6.0-rc.1"
22802280

@@ -2309,15 +2309,15 @@
23092309
util "^0.12.4"
23102310
uuid "^8.3.2"
23112311

2312-
"@metamask/sdk@^0.20.3":
2313-
version "0.20.3"
2314-
resolved "https://registry.yarnpkg.com/@metamask/sdk/-/sdk-0.20.3.tgz#73851d68ffe5d45c1872c024182922530b187b7a"
2315-
integrity sha512-HZ9NwA+LxiXzuy0YWbWsuD4xejQtp85bhcCAf8UgpA/0dOyF3RS4dKDdBBXSyRgk3RWPjeJgHxioaH4CmBmiRA==
2312+
"@metamask/sdk@^0.20.5":
2313+
version "0.20.5"
2314+
resolved "https://registry.yarnpkg.com/@metamask/sdk/-/sdk-0.20.5.tgz#ae90b4e5108f2a0e5f5536e66354c3e31b121af9"
2315+
integrity sha512-BEL3BKbb0O09QgOzvyPH5xUONl2uicS9WT1AYhZ8yR4ytz5fhyHWJzs8Q/cwgm1qIdn3eumnjXfgA6pKirWa3A==
23162316
dependencies:
23172317
"@metamask/onboarding" "^1.0.1"
23182318
"@metamask/providers" "^15.0.0"
2319-
"@metamask/sdk-communication-layer" "0.20.2"
2320-
"@metamask/sdk-install-modal-web" "0.20.2"
2319+
"@metamask/sdk-communication-layer" "0.20.5"
2320+
"@metamask/sdk-install-modal-web" "0.20.4"
23212321
"@types/dom-screen-wake-lock" "^1.0.0"
23222322
bowser "^2.9.0"
23232323
cross-fetch "^4.0.0"

0 commit comments

Comments
 (0)