From 360b2c807efd96bf1dfa0cdc28e10440db0fe046 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Wed, 3 Jan 2024 09:42:23 -0700 Subject: [PATCH 01/31] Remove gamestop wallet support as wallet has been deprecated (#2037) --- .../[...4]wallets/[...14]injected/+page.md | 2 -- package.json | 1 - packages/core/package.json | 1 - packages/injected/README.md | 2 -- packages/injected/package.json | 3 +-- packages/injected/src/types.ts | 4 ---- packages/injected/src/wallets.ts | 22 ------------------- packages/react/package.json | 1 - packages/solid/package.json | 1 - packages/vue/package.json | 1 - yarn.lock | 9 ++++++++ 11 files changed, 10 insertions(+), 37 deletions(-) diff --git a/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md b/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md index 78f965d37..7f0b69295 100644 --- a/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md @@ -334,10 +334,8 @@ const injected = injectedModule({ - TP - _Mobile_ - 1inch - _Mobile_ - Tokenary - _Mobile_ -- GameStop - _Desktop_ - Rabby - _Desktop_ - MathWallet - _Desktop & Mobile_ -- Gamestop - _Desktop_ - Bitkeep - _Desktop & Mobile_ - BitGet Wallet - _Desktop & Mobile_ - Sequence - _Desktop & Mobile_ diff --git a/package.json b/package.json index 26fce8371..c1aba3ea0 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet", "Sequence" diff --git a/packages/core/package.json b/packages/core/package.json index baffe1be0..39e556e4a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -31,7 +31,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/packages/injected/README.md b/packages/injected/README.md index df8d3bdce..21cbf0562 100644 --- a/packages/injected/README.md +++ b/packages/injected/README.md @@ -72,10 +72,8 @@ console.log(connectedWallets) - xDefi - _Desktop & Mobile_ - 1inch - _Mobile_ - Tokenary - _Mobile_ -- GameStop - _Desktop_ - Rabby - _Desktop_ - MathWallet - _Desktop & Mobile_ -- Gamestop - _Desktop_ - Bitget - _Desktop & Mobile_ - Sequence - _Desktop & Mobile_ - Core - _Desktop_ diff --git a/packages/injected/package.json b/packages/injected/package.json index 113260e98..fc4c7b637 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.10.10", + "version": "2.10.11-alpha.1", "description": "Injected wallet module for connecting browser extension and mobile wallets 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.", "keywords": [ "Ethereum", @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Phantom", "DeFi Wallet", "Fordefi", diff --git a/packages/injected/src/types.ts b/packages/injected/src/types.ts index c8bae9bda..b701c94c1 100644 --- a/packages/injected/src/types.ts +++ b/packages/injected/src/types.ts @@ -47,7 +47,6 @@ export enum ProviderIdentityFlag { BraveWallet = 'isBraveWallet', Rabby = 'isRabby', MathWallet = 'isMathWallet', - GameStop = 'isGamestop', Bitget = 'isBitKeep', Sequence = 'isSequence', Core = 'isAvalanche', @@ -134,7 +133,6 @@ export enum ProviderLabel { Tally = 'Taho', Rabby = 'Rabby Wallet', MathWallet = 'MathWallet', - GameStop = 'GameStop Wallet', Bitget = 'Bitget Wallet', Sequence = 'Sequence', Core = 'Core', @@ -174,7 +172,6 @@ export enum InjectedNameSpace { Web3 = 'web3', Arbitrum = 'arbitrum', XFI = 'xfi', - GameStop = 'gamestop', Bitget = 'bitkeep', Avalanche = 'avalanche', Bitski = 'Bitski', @@ -205,7 +202,6 @@ export interface CustomWindow extends Window { xfi: { ethereum: InjectedProvider } - gamestop: InjectedProvider bitkeep: { ethereum: InjectedProvider } diff --git a/packages/injected/src/wallets.ts b/packages/injected/src/wallets.ts index 3c797737a..7b7a5fc40 100644 --- a/packages/injected/src/wallets.ts +++ b/packages/injected/src/wallets.ts @@ -577,27 +577,6 @@ const mathwallet: InjectedWalletModule = { platforms: ['all'] } -const gamestop: InjectedWalletModule = { - label: ProviderLabel.GameStop, - injectedNamespace: InjectedNameSpace.GameStop, - checkProviderIdentity: ({ provider }) => - !!provider && !!provider[ProviderIdentityFlag.GameStop], - getIcon: async () => (await import('./icons/gamestop.js')).default, - getInterface: async () => { - const provider = createEIP1193Provider(window.gamestop, { - eth_chainId: ({ baseRequest }) => - baseRequest({ method: 'eth_chainId' }).then( - id => `0x${parseInt(id).toString(16)}` - ), - wallet_switchEthereumChain: UNSUPPORTED_METHOD - }) - provider.removeListener = (event, listener) => {} - provider.on = (event, listener) => {} - return { provider } - }, - platforms: ['desktop'] -} - const bitget: InjectedWalletModule = { label: ProviderLabel.Bitget, injectedNamespace: InjectedNameSpace.Bitget, @@ -927,7 +906,6 @@ const wallets = [ tally, rabby, mathwallet, - gamestop, sequence, core, bitski, diff --git a/packages/react/package.json b/packages/react/package.json index 8683e3f6f..2205e1888 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/packages/solid/package.json b/packages/solid/package.json index 49ddda32a..3e0530b55 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/packages/vue/package.json b/packages/vue/package.json index f48ab4b42..97310e66b 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/yarn.lock b/yarn.lock index 4a44f5330..118ce1a9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6151,6 +6151,15 @@ "@walletconnect/window-getters" "^1.0.1" tslib "1.14.1" +"@web3-onboard/injected-wallets@^2.10.9": + version "2.10.10" + resolved "https://registry.yarnpkg.com/@web3-onboard/injected-wallets/-/injected-wallets-2.10.10.tgz#c938da6fe335e8d5787661f5ef590ab2132796b9" + integrity sha512-n05N6oDsUaZwFVKd76LU8IgzWdqqI2yc9zGxexb8d7QiCcbYZt5YWAcgesKLf/YaZn5/aIodn9BToMRqsdwabg== + dependencies: + "@web3-onboard/common" "^2.3.3" + joi "17.9.1" + lodash.uniqby "^4.7.0" + "@web3-react/abstract-connector@^6.0.7": version "6.0.7" resolved "https://registry.yarnpkg.com/@web3-react/abstract-connector/-/abstract-connector-6.0.7.tgz#401b3c045f1e0fab04256311be49d5144e9badc6" From e48b4d722893b09d6b009d692441ba10f10438d8 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Wed, 3 Jan 2024 09:43:23 -0700 Subject: [PATCH 02/31] Update WC imports, bump WC package version, bump WC dep version (#2036) --- packages/demo/package.json | 2 +- packages/walletconnect/package.json | 4 +- packages/walletconnect/src/walletConnect.ts | 4 +- yarn.lock | 92 ++++++++++++--------- 4 files changed, 57 insertions(+), 45 deletions(-) diff --git a/packages/demo/package.json b/packages/demo/package.json index 9f79cdbbe..dc764b9ea 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -59,7 +59,7 @@ "@web3-onboard/trust": "^2.0.3", "@web3-onboard/uauth": "^2.1.2", "@web3-onboard/venly": "^2.0.0", - "@web3-onboard/walletconnect": "^2.5.2", + "@web3-onboard/walletconnect": "^2.5.3-alpha.1", "@web3-onboard/web3auth": "^2.2.2", "@web3-onboard/xdefi": "^2.0.5", "@web3-onboard/zeal": "^2.0.3", diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json index 40458ba74..527627129 100644 --- a/packages/walletconnect/package.json +++ b/packages/walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/walletconnect", - "version": "2.5.2", + "version": "2.5.3-alpha.1", "description": "WalletConnect SDK 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.", "keywords": [ "Ethereum", @@ -59,7 +59,7 @@ "@walletconnect/types": "^2.9.0" }, "dependencies": { - "@walletconnect/ethereum-provider": "^2.10.6", + "@walletconnect/ethereum-provider": "^2.11.0", "@web3-onboard/common": "^2.3.3", "joi": "17.9.1", "rxjs": "^7.5.2" diff --git a/packages/walletconnect/src/walletConnect.ts b/packages/walletconnect/src/walletConnect.ts index 9a634fd93..1fe428b4c 100644 --- a/packages/walletconnect/src/walletConnect.ts +++ b/packages/walletconnect/src/walletConnect.ts @@ -1,9 +1,7 @@ -import { REQUIRED_METHODS } from '@walletconnect/ethereum-provider' import { isHexString } from './index.js' import type { EthereumProviderOptions } from '@walletconnect/ethereum-provider/dist/types/EthereumProvider' import type { JQueryStyleEventEmitter } from 'rxjs/internal/observable/fromEvent' -import type { EthereumProvider } from '@walletconnect/ethereum-provider' import type { WalletConnectOptions } from './types.js' import type { CoreTypes } from '@walletconnect/types' import type { @@ -58,7 +56,7 @@ function walletConnect(options: WalletConnectOptions): WalletInit { '@web3-onboard/common' ) - const { default: EthereumProvider } = await import( + const { default: EthereumProvider, REQUIRED_METHODS } = await import( '@walletconnect/ethereum-provider' ) diff --git a/yarn.lock b/yarn.lock index 118ce1a9c..f9ec73677 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5368,10 +5368,10 @@ lodash.isequal "4.5.0" uint8arrays "^3.1.0" -"@walletconnect/core@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.6.tgz#786b0d2e2045c210c917e29bfa0498bbc210be20" - integrity sha512-Z4vh4ZdfcoQjgPEOxeuF9HUZCVLtV3MgRbS/awLIj/omDrFnOwlBhxi5Syr4Y8muVGC0ocRetQYHae0/gX5crQ== +"@walletconnect/core@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.11.0.tgz#3a4e301077b2f858fd916b7a20b5b984d1afce63" + integrity sha512-2Tjp5BCevI7dbmqo/OrCjX4tqgMqwJNQLlQAlphqPfvwlF9+tIu6pGcVbSN3U9zyXzWIZCeleqEaWUeSeET4Ew== dependencies: "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-provider" "1.0.13" @@ -5384,9 +5384,10 @@ "@walletconnect/relay-auth" "^1.0.4" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" + isomorphic-unfetch "3.1.0" lodash.isequal "4.5.0" uint8arrays "^3.1.0" @@ -5503,20 +5504,20 @@ "@walletconnect/utils" "2.9.1" events "^3.3.0" -"@walletconnect/ethereum-provider@^2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.6.tgz#53720771cc2d6accd452916a853ac927f26acbaa" - integrity sha512-bBQ+yUfxLv8VxNttgNKY7nED35gSVayO/BnLHbNKvyV1gpvSCla5mWB9MsXuQs70MK0g+/qtgRVSrOtdSubaNQ== +"@walletconnect/ethereum-provider@^2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.11.0.tgz#feb90368d8b2608d7d120ac8feeb3e26eac8c709" + integrity sha512-YrTeHVjuSuhlUw7SQ6xBJXDuJ6iAC+RwINm9nVhoKYJSHAy3EVSJZOofMKrnecL0iRMtD29nj57mxAInIBRuZA== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "^1.0.13" "@walletconnect/jsonrpc-types" "^1.0.3" "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/modal" "^2.4.3" - "@walletconnect/sign-client" "2.10.6" - "@walletconnect/types" "2.10.6" - "@walletconnect/universal-provider" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/modal" "^2.6.2" + "@walletconnect/sign-client" "2.11.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/universal-provider" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/events@^1.0.1": @@ -5769,7 +5770,7 @@ "@walletconnect/modal-core" "2.6.1" "@walletconnect/modal-ui" "2.6.1" -"@walletconnect/modal@2.6.2", "@walletconnect/modal@^2.4.3": +"@walletconnect/modal@2.6.2", "@walletconnect/modal@^2.6.2": version "2.6.2" resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.2.tgz#4b534a836f5039eeb3268b80be7217a94dd12651" integrity sha512-eFopgKi8AjKf/0U4SemvcYw9zlLpx9njVN8sf6DAkowC2Md0gPU/UNEbH1Wwj407pEKnEds98pKWib1NN1ACoA== @@ -5862,19 +5863,19 @@ "@walletconnect/utils" "2.10.2" events "^3.3.0" -"@walletconnect/sign-client@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.6.tgz#722d2c2844565e2826dce6a6d3a36c9b3ca1ea91" - integrity sha512-EvUWjaZBQu2yKnH5/5F2qzbuiIuUN9ZgrNKgvXkw5z1Dq5RJCks0S9/MFlKH/ZSGqXnLl7uAzBXtoX4sMgbCMA== +"@walletconnect/sign-client@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.11.0.tgz#de10f976cc1b8ab04b7f7c27f6a298e4e083ab25" + integrity sha512-H2ukscibBS+6WrzQWh+WyVBqO5z4F5et12JcwobdwgHnJSlqIoZxqnUYYWNCI5rUR5UKsKWaUyto4AE9N5dw4Q== dependencies: - "@walletconnect/core" "2.10.6" + "@walletconnect/core" "2.11.0" "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-utils" "1.0.8" "@walletconnect/logger" "^2.0.1" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/sign-client@2.9.1": @@ -5920,10 +5921,10 @@ "@walletconnect/logger" "^2.0.1" events "^3.3.0" -"@walletconnect/types@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.6.tgz#d9920ed4fd0113e0addbda8e7e73a5176a3163fd" - integrity sha512-WgHfiTG1yakmxheaBRiXhUdEmgxwrvsAdOIWaMf/spvrzVKYh6sHI3oyEEky5qj5jjiMiyQBeB57QamzCotbcQ== +"@walletconnect/types@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.11.0.tgz#474a009c56faa9ef4063b76ed84415c801dc9f1e" + integrity sha512-AB5b1lrEbCGHxqS2vqfCkIoODieH+ZAUp9rA1O2ftrhnqDJiJK983Df87JhYhECsQUBHHfALphA8ydER0q+9sw== dependencies: "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" @@ -6000,19 +6001,19 @@ "@walletconnect/utils" "2.10.2" events "^3.3.0" -"@walletconnect/universal-provider@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.6.tgz#1a6c42517581f11ce275474bc70d0eb4f1044525" - integrity sha512-CEivusqqoD31BhCTKp08DnrccfGjwD9MFjZs5BNRorDteRFE8zVm9LmP6DSiNJCw82ZajGlZThggLQ/BAATfwA== +"@walletconnect/universal-provider@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.11.0.tgz#89053c2360b5ce766c213ca4e33bb4ce4976b0be" + integrity sha512-zgJv8jDvIMP4Qse/D9oIRXGdfoNqonsrjPZanQ/CHNe7oXGOBiQND2IIeX+tS0H7uNA0TPvctljCLiIN9nw4eA== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-types" "^1.0.2" "@walletconnect/jsonrpc-utils" "^1.0.7" "@walletconnect/logger" "^2.0.1" - "@walletconnect/sign-client" "2.10.6" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/sign-client" "2.11.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/universal-provider@2.9.1": @@ -6050,10 +6051,10 @@ query-string "7.1.3" uint8arrays "^3.1.0" -"@walletconnect/utils@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.6.tgz#749b37d14e291e346862e7027ec7548463350226" - integrity sha512-oRsWWhN2+hi3aiDXrQEOfysz6FHQJGXLsNQPVt+WIBJplO6Szmdau9dbleD88u1iiT4GKPqE0R9FOYvvPm1H/w== +"@walletconnect/utils@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.11.0.tgz#31c95151c823022077883dda61800cdea71879b7" + integrity sha512-hxkHPlTlDQILHfIKXlmzgNJau/YcSBC3XHUSuZuKZbNEw3duFT6h6pm3HT/1+j1a22IG05WDsNBuTCRkwss+BQ== dependencies: "@stablelib/chacha20poly1305" "1.0.1" "@stablelib/hkdf" "1.0.1" @@ -6063,7 +6064,7 @@ "@walletconnect/relay-api" "^1.0.9" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" + "@walletconnect/types" "2.11.0" "@walletconnect/window-getters" "^1.0.1" "@walletconnect/window-metadata" "^1.0.1" detect-browser "5.3.0" @@ -11274,6 +11275,14 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= +isomorphic-unfetch@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" + integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== + dependencies: + node-fetch "^2.6.1" + unfetch "^4.2.0" + isomorphic-ws@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf" @@ -15836,6 +15845,11 @@ unenv@^1.7.4: node-fetch-native "^1.4.1" pathe "^1.1.1" +unfetch@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" + integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" From 844616b8b5f6e957e5903e0bfe92ef92d55b7df9 Mon Sep 17 00:00:00 2001 From: Max Alekseenko Date: Wed, 10 Jan 2024 18:58:33 +0100 Subject: [PATCH 03/31] Fix the Safe connector options and add Blockscout to the list of allowed domains (#2038) * change option name * add Blockscout to default list of allowed domains * change option name in docs * increment the version * return the old param name * Update packages/gnosis/package.json * Update packages/demo/package.json * Update packages/gnosis/package.json * Update packages/demo/package.json * Yarn it --------- Co-authored-by: Adam Carpenter --- packages/demo/package.json | 2 +- packages/gnosis/package.json | 2 +- packages/gnosis/src/index.ts | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/demo/package.json b/packages/demo/package.json index dc764b9ea..2ce6b0fd1 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -40,7 +40,7 @@ "@web3-onboard/frame": "^2.0.2", "@web3-onboard/frontier": "^2.0.3", "@web3-onboard/gas": "^2.1.7", - "@web3-onboard/gnosis": "^2.1.10", + "@web3-onboard/gnosis": "^2.2.1-alpha.1", "@web3-onboard/infinity-wallet": "^2.0.3", "@web3-onboard/injected-wallets": "^2.10.9", "@web3-onboard/keepkey": "^2.3.7", diff --git a/packages/gnosis/package.json b/packages/gnosis/package.json index 47579f54b..768481cd0 100644 --- a/packages/gnosis/package.json +++ b/packages/gnosis/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/gnosis", - "version": "2.2.0", + "version": "2.2.1-alpha.1", "description": "Safe 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.", "keywords": [ "Ethereum", diff --git a/packages/gnosis/src/index.ts b/packages/gnosis/src/index.ts index 1500855ad..bc4d9707c 100644 --- a/packages/gnosis/src/index.ts +++ b/packages/gnosis/src/index.ts @@ -1,4 +1,4 @@ -import { WalletInit } from '@web3-onboard/common' +import type { WalletInit } from '@web3-onboard/common' type GnosisOptions = { whitelistedDomains: RegExp[] @@ -8,7 +8,8 @@ function gnosis(options?: GnosisOptions): WalletInit { const { whitelistedDomains = [ /^https:\/\/app\.safe\.global$/, - /^https:\/\/safe\.global$/ + /^https:\/\/safe\.global$/, + /^https:\/\/.*\.blockscout\.com$/ ] } = options || {} @@ -37,7 +38,7 @@ function gnosis(options?: GnosisOptions): WalletInit { SafeAppsSDK.default || SafeAppsSDK const opts = { - whitelistedDomains + allowedDomains: whitelistedDomains } const appsSdk = new SafeAppProviderConstructor(opts) From 3f391cecd3fa3e77d72598b6080b2bd8bd9da5f1 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Thu, 11 Jan 2024 09:55:46 -0700 Subject: [PATCH 04/31] Release 2.24.19 (develop) (#2042) * Update versions for release * Bump injected version in demo * Release 2.24.19 (#2043) * Remove gamestop wallet support as wallet has been deprecated (#2037) * Update WC imports, bump WC package version, bump WC dep version (#2036) * Fix the Safe connector options and add Blockscout to the list of allowed domains (#2038) * change option name * add Blockscout to default list of allowed domains * change option name in docs * increment the version * return the old param name * Update packages/gnosis/package.json * Update packages/demo/package.json * Update packages/gnosis/package.json * Update packages/demo/package.json * Yarn it --------- Co-authored-by: Adam Carpenter * Update versions for release * Bump injected version in demo --------- Co-authored-by: Max Alekseenko * rebase main * Update node version required for Walletconnect package * Yarn * [FIX] - Update node version required for Walletconnect package (#2045) * rebase main * Update node version required for Walletconnect package * Yarn * Updated config.yml * Updated config.yml --------- Co-authored-by: Max Alekseenko --- .circleci/config.yml | 4 ++-- package.json | 2 +- packages/demo/package.json | 6 +++--- packages/gnosis/package.json | 2 +- packages/injected/package.json | 2 +- packages/walletconnect/package.json | 2 +- yarn.lock | 9 --------- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bfd613eb..3ec88fd22 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,7 +265,7 @@ jobs: - node-build-steps build-walletconnect: docker: - - image: cimg/node:16.14.2 + - image: cimg/node:18.0.0 working_directory: ~/web3-onboard-monorepo/packages/walletconnect steps: - node-build-steps @@ -545,7 +545,7 @@ jobs: - node-staging-build-steps build-staging-walletconnect: docker: - - image: cimg/node:16.14.2 + - image: cimg/node:18.0.0 working_directory: ~/web3-onboard-monorepo/packages/walletconnect steps: - node-staging-build-steps diff --git a/package.json b/package.json index c1aba3ea0..cff8f5699 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "web3-onboard-monorepo", - "version": "2.24.18", + "version": "2.24.19", "private": true, "workspaces": { "packages": [ diff --git a/packages/demo/package.json b/packages/demo/package.json index 2ce6b0fd1..e70082347 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -40,9 +40,9 @@ "@web3-onboard/frame": "^2.0.2", "@web3-onboard/frontier": "^2.0.3", "@web3-onboard/gas": "^2.1.7", - "@web3-onboard/gnosis": "^2.2.1-alpha.1", + "@web3-onboard/gnosis": "^2.2.1", "@web3-onboard/infinity-wallet": "^2.0.3", - "@web3-onboard/injected-wallets": "^2.10.9", + "@web3-onboard/injected-wallets": "^2.10.11", "@web3-onboard/keepkey": "^2.3.7", "@web3-onboard/keystone": "^2.3.7", "@web3-onboard/ledger": "^2.5.2", @@ -59,7 +59,7 @@ "@web3-onboard/trust": "^2.0.3", "@web3-onboard/uauth": "^2.1.2", "@web3-onboard/venly": "^2.0.0", - "@web3-onboard/walletconnect": "^2.5.3-alpha.1", + "@web3-onboard/walletconnect": "^2.5.3", "@web3-onboard/web3auth": "^2.2.2", "@web3-onboard/xdefi": "^2.0.5", "@web3-onboard/zeal": "^2.0.3", diff --git a/packages/gnosis/package.json b/packages/gnosis/package.json index 768481cd0..cb1a2b1f9 100644 --- a/packages/gnosis/package.json +++ b/packages/gnosis/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/gnosis", - "version": "2.2.1-alpha.1", + "version": "2.2.1", "description": "Safe 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.", "keywords": [ "Ethereum", diff --git a/packages/injected/package.json b/packages/injected/package.json index fc4c7b637..82028ae22 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.10.11-alpha.1", + "version": "2.10.11", "description": "Injected wallet module for connecting browser extension and mobile wallets 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.", "keywords": [ "Ethereum", diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json index 527627129..d3883e2d6 100644 --- a/packages/walletconnect/package.json +++ b/packages/walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/walletconnect", - "version": "2.5.3-alpha.1", + "version": "2.5.3", "description": "WalletConnect SDK 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.", "keywords": [ "Ethereum", diff --git a/yarn.lock b/yarn.lock index f9ec73677..b741602b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6152,15 +6152,6 @@ "@walletconnect/window-getters" "^1.0.1" tslib "1.14.1" -"@web3-onboard/injected-wallets@^2.10.9": - version "2.10.10" - resolved "https://registry.yarnpkg.com/@web3-onboard/injected-wallets/-/injected-wallets-2.10.10.tgz#c938da6fe335e8d5787661f5ef590ab2132796b9" - integrity sha512-n05N6oDsUaZwFVKd76LU8IgzWdqqI2yc9zGxexb8d7QiCcbYZt5YWAcgesKLf/YaZn5/aIodn9BToMRqsdwabg== - dependencies: - "@web3-onboard/common" "^2.3.3" - joi "17.9.1" - lodash.uniqby "^4.7.0" - "@web3-react/abstract-connector@^6.0.7": version "6.0.7" resolved "https://registry.yarnpkg.com/@web3-react/abstract-connector/-/abstract-connector-6.0.7.tgz#401b3c045f1e0fab04256311be49d5144e9badc6" From c87eb21c663666d0c54c18a5c8fd1577e53161bf Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Thu, 11 Jan 2024 09:55:48 -0700 Subject: [PATCH 05/31] Release 2.24.19 (docs) (#2044) * Remove gamestop wallet support as wallet has been deprecated (#2037) * Update WC imports, bump WC package version, bump WC dep version (#2036) * Fix the Safe connector options and add Blockscout to the list of allowed domains (#2038) * change option name * add Blockscout to default list of allowed domains * change option name in docs * increment the version * return the old param name * Update packages/gnosis/package.json * Update packages/demo/package.json * Update packages/gnosis/package.json * Update packages/demo/package.json * Yarn it --------- Co-authored-by: Adam Carpenter * Update versions for release * Bump injected version in demo * Release 2.24.19 (#2043) * Remove gamestop wallet support as wallet has been deprecated (#2037) * Update WC imports, bump WC package version, bump WC dep version (#2036) * Fix the Safe connector options and add Blockscout to the list of allowed domains (#2038) * change option name * add Blockscout to default list of allowed domains * change option name in docs * increment the version * return the old param name * Update packages/gnosis/package.json * Update packages/demo/package.json * Update packages/gnosis/package.json * Update packages/demo/package.json * Yarn it --------- Co-authored-by: Adam Carpenter * Update versions for release * Bump injected version in demo --------- Co-authored-by: Max Alekseenko * rebase main * Update node version required for Walletconnect package * Yarn * [FIX] - Update node version required for Walletconnect package (#2045) * rebase main * Update node version required for Walletconnect package * Yarn * Updated config.yml * Updated config.yml --------- Co-authored-by: Max Alekseenko --- .circleci/config.yml | 4 +- .../[...4]wallets/[...14]injected/+page.md | 2 - package.json | 3 +- packages/core/package.json | 1 - packages/demo/package.json | 6 +- packages/gnosis/package.json | 2 +- packages/gnosis/src/index.ts | 7 +- packages/injected/README.md | 2 - packages/injected/package.json | 3 +- packages/injected/src/types.ts | 4 - packages/injected/src/wallets.ts | 22 ----- packages/react/package.json | 1 - packages/solid/package.json | 1 - packages/vue/package.json | 1 - packages/walletconnect/package.json | 4 +- packages/walletconnect/src/walletConnect.ts | 4 +- yarn.lock | 92 +++++++++++-------- 17 files changed, 68 insertions(+), 91 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bfd613eb..3ec88fd22 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,7 +265,7 @@ jobs: - node-build-steps build-walletconnect: docker: - - image: cimg/node:16.14.2 + - image: cimg/node:18.0.0 working_directory: ~/web3-onboard-monorepo/packages/walletconnect steps: - node-build-steps @@ -545,7 +545,7 @@ jobs: - node-staging-build-steps build-staging-walletconnect: docker: - - image: cimg/node:16.14.2 + - image: cimg/node:18.0.0 working_directory: ~/web3-onboard-monorepo/packages/walletconnect steps: - node-staging-build-steps diff --git a/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md b/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md index 78f965d37..7f0b69295 100644 --- a/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md @@ -334,10 +334,8 @@ const injected = injectedModule({ - TP - _Mobile_ - 1inch - _Mobile_ - Tokenary - _Mobile_ -- GameStop - _Desktop_ - Rabby - _Desktop_ - MathWallet - _Desktop & Mobile_ -- Gamestop - _Desktop_ - Bitkeep - _Desktop & Mobile_ - BitGet Wallet - _Desktop & Mobile_ - Sequence - _Desktop & Mobile_ diff --git a/package.json b/package.json index 26fce8371..cff8f5699 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "web3-onboard-monorepo", - "version": "2.24.18", + "version": "2.24.19", "private": true, "workspaces": { "packages": [ @@ -41,7 +41,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet", "Sequence" diff --git a/packages/core/package.json b/packages/core/package.json index baffe1be0..39e556e4a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -31,7 +31,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/packages/demo/package.json b/packages/demo/package.json index 9f79cdbbe..e70082347 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -40,9 +40,9 @@ "@web3-onboard/frame": "^2.0.2", "@web3-onboard/frontier": "^2.0.3", "@web3-onboard/gas": "^2.1.7", - "@web3-onboard/gnosis": "^2.1.10", + "@web3-onboard/gnosis": "^2.2.1", "@web3-onboard/infinity-wallet": "^2.0.3", - "@web3-onboard/injected-wallets": "^2.10.9", + "@web3-onboard/injected-wallets": "^2.10.11", "@web3-onboard/keepkey": "^2.3.7", "@web3-onboard/keystone": "^2.3.7", "@web3-onboard/ledger": "^2.5.2", @@ -59,7 +59,7 @@ "@web3-onboard/trust": "^2.0.3", "@web3-onboard/uauth": "^2.1.2", "@web3-onboard/venly": "^2.0.0", - "@web3-onboard/walletconnect": "^2.5.2", + "@web3-onboard/walletconnect": "^2.5.3", "@web3-onboard/web3auth": "^2.2.2", "@web3-onboard/xdefi": "^2.0.5", "@web3-onboard/zeal": "^2.0.3", diff --git a/packages/gnosis/package.json b/packages/gnosis/package.json index 47579f54b..cb1a2b1f9 100644 --- a/packages/gnosis/package.json +++ b/packages/gnosis/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/gnosis", - "version": "2.2.0", + "version": "2.2.1", "description": "Safe 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.", "keywords": [ "Ethereum", diff --git a/packages/gnosis/src/index.ts b/packages/gnosis/src/index.ts index 1500855ad..bc4d9707c 100644 --- a/packages/gnosis/src/index.ts +++ b/packages/gnosis/src/index.ts @@ -1,4 +1,4 @@ -import { WalletInit } from '@web3-onboard/common' +import type { WalletInit } from '@web3-onboard/common' type GnosisOptions = { whitelistedDomains: RegExp[] @@ -8,7 +8,8 @@ function gnosis(options?: GnosisOptions): WalletInit { const { whitelistedDomains = [ /^https:\/\/app\.safe\.global$/, - /^https:\/\/safe\.global$/ + /^https:\/\/safe\.global$/, + /^https:\/\/.*\.blockscout\.com$/ ] } = options || {} @@ -37,7 +38,7 @@ function gnosis(options?: GnosisOptions): WalletInit { SafeAppsSDK.default || SafeAppsSDK const opts = { - whitelistedDomains + allowedDomains: whitelistedDomains } const appsSdk = new SafeAppProviderConstructor(opts) diff --git a/packages/injected/README.md b/packages/injected/README.md index df8d3bdce..21cbf0562 100644 --- a/packages/injected/README.md +++ b/packages/injected/README.md @@ -72,10 +72,8 @@ console.log(connectedWallets) - xDefi - _Desktop & Mobile_ - 1inch - _Mobile_ - Tokenary - _Mobile_ -- GameStop - _Desktop_ - Rabby - _Desktop_ - MathWallet - _Desktop & Mobile_ -- Gamestop - _Desktop_ - Bitget - _Desktop & Mobile_ - Sequence - _Desktop & Mobile_ - Core - _Desktop_ diff --git a/packages/injected/package.json b/packages/injected/package.json index 113260e98..82028ae22 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.10.10", + "version": "2.10.11", "description": "Injected wallet module for connecting browser extension and mobile wallets 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.", "keywords": [ "Ethereum", @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Phantom", "DeFi Wallet", "Fordefi", diff --git a/packages/injected/src/types.ts b/packages/injected/src/types.ts index c8bae9bda..b701c94c1 100644 --- a/packages/injected/src/types.ts +++ b/packages/injected/src/types.ts @@ -47,7 +47,6 @@ export enum ProviderIdentityFlag { BraveWallet = 'isBraveWallet', Rabby = 'isRabby', MathWallet = 'isMathWallet', - GameStop = 'isGamestop', Bitget = 'isBitKeep', Sequence = 'isSequence', Core = 'isAvalanche', @@ -134,7 +133,6 @@ export enum ProviderLabel { Tally = 'Taho', Rabby = 'Rabby Wallet', MathWallet = 'MathWallet', - GameStop = 'GameStop Wallet', Bitget = 'Bitget Wallet', Sequence = 'Sequence', Core = 'Core', @@ -174,7 +172,6 @@ export enum InjectedNameSpace { Web3 = 'web3', Arbitrum = 'arbitrum', XFI = 'xfi', - GameStop = 'gamestop', Bitget = 'bitkeep', Avalanche = 'avalanche', Bitski = 'Bitski', @@ -205,7 +202,6 @@ export interface CustomWindow extends Window { xfi: { ethereum: InjectedProvider } - gamestop: InjectedProvider bitkeep: { ethereum: InjectedProvider } diff --git a/packages/injected/src/wallets.ts b/packages/injected/src/wallets.ts index 3c797737a..7b7a5fc40 100644 --- a/packages/injected/src/wallets.ts +++ b/packages/injected/src/wallets.ts @@ -577,27 +577,6 @@ const mathwallet: InjectedWalletModule = { platforms: ['all'] } -const gamestop: InjectedWalletModule = { - label: ProviderLabel.GameStop, - injectedNamespace: InjectedNameSpace.GameStop, - checkProviderIdentity: ({ provider }) => - !!provider && !!provider[ProviderIdentityFlag.GameStop], - getIcon: async () => (await import('./icons/gamestop.js')).default, - getInterface: async () => { - const provider = createEIP1193Provider(window.gamestop, { - eth_chainId: ({ baseRequest }) => - baseRequest({ method: 'eth_chainId' }).then( - id => `0x${parseInt(id).toString(16)}` - ), - wallet_switchEthereumChain: UNSUPPORTED_METHOD - }) - provider.removeListener = (event, listener) => {} - provider.on = (event, listener) => {} - return { provider } - }, - platforms: ['desktop'] -} - const bitget: InjectedWalletModule = { label: ProviderLabel.Bitget, injectedNamespace: InjectedNameSpace.Bitget, @@ -927,7 +906,6 @@ const wallets = [ tally, rabby, mathwallet, - gamestop, sequence, core, bitski, diff --git a/packages/react/package.json b/packages/react/package.json index 8683e3f6f..2205e1888 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/packages/solid/package.json b/packages/solid/package.json index 49ddda32a..3e0530b55 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/packages/vue/package.json b/packages/vue/package.json index f48ab4b42..97310e66b 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -30,7 +30,6 @@ "pending", "confirmed", "Injected Wallet", - "GameStop", "Crypto", "Crypto Wallet" ], diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json index 40458ba74..d3883e2d6 100644 --- a/packages/walletconnect/package.json +++ b/packages/walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/walletconnect", - "version": "2.5.2", + "version": "2.5.3", "description": "WalletConnect SDK 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.", "keywords": [ "Ethereum", @@ -59,7 +59,7 @@ "@walletconnect/types": "^2.9.0" }, "dependencies": { - "@walletconnect/ethereum-provider": "^2.10.6", + "@walletconnect/ethereum-provider": "^2.11.0", "@web3-onboard/common": "^2.3.3", "joi": "17.9.1", "rxjs": "^7.5.2" diff --git a/packages/walletconnect/src/walletConnect.ts b/packages/walletconnect/src/walletConnect.ts index 9a634fd93..1fe428b4c 100644 --- a/packages/walletconnect/src/walletConnect.ts +++ b/packages/walletconnect/src/walletConnect.ts @@ -1,9 +1,7 @@ -import { REQUIRED_METHODS } from '@walletconnect/ethereum-provider' import { isHexString } from './index.js' import type { EthereumProviderOptions } from '@walletconnect/ethereum-provider/dist/types/EthereumProvider' import type { JQueryStyleEventEmitter } from 'rxjs/internal/observable/fromEvent' -import type { EthereumProvider } from '@walletconnect/ethereum-provider' import type { WalletConnectOptions } from './types.js' import type { CoreTypes } from '@walletconnect/types' import type { @@ -58,7 +56,7 @@ function walletConnect(options: WalletConnectOptions): WalletInit { '@web3-onboard/common' ) - const { default: EthereumProvider } = await import( + const { default: EthereumProvider, REQUIRED_METHODS } = await import( '@walletconnect/ethereum-provider' ) diff --git a/yarn.lock b/yarn.lock index 4a44f5330..b741602b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5368,10 +5368,10 @@ lodash.isequal "4.5.0" uint8arrays "^3.1.0" -"@walletconnect/core@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.6.tgz#786b0d2e2045c210c917e29bfa0498bbc210be20" - integrity sha512-Z4vh4ZdfcoQjgPEOxeuF9HUZCVLtV3MgRbS/awLIj/omDrFnOwlBhxi5Syr4Y8muVGC0ocRetQYHae0/gX5crQ== +"@walletconnect/core@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.11.0.tgz#3a4e301077b2f858fd916b7a20b5b984d1afce63" + integrity sha512-2Tjp5BCevI7dbmqo/OrCjX4tqgMqwJNQLlQAlphqPfvwlF9+tIu6pGcVbSN3U9zyXzWIZCeleqEaWUeSeET4Ew== dependencies: "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-provider" "1.0.13" @@ -5384,9 +5384,10 @@ "@walletconnect/relay-auth" "^1.0.4" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" + isomorphic-unfetch "3.1.0" lodash.isequal "4.5.0" uint8arrays "^3.1.0" @@ -5503,20 +5504,20 @@ "@walletconnect/utils" "2.9.1" events "^3.3.0" -"@walletconnect/ethereum-provider@^2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.6.tgz#53720771cc2d6accd452916a853ac927f26acbaa" - integrity sha512-bBQ+yUfxLv8VxNttgNKY7nED35gSVayO/BnLHbNKvyV1gpvSCla5mWB9MsXuQs70MK0g+/qtgRVSrOtdSubaNQ== +"@walletconnect/ethereum-provider@^2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.11.0.tgz#feb90368d8b2608d7d120ac8feeb3e26eac8c709" + integrity sha512-YrTeHVjuSuhlUw7SQ6xBJXDuJ6iAC+RwINm9nVhoKYJSHAy3EVSJZOofMKrnecL0iRMtD29nj57mxAInIBRuZA== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "^1.0.13" "@walletconnect/jsonrpc-types" "^1.0.3" "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/modal" "^2.4.3" - "@walletconnect/sign-client" "2.10.6" - "@walletconnect/types" "2.10.6" - "@walletconnect/universal-provider" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/modal" "^2.6.2" + "@walletconnect/sign-client" "2.11.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/universal-provider" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/events@^1.0.1": @@ -5769,7 +5770,7 @@ "@walletconnect/modal-core" "2.6.1" "@walletconnect/modal-ui" "2.6.1" -"@walletconnect/modal@2.6.2", "@walletconnect/modal@^2.4.3": +"@walletconnect/modal@2.6.2", "@walletconnect/modal@^2.6.2": version "2.6.2" resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.2.tgz#4b534a836f5039eeb3268b80be7217a94dd12651" integrity sha512-eFopgKi8AjKf/0U4SemvcYw9zlLpx9njVN8sf6DAkowC2Md0gPU/UNEbH1Wwj407pEKnEds98pKWib1NN1ACoA== @@ -5862,19 +5863,19 @@ "@walletconnect/utils" "2.10.2" events "^3.3.0" -"@walletconnect/sign-client@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.6.tgz#722d2c2844565e2826dce6a6d3a36c9b3ca1ea91" - integrity sha512-EvUWjaZBQu2yKnH5/5F2qzbuiIuUN9ZgrNKgvXkw5z1Dq5RJCks0S9/MFlKH/ZSGqXnLl7uAzBXtoX4sMgbCMA== +"@walletconnect/sign-client@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.11.0.tgz#de10f976cc1b8ab04b7f7c27f6a298e4e083ab25" + integrity sha512-H2ukscibBS+6WrzQWh+WyVBqO5z4F5et12JcwobdwgHnJSlqIoZxqnUYYWNCI5rUR5UKsKWaUyto4AE9N5dw4Q== dependencies: - "@walletconnect/core" "2.10.6" + "@walletconnect/core" "2.11.0" "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-utils" "1.0.8" "@walletconnect/logger" "^2.0.1" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/sign-client@2.9.1": @@ -5920,10 +5921,10 @@ "@walletconnect/logger" "^2.0.1" events "^3.3.0" -"@walletconnect/types@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.6.tgz#d9920ed4fd0113e0addbda8e7e73a5176a3163fd" - integrity sha512-WgHfiTG1yakmxheaBRiXhUdEmgxwrvsAdOIWaMf/spvrzVKYh6sHI3oyEEky5qj5jjiMiyQBeB57QamzCotbcQ== +"@walletconnect/types@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.11.0.tgz#474a009c56faa9ef4063b76ed84415c801dc9f1e" + integrity sha512-AB5b1lrEbCGHxqS2vqfCkIoODieH+ZAUp9rA1O2ftrhnqDJiJK983Df87JhYhECsQUBHHfALphA8ydER0q+9sw== dependencies: "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" @@ -6000,19 +6001,19 @@ "@walletconnect/utils" "2.10.2" events "^3.3.0" -"@walletconnect/universal-provider@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.6.tgz#1a6c42517581f11ce275474bc70d0eb4f1044525" - integrity sha512-CEivusqqoD31BhCTKp08DnrccfGjwD9MFjZs5BNRorDteRFE8zVm9LmP6DSiNJCw82ZajGlZThggLQ/BAATfwA== +"@walletconnect/universal-provider@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.11.0.tgz#89053c2360b5ce766c213ca4e33bb4ce4976b0be" + integrity sha512-zgJv8jDvIMP4Qse/D9oIRXGdfoNqonsrjPZanQ/CHNe7oXGOBiQND2IIeX+tS0H7uNA0TPvctljCLiIN9nw4eA== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-types" "^1.0.2" "@walletconnect/jsonrpc-utils" "^1.0.7" "@walletconnect/logger" "^2.0.1" - "@walletconnect/sign-client" "2.10.6" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/sign-client" "2.11.0" + "@walletconnect/types" "2.11.0" + "@walletconnect/utils" "2.11.0" events "^3.3.0" "@walletconnect/universal-provider@2.9.1": @@ -6050,10 +6051,10 @@ query-string "7.1.3" uint8arrays "^3.1.0" -"@walletconnect/utils@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.6.tgz#749b37d14e291e346862e7027ec7548463350226" - integrity sha512-oRsWWhN2+hi3aiDXrQEOfysz6FHQJGXLsNQPVt+WIBJplO6Szmdau9dbleD88u1iiT4GKPqE0R9FOYvvPm1H/w== +"@walletconnect/utils@2.11.0": + version "2.11.0" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.11.0.tgz#31c95151c823022077883dda61800cdea71879b7" + integrity sha512-hxkHPlTlDQILHfIKXlmzgNJau/YcSBC3XHUSuZuKZbNEw3duFT6h6pm3HT/1+j1a22IG05WDsNBuTCRkwss+BQ== dependencies: "@stablelib/chacha20poly1305" "1.0.1" "@stablelib/hkdf" "1.0.1" @@ -6063,7 +6064,7 @@ "@walletconnect/relay-api" "^1.0.9" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" + "@walletconnect/types" "2.11.0" "@walletconnect/window-getters" "^1.0.1" "@walletconnect/window-metadata" "^1.0.1" detect-browser "5.3.0" @@ -11265,6 +11266,14 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= +isomorphic-unfetch@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" + integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== + dependencies: + node-fetch "^2.6.1" + unfetch "^4.2.0" + isomorphic-ws@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf" @@ -15827,6 +15836,11 @@ unenv@^1.7.4: node-fetch-native "^1.4.1" pathe "^1.1.1" +unfetch@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" + integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" From 9c874eee7aa6d0e15712ea48a3353ddc90342c61 Mon Sep 17 00:00:00 2001 From: Samy Rabah Date: Sat, 3 Feb 2024 00:08:12 +0100 Subject: [PATCH 06/31] load ledger connect kit via package instead of loader (#2061) * load ledger connect kit via package instead of loader * change import ethereumprovider type file extension * Update default optional methods, bump to minor version as deps changed and test --------- Co-authored-by: Adam Carpenter --- packages/demo/package.json | 2 +- packages/ledger/package.json | 4 +-- packages/ledger/src/v1.ts | 13 +++------ packages/ledger/src/v2.ts | 17 +++++------ yarn.lock | 55 ++++++++++++++++++++++++++++++++++++ 5 files changed, 69 insertions(+), 22 deletions(-) diff --git a/packages/demo/package.json b/packages/demo/package.json index e70082347..ab5a567d4 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -45,7 +45,7 @@ "@web3-onboard/injected-wallets": "^2.10.11", "@web3-onboard/keepkey": "^2.3.7", "@web3-onboard/keystone": "^2.3.7", - "@web3-onboard/ledger": "^2.5.2", + "@web3-onboard/ledger": "^2.6.0-alpha.1", "@web3-onboard/magic": "^2.1.6", "@web3-onboard/metamask": "^2.0.2", "@web3-onboard/mew-wallet": "^2.0.3", diff --git a/packages/ledger/package.json b/packages/ledger/package.json index 31eec94aa..80d80b97b 100644 --- a/packages/ledger/package.json +++ b/packages/ledger/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/ledger", - "version": "2.5.2", + "version": "2.6.0-alpha.1", "description": "Ledger hardware wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized 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.", "keywords": [ "Ethereum", @@ -60,7 +60,7 @@ }, "dependencies": { "@ethersproject/providers": "5.5.0", - "@ledgerhq/connect-kit-loader": "^1.1.0", + "@ledgerhq/connect-kit": "1.1.12", "@walletconnect/client": "^1.8.0", "@walletconnect/ethereum-provider": "2.9.1", "@walletconnect/modal": "2.6.1", diff --git a/packages/ledger/src/v1.ts b/packages/ledger/src/v1.ts index c8589c011..fa36154f8 100644 --- a/packages/ledger/src/v1.ts +++ b/packages/ledger/src/v1.ts @@ -7,7 +7,7 @@ import { ChainId, AccountAddress } from '@web3-onboard/common' -import type { EthereumProvider } from '@ledgerhq/connect-kit-loader' +import type { EthereumProvider } from '@ledgerhq/connect-kit/dist/umd/index.js' import type { StaticJsonRpcProvider as StaticJsonRpcProviderType } from '@ethersproject/providers' import WalletConnect from '@walletconnect/client' import { isHexString, LedgerOptionsWCv1 } from './index.js' @@ -20,18 +20,13 @@ function ledger( label: 'Ledger', getIcon: async () => (await import('./icon.js')).default, getInterface: async ({ chains, EventEmitter }: GetInterfaceHelpers) => { - const { - loadConnectKit, - SupportedProviders, - SupportedProviderImplementations - } = await import('@ledgerhq/connect-kit-loader') + const connectKit = await import('@ledgerhq/connect-kit/dist/umd') - const connectKit = await loadConnectKit() if (options.enableDebugLogs) { connectKit.enableDebugLogs() } const checkSupportResult = connectKit.checkSupport({ - providerType: SupportedProviders.Ethereum, + providerType: connectKit.SupportedProviders.Ethereum, chainId: options?.chainId, infuraId: options?.infuraId, rpc: options?.rpc @@ -44,7 +39,7 @@ function ledger( // return the Ledger Extension provider if ( checkSupportResult.providerImplementation === - SupportedProviderImplementations.LedgerConnect + connectKit.SupportedProviderImplementations.LedgerConnect ) { return { provider: instance diff --git a/packages/ledger/src/v2.ts b/packages/ledger/src/v2.ts index eefaf4554..230060378 100644 --- a/packages/ledger/src/v2.ts +++ b/packages/ledger/src/v2.ts @@ -4,7 +4,7 @@ import { EIP1193Provider, ProviderAccounts } from '@web3-onboard/common' -import type { EthereumProvider as LedgerEthereumProvider } from '@ledgerhq/connect-kit-loader' +import type { EthereumProvider as LedgerEthereumProvider } from '@ledgerhq/connect-kit/dist/umd/index.js' import { isHexString, LedgerOptionsWCv2 } from './index.js' import type { JQueryStyleEventEmitter } from 'rxjs/internal/observable/fromEvent' @@ -15,7 +15,9 @@ const defaultOptionalMethods = [ 'personal_sign', 'eth_sign', 'eth_signTypedData', - 'eth_signTypedData_v4' + 'eth_signTypedData_v4', + 'wallet_addEthereumChain', + 'wallet_switchEthereumChain' ] function ledger(options?: LedgerOptionsWCv2): WalletInit { @@ -30,13 +32,8 @@ function ledger(options?: LedgerOptionsWCv2): WalletInit { label: 'Ledger', getIcon: async () => (await import('./icon.js')).default, getInterface: async ({ chains, EventEmitter }) => { - const { - loadConnectKit, - SupportedProviders, - SupportedProviderImplementations - } = await import('@ledgerhq/connect-kit-loader') + const connectKit = await import('@ledgerhq/connect-kit/dist/umd') - const connectKit = await loadConnectKit() if (options?.enableDebugLogs) { connectKit.enableDebugLogs() } @@ -54,7 +51,7 @@ function ledger(options?: LedgerOptionsWCv2): WalletInit { : defaultOptionalMethods const checkSupportResult = connectKit.checkSupport({ - providerType: SupportedProviders.Ethereum, + providerType: connectKit.SupportedProviders.Ethereum, walletConnectVersion: 2, projectId: options?.projectId, chains: requiredChains, @@ -79,7 +76,7 @@ function ledger(options?: LedgerOptionsWCv2): WalletInit { // return the Ledger Extension provider if ( checkSupportResult.providerImplementation === - SupportedProviderImplementations.LedgerConnect + connectKit.SupportedProviderImplementations.LedgerConnect ) { return { provider: instance diff --git a/yarn.lock b/yarn.lock index b741602b0..b7cde201a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2742,6 +2742,14 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/connect-kit-loader/-/connect-kit-loader-1.1.0.tgz#10343b78ef13436818bf3453568a559c0eeb9d48" integrity sha512-HUy12FEczoWY2FPubnsm1uOA8tkVWc0j90i47suThV3C9NL2xx69ZAIEU3Ytzs2bwLek9S1Q2S1VQJvA+3Ygkg== +"@ledgerhq/connect-kit@1.1.12": + version "1.1.12" + resolved "https://registry.yarnpkg.com/@ledgerhq/connect-kit/-/connect-kit-1.1.12.tgz#e6782c207a2c8d1f4db603d090c0bbecef02e5fd" + integrity sha512-dmnG2BGBckzaUaqXmkoDxy1+Yvk/simH8NNaZOQaOFk2EfFNsaw5Q3EKrw9tzqjSXmg6t6eGUNPxE0ji9uZprw== + dependencies: + rollup-plugin-dotenv "0.5.0" + uuid "9.0.1" + "@lit-labs/ssr-dom-shim@^1.0.0", "@lit-labs/ssr-dom-shim@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.0.tgz#3361d6b8c4cb2ac426d5794ac7cd9776cd2f0814" @@ -3487,6 +3495,14 @@ "@rollup/pluginutils" "^3.1.0" magic-string "^0.25.7" +"@rollup/plugin-replace@^5.0.1": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.5.tgz#33d5653dce6d03cb24ef98bef7f6d25b57faefdf" + integrity sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ== + dependencies: + "@rollup/pluginutils" "^5.0.1" + magic-string "^0.30.3" + "@rollup/plugin-typescript@^8.0.0": version "8.3.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz#bc1077fa5897b980fc27e376c4e377882c63e68b" @@ -3504,6 +3520,15 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^5.0.1": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0" + integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g== + dependencies: + "@types/estree" "^1.0.0" + estree-walker "^2.0.2" + picomatch "^2.3.1" + "@safe-global/safe-apps-provider@^0.17.1": version "0.17.1" resolved "https://registry.yarnpkg.com/@safe-global/safe-apps-provider/-/safe-apps-provider-0.17.1.tgz#72df2a66be5343940ed505efe594ed3b0f2f7015" @@ -4617,6 +4642,11 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== +"@types/estree@^1.0.0": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== + "@types/ethereumjs-util@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@types/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz#f49fe8114789ec0871721392c09318c3eb56671b" @@ -8664,6 +8694,11 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" +dotenv@^16.0.3: + version "16.4.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.1.tgz#1d9931f1d3e5d2959350d1250efab299561f7f11" + integrity sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ== + drbg.js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b" @@ -12027,6 +12062,13 @@ magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.4" +magic-string@^0.30.3: + version "0.30.6" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.6.tgz#996e21b42f944e45591a68f0905d6a740a12506c" + integrity sha512-n62qCLbPjNjyo+owKtveQxZFZTBm+Ms6YoGD23Wew6Vw337PElFNifQpknPruVRQV57kVShPnLGo9vWxVhpPvA== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.15" + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -14200,6 +14242,14 @@ rlp@^2.0.0, rlp@^2.2.3, rlp@^2.2.4: dependencies: bn.js "^5.2.0" +rollup-plugin-dotenv@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-dotenv/-/rollup-plugin-dotenv-0.5.0.tgz#c2df297be52f3dcc0ae7fb048e08f906cee112e7" + integrity sha512-M2gZqEZebtcKaA7OBdO4UF3WmkI02wVD6UVwoxFlRKoq4/n1Q9Cw6UV8dPvVZYpGQ+ug2JPoogrCLaydIKU96A== + dependencies: + "@rollup/plugin-replace" "^5.0.1" + dotenv "^16.0.3" + rollup-plugin-svelte@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.0.tgz#d45f2b92b1014be4eb46b55aa033fb9a9c65f04d" @@ -16011,6 +16061,11 @@ uuid@9.0.0, uuid@^9.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== +uuid@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" + integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== + uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" From e71f3eea946f54accd65b2b4e6f0e7803c98d6bf Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Fri, 2 Feb 2024 16:12:39 -0700 Subject: [PATCH 07/31] Bump ledger module node version for build to 16.14.2 (#2062) --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3ec88fd22..f327a16e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -217,7 +217,7 @@ jobs: - node-build-steps build-ledger: docker: - - image: cimg/node:16.13.1 + - image: cimg/node:16.14.2 working_directory: ~/web3-onboard-monorepo/packages/ledger steps: - node-build-steps @@ -497,7 +497,7 @@ jobs: - node-staging-build-steps build-staging-ledger: docker: - - image: cimg/node:16.13.1 + - image: cimg/node:16.14.2 working_directory: ~/web3-onboard-monorepo/packages/ledger steps: - node-staging-build-steps From 424a3384a2ef9f20c1abd9f4bc36dbba950b3185 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Fri, 2 Feb 2024 16:16:13 -0700 Subject: [PATCH 08/31] Ledger - [FIX] : Bump ledger module node version for build to 18.0.0 because of WC dep (#2063) * Bump ledger module node version for build to 16.14.2 * Bump node version again for WC dep within ledger --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f327a16e4..9fefd44ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -217,7 +217,7 @@ jobs: - node-build-steps build-ledger: docker: - - image: cimg/node:16.14.2 + - image: cimg/node:18.0.0 working_directory: ~/web3-onboard-monorepo/packages/ledger steps: - node-build-steps @@ -497,7 +497,7 @@ jobs: - node-staging-build-steps build-staging-ledger: docker: - - image: cimg/node:16.14.2 + - image: cimg/node:18.0.0 working_directory: ~/web3-onboard-monorepo/packages/ledger steps: - node-staging-build-steps From df16fc4434e30f4a42c9a7a005008eeb996c4118 Mon Sep 17 00:00:00 2001 From: Kean Laurens Date: Mon, 5 Feb 2024 20:05:23 +0400 Subject: [PATCH 09/31] Add Lif3 Wallet Support (#2058) * add lif3Wallet * Update package version and add wallet to docs * Fix Lif3 Wallet name --------- Co-authored-by: Tekrajs Co-authored-by: Adam Carpenter --- .../[...4]wallets/[...14]injected/+page.md | 1 + packages/demo/package.json | 2 +- packages/injected/README.md | 1 + packages/injected/package.json | 2 +- packages/injected/src/constants.ts | 3 +- packages/injected/src/icons/lif3wallet.ts | 38 +++++++++++++++++++ packages/injected/src/types.ts | 9 +++-- packages/injected/src/wallets.ts | 18 ++++++++- 8 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 packages/injected/src/icons/lif3wallet.ts diff --git a/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md b/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md index 7f0b69295..4b24c91a2 100644 --- a/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...14]injected/+page.md @@ -357,6 +357,7 @@ const injected = injectedModule({ - Coin98 Wallet - _Desktop & Mobile_ - SubWallet - _Desktop & Mobile_ - Kayros - _Desktop_ +- Lif3Wallet - _Mobile_ ## Build Environments diff --git a/packages/demo/package.json b/packages/demo/package.json index ab5a567d4..637682b37 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -42,7 +42,7 @@ "@web3-onboard/gas": "^2.1.7", "@web3-onboard/gnosis": "^2.2.1", "@web3-onboard/infinity-wallet": "^2.0.3", - "@web3-onboard/injected-wallets": "^2.10.11", + "@web3-onboard/injected-wallets": "^2.10.12-alpha.1", "@web3-onboard/keepkey": "^2.3.7", "@web3-onboard/keystone": "^2.3.7", "@web3-onboard/ledger": "^2.6.0-alpha.1", diff --git a/packages/injected/README.md b/packages/injected/README.md index 21cbf0562..9f0035078 100644 --- a/packages/injected/README.md +++ b/packages/injected/README.md @@ -92,6 +92,7 @@ console.log(connectedWallets) - Coin98 Wallet - _Desktop & Mobile_ - SubWallet - _Desktop & Mobile_ - Kayros - _Desktop_ +- Lif3Wallet - _Mobile_ ## Filtering Wallets diff --git a/packages/injected/package.json b/packages/injected/package.json index 82028ae22..a92d93d54 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.10.11", + "version": "2.10.12-alpha.1", "description": "Injected wallet module for connecting browser extension and mobile wallets 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.", "keywords": [ "Ethereum", diff --git a/packages/injected/src/constants.ts b/packages/injected/src/constants.ts index bb1eda830..7cf52ffdd 100644 --- a/packages/injected/src/constants.ts +++ b/packages/injected/src/constants.ts @@ -33,5 +33,6 @@ export const WALLET_NAMES: { [key: string]: string } = { coin98wallet: 'Coin98 Wallet', SubWallet: 'SubWallet', kayros: 'Kayros', - foxwallet: "FoxWallet" + foxwallet: "FoxWallet", + Lif3Wallet: 'Lif3 Wallet' } diff --git a/packages/injected/src/icons/lif3wallet.ts b/packages/injected/src/icons/lif3wallet.ts new file mode 100644 index 000000000..60bbce299 --- /dev/null +++ b/packages/injected/src/icons/lif3wallet.ts @@ -0,0 +1,38 @@ +export default ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` \ No newline at end of file diff --git a/packages/injected/src/types.ts b/packages/injected/src/types.ts index b701c94c1..13912c79e 100644 --- a/packages/injected/src/types.ts +++ b/packages/injected/src/types.ts @@ -67,7 +67,8 @@ export enum ProviderIdentityFlag { Coin98Wallet = 'isCoin98', SubWallet = 'isSubWallet', Kayros = 'isKayros', - FoxWallet = 'isFoxWallet' + FoxWallet = 'isFoxWallet', + Lif3Wallet = 'isLif3Wallet', } /** @@ -93,7 +94,8 @@ export enum ProviderExternalUrl { SubWallet = 'https://www.subwallet.app/', Kayros = 'https://www.kayros.games/wallet/', XDEFI = 'https://xdefi.io/', - FoxWallet = 'https://foxwallet.com/download' + FoxWallet = 'https://foxwallet.com/download', + Lif3Wallet = 'https://lif3.com' } export enum ProviderLabel { @@ -152,7 +154,8 @@ export enum ProviderLabel { Coin98Wallet = 'Coin98 Wallet', SubWallet = 'SubWallet', Kayros = 'Kayros', - FoxWallet = 'FoxWallet' + FoxWallet = 'FoxWallet', + Lif3Wallet = 'Lif3 Wallet', } export interface MeetOneProvider extends ExternalProvider { diff --git a/packages/injected/src/wallets.ts b/packages/injected/src/wallets.ts index 7b7a5fc40..966ff9cc6 100644 --- a/packages/injected/src/wallets.ts +++ b/packages/injected/src/wallets.ts @@ -871,6 +871,21 @@ const foxwallet: InjectedWalletModule = { platforms: ['mobile'] } +const Lif3Wallet: InjectedWalletModule = { + label: ProviderLabel.Lif3Wallet, + injectedNamespace: InjectedNameSpace.Ethereum, + checkProviderIdentity: ({ provider }) => + !!provider && !!provider[ProviderIdentityFlag.Lif3Wallet], + getIcon: async () => (await import('./icons/lif3wallet.js')).default, + getInterface: async () => ({ + provider: createEIP1193Provider(window.ethereum, { + wallet_switchEthereumChain: UNSUPPORTED_METHOD, + eth_selectAccounts: UNSUPPORTED_METHOD + }) + }), + platforms: ['mobile'] +} + const wallets = [ zeal, exodus, @@ -925,7 +940,8 @@ const wallets = [ coin98wallet, subwallet, kayros, - foxwallet + foxwallet, + Lif3Wallet ] export default wallets From 2e51cfe336ec4938a4e8c48fbcf68f5be171c94f Mon Sep 17 00:00:00 2001 From: TABASCO <84655644+TABASCOatw@users.noreply.github.com> Date: Tue, 20 Feb 2024 10:52:16 -0700 Subject: [PATCH 10/31] Adds Particle Network (Wallet-as-a-Service) (#1962) * Add files via upload * Update README.md * Create +page.md * Update package.json * Rename +page.md to +page.md * Update apple.ts * Demo addition * Update packages/demo/package.json Co-authored-by: Kat Leight <33187102+leightkt@users.noreply.github.com> * Update packages/particle-network/package.json Co-authored-by: Kat Leight <33187102+leightkt@users.noreply.github.com> * Fixes * Correction * Update index.ts * Update index.ts * Update index.ts * Update index.ts * Small type fix and format * async fix --------- Co-authored-by: Kat Leight <33187102+leightkt@users.noreply.github.com> --- README.md | 1 + docs/package.json | 1 + .../[...33]particlenetwork/+page.md | 94 ++++++++ packages/demo/package.json | 1 + packages/demo/src/App.svelte | 10 +- packages/particle-network/README.md | 75 +++++++ packages/particle-network/package.json | 68 ++++++ packages/particle-network/src/apple.svg.ts | 7 + packages/particle-network/src/discord.svg.ts | 7 + packages/particle-network/src/email.svg.ts | 6 + packages/particle-network/src/facebook.svg.ts | 6 + packages/particle-network/src/github.svg.ts | 7 + packages/particle-network/src/google.svg.ts | 201 ++++++++++++++++++ packages/particle-network/src/icon.svg.ts | 54 +++++ packages/particle-network/src/index.ts | 122 +++++++++++ packages/particle-network/src/linkedin.svg.ts | 9 + .../particle-network/src/microsoft.svg.ts | 10 + packages/particle-network/src/phone.svg.ts | 6 + packages/particle-network/src/twitch.svg.ts | 6 + packages/particle-network/src/twitter.svg.ts | 6 + packages/particle-network/tsconfig.json | 15 ++ 21 files changed, 711 insertions(+), 1 deletion(-) create mode 100644 docs/src/routes/docs/[...4]wallets/[...33]particlenetwork/+page.md create mode 100644 packages/particle-network/README.md create mode 100644 packages/particle-network/package.json create mode 100644 packages/particle-network/src/apple.svg.ts create mode 100644 packages/particle-network/src/discord.svg.ts create mode 100644 packages/particle-network/src/email.svg.ts create mode 100644 packages/particle-network/src/facebook.svg.ts create mode 100644 packages/particle-network/src/github.svg.ts create mode 100644 packages/particle-network/src/google.svg.ts create mode 100644 packages/particle-network/src/icon.svg.ts create mode 100644 packages/particle-network/src/index.ts create mode 100644 packages/particle-network/src/linkedin.svg.ts create mode 100644 packages/particle-network/src/microsoft.svg.ts create mode 100644 packages/particle-network/src/phone.svg.ts create mode 100644 packages/particle-network/src/twitch.svg.ts create mode 100644 packages/particle-network/src/twitter.svg.ts create mode 100644 packages/particle-network/tsconfig.json diff --git a/README.md b/README.md index 5977a0f44..8707f0b18 100644 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ For full documentation, check out the README.md for each package or the [docs pa - [Infinity Wallet](packages/infinity-wallet/README.md) - [Frame](packages/frame/README.md) - [Blocto](packages/blocto/README.md) +- [Particle Network](packages/particle-network/README.md) **Hardware Wallets** diff --git a/docs/package.json b/docs/package.json index 574593a8d..5570feead 100644 --- a/docs/package.json +++ b/docs/package.json @@ -88,6 +88,7 @@ "@web3-onboard/web3auth": "^2.2.3", "@web3-onboard/xdefi": "^2.0.4", "@web3-onboard/zeal": "^2.0.4", + "@web3-onboard/particle-network": "^2.2.3", "animejs": "^3.2.1", "bnc-sdk": "^4.6.6", "ethers": "^5.7.0", diff --git a/docs/src/routes/docs/[...4]wallets/[...33]particlenetwork/+page.md b/docs/src/routes/docs/[...4]wallets/[...33]particlenetwork/+page.md new file mode 100644 index 000000000..b54aadca8 --- /dev/null +++ b/docs/src/routes/docs/[...4]wallets/[...33]particlenetwork/+page.md @@ -0,0 +1,94 @@ +--- +title: Particle Network +--- + +# {$frontmatter.title} + +Wallet module for connecting Particle Network to web3-onboard + +## Install + + + + +```sh copy +yarn add @web3-onboard/particle-network +``` + + + + +```sh copy +npm install @web3-onboard/particle-network +``` + + + + +## Options + +See the [Particle Network Docs](https://docs.particle.network/developers/auth-service/sdks/web) for the extensive list of options. + +## Usage + +```typescript +import Onboard from '@web3-onboard/core' +import particleModule from '@web3-onboard/particle-network' + +const particle = particleModule({ + projectId: 'YOUR PROJECT ID', + clientKey: 'YOUR CLIENT KEY', + appId: 'YOUR APP ID' + // Can also add wallet object + preferredAuthType for further customization +}) + +const onboard = Onboard({ + // ... other Onboard options + wallets: [ + particle + //... other wallets + ] +}) + +const connectedWallets = await onboard.connectWallet() +console.log(connectedWallets) +``` + +## Types + +```typescript +/** + * Enumerates the supported authentication types. + */ +type AuthTypes = 'email' | 'phone' | 'google' | 'apple' | 'twitter' | 'facebook' | 'microsoft' | 'linkedin' | 'github' | 'twitch' | 'discord'; + +/** + * Interface that describes the preferred authentication type. + * @property {AuthTypes} type - The preferred type of authentication. + * @property {boolean} setAsDisplay - Indicates whether the type should be displayed within the UI. + */ +interface PreferredAuthType { + type: AuthTypes; + setAsDisplay: boolean; +} + +/** + * Options for initializing the Particle Auth module. + * @property {string} projectId - Particle Network project ID. + * @property {string} clientKey - Particle Network client key. + * @property {string} appId - Particle Network application ID. + * @property {string} [chainName] - (Optional) Specifies the name of the blockchain. Handled automatically if left blank. + * @property {number} [chainId] - (Optional) Specifies the blockchain's numeric ID. Handled automatically if left blank. + * @property {object} [wallet] - (Optional) Configuration for the wallet. + * @property {AuthTypes | PreferredAuthType} [preferredAuthType] - (Optional) Specifies the preferred type of authentication. + */ +interface ParticleAuthModuleOptions { + projectId: string; + clientKey: string; + appId: string; + chainName?: string; + chainId?: number; + wallet?: object; + preferredAuthType?: AuthTypes | PreferredAuthType; +} +``` diff --git a/packages/demo/package.json b/packages/demo/package.json index 637682b37..b5a432066 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -63,6 +63,7 @@ "@web3-onboard/web3auth": "^2.2.2", "@web3-onboard/xdefi": "^2.0.5", "@web3-onboard/zeal": "^2.0.3", + "@web3-onboard/particle-network": "^2.0.0-alpha.1", "vconsole": "^3.15.1" }, "license": "MIT", diff --git a/packages/demo/src/App.svelte b/packages/demo/src/App.svelte index 991ed86f2..221d14817 100644 --- a/packages/demo/src/App.svelte +++ b/packages/demo/src/App.svelte @@ -34,6 +34,7 @@ import arcanaAuthModule from '@web3-onboard/arcana-auth' import venlyModule from '@web3-onboard/venly' import bitgetModule from '@web3-onboard/bitget' + import particleAuthModule from '@web3-onboard/particle-network' import capsuleModule, { Environment } from '@web3-onboard/capsule' import { recoverAddress, @@ -195,6 +196,12 @@ // for more info see the @web3-onboard/magic docs }) + const particle = particleAuthModule({ + projectId: 'b385ccf0-73c3-485a-9941-159b7855b806', + clientKey: 'cSTLqhvONB5j588Wz6E5WJLMPrHeUlGbymf1DFhO', + appId: 'b1f0239a-edb0-41f9-b0f5-ab780bb02a9e' + }) + const dcent = dcentModule() const bitget = bitgetModule() const frameWallet = frameModule() @@ -247,7 +254,8 @@ cedeStore, arcanaAuth, blocto, - venly + venly, + particle ], // transactionPreview, gas, diff --git a/packages/particle-network/README.md b/packages/particle-network/README.md new file mode 100644 index 000000000..87d440d51 --- /dev/null +++ b/packages/particle-network/README.md @@ -0,0 +1,75 @@ +# @web3-onboard/particle-network + +## Wallet module for connecting Particle Network to web3-onboard + +### Install + +`npm i @web3-onboard/core @web3-onboard/particle-network` + +## Options + +See the [Particle Network Docs](https://docs.particle.network/developers/auth-service/sdks/web) for the extensive list of options. + +## Usage + +```typescript +import Onboard from '@web3-onboard/core' +import particleModule from '@web3-onboard/particle-network' + +const particle = particleModule({ + projectId: 'YOUR PROJECT ID', + clientKey: 'YOUR CLIENT KEY', + appId: 'YOUR APP ID' + // Can also add wallet object + preferredAuthType for further customization +}) + +const onboard = Onboard({ + // ... other Onboard options + wallets: [ + particle + //... other wallets + ] +}) + +const connectedWallets = await onboard.connectWallet() +console.log(connectedWallets) +``` + +## Types + +```typescript +/** + * Enumerates the supported authentication types. + */ +type AuthTypes = 'email' | 'phone' | 'google' | 'apple' | 'twitter' | 'facebook' | 'microsoft' | 'linkedin' | 'github' | 'twitch' | 'discord'; + +/** + * Interface that describes the preferred authentication type. + * @property {AuthTypes} type - The preferred type of authentication. + * @property {boolean} setAsDisplay - Indicates whether the type should be displayed within the UI. + */ +interface PreferredAuthType { + type: AuthTypes; + setAsDisplay: boolean; +} + +/** + * Options for initializing the Particle Auth module. + * @property {string} projectId - Particle Network project ID. + * @property {string} clientKey - Particle Network client key. + * @property {string} appId - Particle Network application ID. + * @property {string} [chainName] - (Optional) Specifies the name of the blockchain. Handled automatically if left blank. + * @property {number} [chainId] - (Optional) Specifies the blockchain's numeric ID. Handled automatically if left blank. + * @property {object} [wallet] - (Optional) Configuration for the wallet. + * @property {AuthTypes | PreferredAuthType} [preferredAuthType] - (Optional) Specifies the preferred type of authentication. + */ +interface ParticleAuthModuleOptions { + projectId: string; + clientKey: string; + appId: string; + chainName?: string; + chainId?: number; + wallet?: object; + preferredAuthType?: AuthTypes | PreferredAuthType; +} +``` \ No newline at end of file diff --git a/packages/particle-network/package.json b/packages/particle-network/package.json new file mode 100644 index 000000000..d7c482000 --- /dev/null +++ b/packages/particle-network/package.json @@ -0,0 +1,68 @@ +{ + "name": "@web3-onboard/particle-network", + "version": "2.0.0-alpha.1", + "description": "Particle Network 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.", + "keywords": [ + "Ethereum", + "Web3", + "EVM", + "dapp", + "Multichain", + "Wallet", + "Transaction", + "Provider", + "Hardware Wallet", + "Notifications", + "React", + "Svelte", + "Vue", + "Next", + "Nuxt", + "MetaMask", + "Coinbase", + "WalletConnect", + "Ledger", + "Trezor", + "Connect Wallet", + "Ethereum Hooks", + "Blocknative", + "Mempool", + "pending", + "confirmed", + "Injected Wallet" + ], + "repository": { + "type": "git", + "url": "https://github.com/blocknative/web3-onboard.git", + "directory": "packages/particle-network" + }, + "homepage": "https://onboard.blocknative.com", + "bugs": "https://github.com/blocknative/web3-onboard/issues", + "module": "dist/index.js", + "browser": "dist/index.js", + "main": "dist/index.js", + "type": "module", + "typings": "dist/index.d.ts", + "files": [ + "dist" + ], + "scripts": { + "build": "tsc", + "dev": "tsc -w", + "type-check": "tsc --noEmit" + }, + "license": "MIT", + "devDependencies": { + "react": "^18.2.0", + "typescript": "^4.5.5" + }, + "dependencies": { + "@web3-onboard/common": "^2.3.3", + "@particle-network/auth": "^1.2.1", + "@particle-network/provider": "^1.2.0", + "react-dom": "^18.2.0" + }, + "peerDependencies": { + "react": ">=18.2" + } +} diff --git a/packages/particle-network/src/apple.svg.ts b/packages/particle-network/src/apple.svg.ts new file mode 100644 index 000000000..a5f8d5c7c --- /dev/null +++ b/packages/particle-network/src/apple.svg.ts @@ -0,0 +1,7 @@ +export default ` + + + + + +` diff --git a/packages/particle-network/src/discord.svg.ts b/packages/particle-network/src/discord.svg.ts new file mode 100644 index 000000000..4afb9222b --- /dev/null +++ b/packages/particle-network/src/discord.svg.ts @@ -0,0 +1,7 @@ +export default ` + + + + + +` diff --git a/packages/particle-network/src/email.svg.ts b/packages/particle-network/src/email.svg.ts new file mode 100644 index 000000000..964fb4089 --- /dev/null +++ b/packages/particle-network/src/email.svg.ts @@ -0,0 +1,6 @@ +export default ` + + + + +` diff --git a/packages/particle-network/src/facebook.svg.ts b/packages/particle-network/src/facebook.svg.ts new file mode 100644 index 000000000..4fc6736eb --- /dev/null +++ b/packages/particle-network/src/facebook.svg.ts @@ -0,0 +1,6 @@ +export default ` + + + + +` diff --git a/packages/particle-network/src/github.svg.ts b/packages/particle-network/src/github.svg.ts new file mode 100644 index 000000000..6ee9b5f8e --- /dev/null +++ b/packages/particle-network/src/github.svg.ts @@ -0,0 +1,7 @@ +export default ` + + + + + +` diff --git a/packages/particle-network/src/google.svg.ts b/packages/particle-network/src/google.svg.ts new file mode 100644 index 000000000..445e7f2ff --- /dev/null +++ b/packages/particle-network/src/google.svg.ts @@ -0,0 +1,201 @@ +export default ` + + + + + + + + + +` diff --git a/packages/particle-network/src/icon.svg.ts b/packages/particle-network/src/icon.svg.ts new file mode 100644 index 000000000..46009ad40 --- /dev/null +++ b/packages/particle-network/src/icon.svg.ts @@ -0,0 +1,54 @@ +export default ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +` diff --git a/packages/particle-network/src/index.ts b/packages/particle-network/src/index.ts new file mode 100644 index 000000000..09c8a1e41 --- /dev/null +++ b/packages/particle-network/src/index.ts @@ -0,0 +1,122 @@ +import { + WalletInit, + EIP1193Provider, + ProviderRpcError, + ProviderRpcErrorCode, + ProviderAccounts +} from '@web3-onboard/common' +import type { Config } from '@particle-network/auth' + +/** + * Represents the different authentication methods available. + * @typedef {'email' | 'phone' | 'google' | 'apple' | 'twitter' | 'facebook' | 'microsoft' | 'linkedin' | 'github' | 'twitch' | 'discord'} AuthTypes + */ +type AuthTypes = + | 'email' + | 'phone' + | 'google' + | 'apple' + | 'twitter' + | 'facebook' + | 'microsoft' + | 'linkedin' + | 'github' + | 'twitch' + | 'discord' + +/** + * Interface for setting a preferred social login type and whether it should be displayed or just routed through the standard menu item. + * @interface + */ +interface PreferredAuthType { + type: AuthTypes + setAsDisplay: boolean +} + +/** + * Configuration options enabling custom authentication type selection, extending the basic Config. + * @interface + * @extends {Config} + */ +interface ParticleAuthModuleOptions extends Config { + preferredAuthType?: AuthTypes | PreferredAuthType +} + +const getDisplayLabel = (authType?: string, shouldSetDisplay?: boolean) => { + if (authType) { + return shouldSetDisplay + ? authType.charAt(0).toUpperCase() + authType.slice(1) + : 'Particle Network' + } + return 'Particle Network' +} + +const particleAuth = (options: ParticleAuthModuleOptions): WalletInit => { + const { preferredAuthType, ...otherOptions } = options + const isAuthTypeObject = typeof preferredAuthType === 'object' + const authType = + isAuthTypeObject && preferredAuthType ? preferredAuthType.type : undefined + const setAsDisplay = + isAuthTypeObject && preferredAuthType + ? preferredAuthType.setAsDisplay + : false + + const displayLabel = getDisplayLabel(authType, setAsDisplay) + + return () => ({ + label: displayLabel, + getIcon: async () => { + const iconName = authType && setAsDisplay ? authType : 'icon' + return (await import(`./${iconName}.svg`)).default + }, + getInterface: async ({ chains }) => { + const { createEIP1193Provider } = await import('@web3-onboard/common') + const { ParticleNetwork } = await import('@particle-network/auth') + const { ParticleProvider } = await import('@particle-network/provider') + let [currentChain] = chains + const { label, id } = currentChain + + const chainName = label + ? label.split(' ')[0].toLowerCase() + : 'defaultChainName' + const chainId = parseInt(id.toString(), 16) + + const particleConfig: Config = { + ...otherOptions, + chainName, + chainId + } + + let particle = new ParticleNetwork(particleConfig) + let provider = new ParticleProvider(particle.auth) + + provider = (function patchProvider(provider: any): any { + const patchedProvider = createEIP1193Provider(provider, { + eth_selectAccounts: null, + eth_requestAccounts: async ({ baseRequest }) => { + try { + const accounts = await baseRequest({ method: 'eth_accounts' }) + return accounts as ProviderAccounts + } catch (error) { + console.error(error) + throw new ProviderRpcError({ + code: ProviderRpcErrorCode.ACCOUNT_ACCESS_REJECTED, + message: 'Account access rejected' + }) + } + } + }) + + patchedProvider.disconnect = () => particle.auth.logout() + return patchedProvider + })(provider) + + return { + provider, + instance: particle + } + } + }) +} + +export default particleAuth diff --git a/packages/particle-network/src/linkedin.svg.ts b/packages/particle-network/src/linkedin.svg.ts new file mode 100644 index 000000000..4f7c28184 --- /dev/null +++ b/packages/particle-network/src/linkedin.svg.ts @@ -0,0 +1,9 @@ +export default ` + + + + + + + +` diff --git a/packages/particle-network/src/microsoft.svg.ts b/packages/particle-network/src/microsoft.svg.ts new file mode 100644 index 000000000..f9c02cfcd --- /dev/null +++ b/packages/particle-network/src/microsoft.svg.ts @@ -0,0 +1,10 @@ +export default ` + + + + + + + + +` diff --git a/packages/particle-network/src/phone.svg.ts b/packages/particle-network/src/phone.svg.ts new file mode 100644 index 000000000..9ebeefc42 --- /dev/null +++ b/packages/particle-network/src/phone.svg.ts @@ -0,0 +1,6 @@ +export default ` + + + + +` diff --git a/packages/particle-network/src/twitch.svg.ts b/packages/particle-network/src/twitch.svg.ts new file mode 100644 index 000000000..36934e8a1 --- /dev/null +++ b/packages/particle-network/src/twitch.svg.ts @@ -0,0 +1,6 @@ +export default ` + + + + +` diff --git a/packages/particle-network/src/twitter.svg.ts b/packages/particle-network/src/twitter.svg.ts new file mode 100644 index 000000000..d634f321e --- /dev/null +++ b/packages/particle-network/src/twitter.svg.ts @@ -0,0 +1,6 @@ +export default ` + + + + +` diff --git a/packages/particle-network/tsconfig.json b/packages/particle-network/tsconfig.json new file mode 100644 index 000000000..ea1e11ef0 --- /dev/null +++ b/packages/particle-network/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../../tsconfig.json", + "include": ["src/**/*"], + + "compilerOptions": { + "module": "es2020", + "outDir": "dist", + "rootDir": "src", + "declarationDir": "dist", + "paths": { + "*": ["./src/*", "./node_modules/*"] + }, + "typeRoots": ["node_modules/@types"] + } +} \ No newline at end of file From 5342079b70c3b18677618f750d2d8519fdc0e38b Mon Sep 17 00:00:00 2001 From: Kat Leight <33187102+leightkt@users.noreply.github.com> Date: Tue, 20 Feb 2024 16:06:58 -0700 Subject: [PATCH 11/31] add particle to config.yml, reorder docs tabs, add particle to docs onboard (#2069) --- .circleci/config.yml | 18 +++ docs/package.json | 2 +- docs/src/lib/services/onboard.js | 18 ++- .../+page.md | 0 .../+page.md | 0 .../{[...23]portis => [...24]portis}/+page.md | 0 .../{[...24]taho => [...25]taho}/+page.md | 0 .../+page.md | 0 .../{[...26]torus => [...27]torus}/+page.md | 0 .../{[...27]trezor => [...28]trezor}/+page.md | 0 .../{[...28]uauth => [...29]uauth}/+page.md | 0 .../{[...29]venly => [...30]venly}/+page.md | 0 .../+page.md | 0 .../+page.md | 0 .../+page.md | 0 .../{[...33]xdefi => [...34]xdefi}/+page.md | 0 .../{[...34]zeal => [...35]zeal}/+page.md | 0 docs/yarn.lock | 106 ++++++++++-------- yarn.lock | 89 ++++++++++++++- 19 files changed, 177 insertions(+), 56 deletions(-) rename docs/src/routes/docs/[...4]wallets/{[...33]particlenetwork => [...22]particlenetwork}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...22]phantom => [...23]phantom}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...23]portis => [...24]portis}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...24]taho => [...25]taho}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...25]tallyho => [...26]tallyho}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...26]torus => [...27]torus}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...27]trezor => [...28]trezor}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...28]uauth => [...29]uauth}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...29]venly => [...30]venly}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...30]walletconnect => [...31]walletconnect}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...31]walletlink => [...32]walletlink}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...32]web3auth => [...33]web3auth}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...33]xdefi => [...34]xdefi}/+page.md (100%) rename docs/src/routes/docs/[...4]wallets/{[...34]zeal => [...35]zeal}/+page.md (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fefd44ca..3def8f901 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -443,6 +443,12 @@ jobs: working_directory: ~/web3-onboard-monorepo/packages/capsule steps: - node-build-steps + build-particle: + docker: + - image: cimg/node:18.0.0 + working_directory: ~/web3-onboard-monorepo/packages/particle-network + steps: + - node-build-steps @@ -723,6 +729,12 @@ jobs: working_directory: ~/web3-onboard-monorepo/packages/capsule steps: - node-staging-build-steps + build-staging-particle: + docker: + - image: cimg/node:18.0.0 + working_directory: ~/web3-onboard-monorepo/packages/particle-network + steps: + - node-build-steps workflows: version: 2 @@ -1002,4 +1014,10 @@ workflows: - build-capsule: <<: *deploy_production_filters - build-staging-capsule: + <<: *deploy_staging_filters + particle: + jobs: + - build-particle: + <<: *deploy_production_filters + - build-staging-particle: <<: *deploy_staging_filters \ No newline at end of file diff --git a/docs/package.json b/docs/package.json index 5570feead..8b6493194 100644 --- a/docs/package.json +++ b/docs/package.json @@ -88,7 +88,7 @@ "@web3-onboard/web3auth": "^2.2.3", "@web3-onboard/xdefi": "^2.0.4", "@web3-onboard/zeal": "^2.0.4", - "@web3-onboard/particle-network": "^2.2.3", + "@web3-onboard/particle-network": "^2.0.0-alpha.1", "animejs": "^3.2.1", "bnc-sdk": "^4.6.6", "ethers": "^5.7.0", diff --git a/docs/src/lib/services/onboard.js b/docs/src/lib/services/onboard.js index 3d010cff1..a90c023ee 100644 --- a/docs/src/lib/services/onboard.js +++ b/docs/src/lib/services/onboard.js @@ -59,6 +59,7 @@ const intiOnboard = async (theme) => { const { default: venlyModule } = await import('@web3-onboard/venly') const { default: bitgetModule } = await import('@web3-onboard/bitget') const { default: capsuleModule, Environment } = await import('@web3-onboard/capsule') + const { default: particleAuthModule } = await import('@web3-onboard/particle-network') const INFURA_ID = '8b60d52405694345a99bcb82e722e0af' const injected = injectedModule() @@ -67,11 +68,13 @@ const intiOnboard = async (theme) => { clientID: 'xar_test_c9c3bc702eb13255c58dab0e74cfa859711c13cb' }) const coinbase = coinbaseModule() - const metamask = metamaskModule({options: { - dappMetadata: { - name: 'Web3Onboard', + const metamask = metamaskModule({ + options: { + dappMetadata: { + name: 'Web3Onboard' + } } - }}) + }) const dcent = dcentModule() const walletConnect = walletConnectModule({ projectId: 'f6bd6e2911b56f5ac3bc8b2d0e2d7ad5', @@ -133,6 +136,12 @@ const intiOnboard = async (theme) => { apiKey: '992bbd9146d5de8ad0419f141d9a7ca7' }) + const particle = particleAuthModule({ + projectId: 'b385ccf0-73c3-485a-9941-159b7855b806', + clientKey: 'cSTLqhvONB5j588Wz6E5WJLMPrHeUlGbymf1DFhO', + appId: 'b1f0239a-edb0-41f9-b0f5-ab780bb02a9e' + }) + return Onboard({ connect: { autoConnectAllPreviousWallet: true }, wallets: [ @@ -163,6 +172,7 @@ const intiOnboard = async (theme) => { frame, infinityWallet, blocto, + particle // capsule // venly ], diff --git a/docs/src/routes/docs/[...4]wallets/[...33]particlenetwork/+page.md b/docs/src/routes/docs/[...4]wallets/[...22]particlenetwork/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...33]particlenetwork/+page.md rename to docs/src/routes/docs/[...4]wallets/[...22]particlenetwork/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...22]phantom/+page.md b/docs/src/routes/docs/[...4]wallets/[...23]phantom/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...22]phantom/+page.md rename to docs/src/routes/docs/[...4]wallets/[...23]phantom/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...23]portis/+page.md b/docs/src/routes/docs/[...4]wallets/[...24]portis/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...23]portis/+page.md rename to docs/src/routes/docs/[...4]wallets/[...24]portis/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...24]taho/+page.md b/docs/src/routes/docs/[...4]wallets/[...25]taho/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...24]taho/+page.md rename to docs/src/routes/docs/[...4]wallets/[...25]taho/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...25]tallyho/+page.md b/docs/src/routes/docs/[...4]wallets/[...26]tallyho/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...25]tallyho/+page.md rename to docs/src/routes/docs/[...4]wallets/[...26]tallyho/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...26]torus/+page.md b/docs/src/routes/docs/[...4]wallets/[...27]torus/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...26]torus/+page.md rename to docs/src/routes/docs/[...4]wallets/[...27]torus/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...27]trezor/+page.md b/docs/src/routes/docs/[...4]wallets/[...28]trezor/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...27]trezor/+page.md rename to docs/src/routes/docs/[...4]wallets/[...28]trezor/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...28]uauth/+page.md b/docs/src/routes/docs/[...4]wallets/[...29]uauth/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...28]uauth/+page.md rename to docs/src/routes/docs/[...4]wallets/[...29]uauth/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...29]venly/+page.md b/docs/src/routes/docs/[...4]wallets/[...30]venly/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...29]venly/+page.md rename to docs/src/routes/docs/[...4]wallets/[...30]venly/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...30]walletconnect/+page.md b/docs/src/routes/docs/[...4]wallets/[...31]walletconnect/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...30]walletconnect/+page.md rename to docs/src/routes/docs/[...4]wallets/[...31]walletconnect/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...31]walletlink/+page.md b/docs/src/routes/docs/[...4]wallets/[...32]walletlink/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...31]walletlink/+page.md rename to docs/src/routes/docs/[...4]wallets/[...32]walletlink/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...32]web3auth/+page.md b/docs/src/routes/docs/[...4]wallets/[...33]web3auth/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...32]web3auth/+page.md rename to docs/src/routes/docs/[...4]wallets/[...33]web3auth/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...33]xdefi/+page.md b/docs/src/routes/docs/[...4]wallets/[...34]xdefi/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...33]xdefi/+page.md rename to docs/src/routes/docs/[...4]wallets/[...34]xdefi/+page.md diff --git a/docs/src/routes/docs/[...4]wallets/[...34]zeal/+page.md b/docs/src/routes/docs/[...4]wallets/[...35]zeal/+page.md similarity index 100% rename from docs/src/routes/docs/[...4]wallets/[...34]zeal/+page.md rename to docs/src/routes/docs/[...4]wallets/[...35]zeal/+page.md diff --git a/docs/yarn.lock b/docs/yarn.lock index 0678d61fc..0b3c5c7d6 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -4892,10 +4892,10 @@ lodash.isequal "4.5.0" uint8arrays "^3.1.0" -"@walletconnect/core@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.10.6.tgz#786b0d2e2045c210c917e29bfa0498bbc210be20" - integrity sha512-Z4vh4ZdfcoQjgPEOxeuF9HUZCVLtV3MgRbS/awLIj/omDrFnOwlBhxi5Syr4Y8muVGC0ocRetQYHae0/gX5crQ== +"@walletconnect/core@2.11.1": + version "2.11.1" + resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.11.1.tgz#da2be26b8b6514c74f06dc9a5ffb450bdec3456d" + integrity sha512-T57Vd7YdbHPsy3tthBuwrhaZNafN0+PqjISFRNeJy/bsKdXxpJg2hGSARuOTpCO7V6VcaatqlaSMuG3DrnG5rA== dependencies: "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-provider" "1.0.13" @@ -4908,9 +4908,10 @@ "@walletconnect/relay-auth" "^1.0.4" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/types" "2.11.1" + "@walletconnect/utils" "2.11.1" events "^3.3.0" + isomorphic-unfetch "3.1.0" lodash.isequal "4.5.0" uint8arrays "^3.1.0" @@ -5003,20 +5004,20 @@ "@walletconnect/utils" "2.9.0" events "^3.3.0" -"@walletconnect/ethereum-provider@^2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.10.6.tgz#53720771cc2d6accd452916a853ac927f26acbaa" - integrity sha512-bBQ+yUfxLv8VxNttgNKY7nED35gSVayO/BnLHbNKvyV1gpvSCla5mWB9MsXuQs70MK0g+/qtgRVSrOtdSubaNQ== +"@walletconnect/ethereum-provider@^2.11.0": + version "2.11.1" + resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-2.11.1.tgz#6e0174ec9026940eaadeedc53417e222eb45f5aa" + integrity sha512-UfQH0ho24aa2M1xYmanbJv2ggQPebKmQytp2j20QEvURJ2R0v7YKWZ+0PfwOs6o6cuGw6gGxy/0WQXQRZSAsfg== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "^1.0.13" "@walletconnect/jsonrpc-types" "^1.0.3" "@walletconnect/jsonrpc-utils" "^1.0.8" - "@walletconnect/modal" "^2.4.3" - "@walletconnect/sign-client" "2.10.6" - "@walletconnect/types" "2.10.6" - "@walletconnect/universal-provider" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/modal" "^2.6.2" + "@walletconnect/sign-client" "2.11.1" + "@walletconnect/types" "2.11.1" + "@walletconnect/universal-provider" "2.11.1" + "@walletconnect/utils" "2.11.1" events "^3.3.0" "@walletconnect/events@^1.0.1": @@ -5263,7 +5264,7 @@ "@walletconnect/modal-core" "2.5.9" "@walletconnect/modal-ui" "2.5.9" -"@walletconnect/modal@2.6.2", "@walletconnect/modal@^2.4.3": +"@walletconnect/modal@2.6.2", "@walletconnect/modal@^2.6.2": version "2.6.2" resolved "https://registry.yarnpkg.com/@walletconnect/modal/-/modal-2.6.2.tgz#4b534a836f5039eeb3268b80be7217a94dd12651" integrity sha512-eFopgKi8AjKf/0U4SemvcYw9zlLpx9njVN8sf6DAkowC2Md0gPU/UNEbH1Wwj407pEKnEds98pKWib1NN1ACoA== @@ -5340,19 +5341,19 @@ "@walletconnect/utils" "2.10.2" events "^3.3.0" -"@walletconnect/sign-client@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.10.6.tgz#722d2c2844565e2826dce6a6d3a36c9b3ca1ea91" - integrity sha512-EvUWjaZBQu2yKnH5/5F2qzbuiIuUN9ZgrNKgvXkw5z1Dq5RJCks0S9/MFlKH/ZSGqXnLl7uAzBXtoX4sMgbCMA== +"@walletconnect/sign-client@2.11.1": + version "2.11.1" + resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.11.1.tgz#c073b8d2d594e792bb783d36c8b021bd37a9d4f6" + integrity sha512-s3oKSx6/F5X2WmkV1jfJImBFACf9Km5HpTb+n5q+mobJVpUQw/clvoVyIrNNppLhm1V1S/ylHXh0qCrDppDpCA== dependencies: - "@walletconnect/core" "2.10.6" + "@walletconnect/core" "2.11.1" "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" "@walletconnect/jsonrpc-utils" "1.0.8" "@walletconnect/logger" "^2.0.1" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/types" "2.11.1" + "@walletconnect/utils" "2.11.1" events "^3.3.0" "@walletconnect/sign-client@2.9.0": @@ -5398,10 +5399,10 @@ "@walletconnect/logger" "^2.0.1" events "^3.3.0" -"@walletconnect/types@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.10.6.tgz#d9920ed4fd0113e0addbda8e7e73a5176a3163fd" - integrity sha512-WgHfiTG1yakmxheaBRiXhUdEmgxwrvsAdOIWaMf/spvrzVKYh6sHI3oyEEky5qj5jjiMiyQBeB57QamzCotbcQ== +"@walletconnect/types@2.11.1": + version "2.11.1" + resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.11.1.tgz#4f705b43ddc286b69eb9bf91bb6e9496d20de0e3" + integrity sha512-UbdbX+d6MOK0AXKxt5imV3KvAcLVpZUHylaRDIP5ffwVylM/p4DHnKppil1Qq5N+IGDr3RsUwLGFkKjqsQYRKw== dependencies: "@walletconnect/events" "^1.0.1" "@walletconnect/heartbeat" "1.2.1" @@ -5454,19 +5455,19 @@ "@walletconnect/utils" "2.10.2" events "^3.3.0" -"@walletconnect/universal-provider@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.10.6.tgz#1a6c42517581f11ce275474bc70d0eb4f1044525" - integrity sha512-CEivusqqoD31BhCTKp08DnrccfGjwD9MFjZs5BNRorDteRFE8zVm9LmP6DSiNJCw82ZajGlZThggLQ/BAATfwA== +"@walletconnect/universal-provider@2.11.1": + version "2.11.1" + resolved "https://registry.yarnpkg.com/@walletconnect/universal-provider/-/universal-provider-2.11.1.tgz#988f2a78325eb52ef7481a220851a56efb209d64" + integrity sha512-BJvPYByIfbBYF4x8mqDV79ebQX0tD54pp8itsqrHWn0qKZeJyIH8sQ69yY0GnbJrzoFS3ZLULdC0yDxWDeuRGw== dependencies: "@walletconnect/jsonrpc-http-connection" "^1.0.7" "@walletconnect/jsonrpc-provider" "1.0.13" "@walletconnect/jsonrpc-types" "^1.0.2" "@walletconnect/jsonrpc-utils" "^1.0.7" "@walletconnect/logger" "^2.0.1" - "@walletconnect/sign-client" "2.10.6" - "@walletconnect/types" "2.10.6" - "@walletconnect/utils" "2.10.6" + "@walletconnect/sign-client" "2.11.1" + "@walletconnect/types" "2.11.1" + "@walletconnect/utils" "2.11.1" events "^3.3.0" "@walletconnect/universal-provider@2.9.0": @@ -5504,10 +5505,10 @@ query-string "7.1.3" uint8arrays "^3.1.0" -"@walletconnect/utils@2.10.6": - version "2.10.6" - resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.10.6.tgz#749b37d14e291e346862e7027ec7548463350226" - integrity sha512-oRsWWhN2+hi3aiDXrQEOfysz6FHQJGXLsNQPVt+WIBJplO6Szmdau9dbleD88u1iiT4GKPqE0R9FOYvvPm1H/w== +"@walletconnect/utils@2.11.1": + version "2.11.1" + resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.11.1.tgz#56116d9c410c6f2ae8d562017cf6876cccb366f1" + integrity sha512-wRFDHN86dZ05mCET1H3912odIeQa8j7cZKxl1FlWRpV2YsILj9HCYSX6Uq2brwO02Kv2vryke44G1r8XI/LViA== dependencies: "@stablelib/chacha20poly1305" "1.0.1" "@stablelib/hkdf" "1.0.1" @@ -5517,7 +5518,7 @@ "@walletconnect/relay-api" "^1.0.9" "@walletconnect/safe-json" "^1.0.2" "@walletconnect/time" "^1.0.2" - "@walletconnect/types" "2.10.6" + "@walletconnect/types" "2.11.1" "@walletconnect/window-getters" "^1.0.1" "@walletconnect/window-metadata" "^1.0.1" detect-browser "5.3.0" @@ -5630,9 +5631,9 @@ "@web3-onboard/common" "^2.3.1" "@web3-onboard/capsule@^2.0.1": - version "2.0.1-alpha.3" - resolved "https://registry.yarnpkg.com/@web3-onboard/capsule/-/capsule-2.0.1-alpha.3.tgz#a2586a1522b3a9662becd6c1f304dcd05126980e" - integrity sha512-FqWFTnoHasthmCvM59KYIzNa0etpyiLCMM63F2K/V9r50CLF8quqlgr36zCRl8fP6flvG3ytupykAyRxTot4XA== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@web3-onboard/capsule/-/capsule-2.0.1.tgz#e1bd7382f70b1d23f8f67ac2826883ce06a23686" + integrity sha512-R6cg9sGJXJMPMJ7gvOkvev4ZzkNMYomxmwYBuYreqiFH1gqmQxX6zn6vQMSxKF/S16JkLA3S4/wbZ9C6fGNN5w== dependencies: "@usecapsule/web-sdk" "0.29.4" "@wagmi/chains" "^1.8.0" @@ -5930,11 +5931,11 @@ "@web3-onboard/common" "^2.3.1" "@web3-onboard/walletconnect@^2.5.2": - version "2.5.2-alpha.1" - resolved "https://registry.yarnpkg.com/@web3-onboard/walletconnect/-/walletconnect-2.5.2-alpha.1.tgz#70d7a4abcc8a1eef85d04621788d86ee32e16eb9" - integrity sha512-h1yYsB/W/ZfcgsPY8Tit1G1EjcdhZlR34dBnx0boEnz+jTQKk/AIj/v/d3FZfmtZymDfOt6nBz7hEyET3CxkNw== + version "2.5.3" + resolved "https://registry.yarnpkg.com/@web3-onboard/walletconnect/-/walletconnect-2.5.3.tgz#b8f71ee93de8cf151dd31732715bff250fcda293" + integrity sha512-ENrUwXBbja6gXWfF4G2pxhwOodT9MAMPum0E1KPyphzcs+QxjrC+aaXnYUpLLhZsjlAcIWcGrgpmtLP2NDhRXg== dependencies: - "@walletconnect/ethereum-provider" "^2.10.6" + "@walletconnect/ethereum-provider" "^2.11.0" "@web3-onboard/common" "^2.3.3" joi "17.9.1" rxjs "^7.5.2" @@ -9443,6 +9444,14 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== +isomorphic-unfetch@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" + integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== + dependencies: + node-fetch "^2.6.1" + unfetch "^4.2.0" + isomorphic-ws@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf" @@ -12696,6 +12705,11 @@ unenv@^1.7.4: node-fetch-native "^1.4.1" pathe "^1.1.1" +unfetch@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" + integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== + unload@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/unload/-/unload-2.4.1.tgz#b0c5b7fb44e17fcbf50dcb8fb53929c59dd226a5" diff --git a/yarn.lock b/yarn.lock index b7cde201a..7fde3be06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3301,6 +3301,47 @@ "@parcel/watcher-win32-ia32" "2.3.0" "@parcel/watcher-win32-x64" "2.3.0" +"@particle-network/analytics@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@particle-network/analytics/-/analytics-1.0.1.tgz#b3657cf7aaea57f90a7ac2c03f72b8786c298012" + integrity sha512-ApcSMo1BXQlywO+lvOpG3Y2/SVGNCpJzXO/4e3zHzE/9j+uMehsilDzPwWQwLhrCXZYwVm7mmE71Gs36yobiNw== + dependencies: + hash.js "^1.1.7" + uuidv4 "^6.2.13" + +"@particle-network/auth@^1.2.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@particle-network/auth/-/auth-1.3.1.tgz#f9ee51749e3b10e700e0d8c51a8c0769ab0b9851" + integrity sha512-hu6ie5RjjN4X+6y/vfjyCsSX3pQuS8k8ZoMb61QWwhWsnZXKzpBUVeAEk55aGfxxXY+KfBkSmZosyaZHGoHnfw== + dependencies: + "@particle-network/analytics" "^1.0.1" + "@particle-network/chains" "*" + "@particle-network/crypto" "^1.0.1" + buffer "^6.0.3" + draggabilly "^3.0.0" + +"@particle-network/chains@*": + version "1.3.18" + resolved "https://registry.yarnpkg.com/@particle-network/chains/-/chains-1.3.18.tgz#ce763a845f88ff118c27148579de6934ff376298" + integrity sha512-R38ddazbt5Xt8noVA4Fproc89Mm7UmaRvc7Xkl0XP0sp+HaUJjEwFpL4zTCATYb2sUx3cJgV46fVOuD7/2QWIA== + +"@particle-network/crypto@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@particle-network/crypto/-/crypto-1.0.1.tgz#26afef622a3eb906dca5c810fef8001ffee29029" + integrity sha512-GgvHmHcFiNkCLZdcJOgctSbgvs251yp+EAdUydOE3gSoIxN6KEr/Snu9DebENhd/nFb7FDk5ap0Hg49P7pj1fg== + dependencies: + crypto-js "^4.1.1" + uuidv4 "^6.2.13" + +"@particle-network/provider@^1.2.0": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@particle-network/provider/-/provider-1.3.2.tgz#68ae98cca471c7612206cb43c915719cd321fb25" + integrity sha512-3XAUMCISTMYE57LZik7PrVanLIUyyU1ufb5eHtsoQw5ORfH0IeX3E5o6x5mxtfOXKfxVQ0tsIoLRMw0jMmSDpA== + dependencies: + "@particle-network/chains" "*" + axios "^1.3.6" + uuid "^8.3.2" + "@pedrouid/environment@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@pedrouid/environment/-/environment-1.0.1.tgz#858f0f8a057340e0b250398b75ead77d6f4342ec" @@ -4977,6 +5018,11 @@ resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== +"@types/uuid@8.3.4": + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== + "@types/w3c-web-usb@^1.0.6": version "1.0.6" resolved "https://registry.yarnpkg.com/@types/w3c-web-usb/-/w3c-web-usb-1.0.6.tgz#5d8560d0d9f585ffc80865bc773db7bc975b680c" @@ -6976,7 +7022,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@0.21.1, axios@1.4.0, axios@^0.18.0, axios@^0.21.0, axios@^0.21.2, axios@^0.27.2: +axios@0.21.1, axios@1.4.0, axios@^0.18.0, axios@^0.21.0, axios@^0.21.2, axios@^0.27.2, axios@^1.3.6: version "0.21.4" resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== @@ -8699,6 +8745,14 @@ dotenv@^16.0.3: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.1.tgz#1d9931f1d3e5d2959350d1250efab299561f7f11" integrity sha512-CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ== +draggabilly@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/draggabilly/-/draggabilly-3.0.0.tgz#48defe10a67f346a0338caaa40c0765c4d3912d6" + integrity sha512-aEs+B6prbMZQMxc9lgTpCBfyCUhRur/VFucHhIOvlvvdARTj7TcDmX/cdOUtqbjJJUh7+agyJXR5Z6IFe1MxwQ== + dependencies: + get-size "^3.0.0" + unidragger "^3.0.0" + drbg.js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b" @@ -9809,6 +9863,11 @@ ethjs-util@0.1.6, ethjs-util@^0.1.3, ethjs-util@^0.1.6: is-hex-prefixed "1.0.0" strip-hex-prefix "1.0.0" +ev-emitter@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ev-emitter/-/ev-emitter-2.1.2.tgz#91737a2deae9fa95453e7e86cfae976f8c3ced38" + integrity sha512-jQ5Ql18hdCQ4qS+RCrbLfz1n+Pags27q5TwMKvZyhp5hh2UULUYZUy1keqj6k6SYsdqIYjnmz7xyyEY0V67B8Q== + event-target-shim@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" @@ -10288,6 +10347,11 @@ get-port-please@^3.1.1: resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.1.tgz#2556623cddb4801d823c0a6a15eec038abb483be" integrity sha512-3UBAyM3u4ZBVYDsxOQfJDxEa6XTbpBDrOjp4mf7ExFRt5BKs/QywQQiJsh2B+hxcZLSapWqCRvElUe8DnKcFHA== +get-size@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-size/-/get-size-3.0.0.tgz#00e39a8042a3de237b2fcf288eaf55d3f472417c" + integrity sha512-Y8aiXLq4leR7807UY0yuKEwif5s3kbVp1nTv+i4jBeoUzByTLKkLWu/HorS6/pB+7gsB0o7OTogC8AoOOeT0Hw== + get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -15891,6 +15955,13 @@ unfetch@^4.2.0: resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== +unidragger@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/unidragger/-/unidragger-3.0.1.tgz#72b2e63f2571ca6e95a884b139dfec764e08c7f3" + integrity sha512-RngbGSwBFmqGBWjkaH+yB677uzR95blSQyxq6hYbrQCejH3Mx1nm8DVOuh3M9k2fQyTstWUG5qlgCnNqV/9jVw== + dependencies: + ev-emitter "^2.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -16056,6 +16127,11 @@ uuid@3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== +uuid@8.3.2, uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@9.0.0, uuid@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" @@ -16071,10 +16147,13 @@ uuid@^3.3.2, uuid@^3.4.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuidv4@^6.2.13: + version "6.2.13" + resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-6.2.13.tgz#8f95ec5ef22d1f92c8e5d4c70b735d1c89572cb7" + integrity sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ== + dependencies: + "@types/uuid" "8.3.4" + uuid "8.3.2" v8-compile-cache-lib@^3.0.0: version "3.0.0" From 5b52b93025631098ce2ea34b67e641993fbb88eb Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Wed, 21 Feb 2024 16:36:13 -0700 Subject: [PATCH 12/31] Add capsule to docs wallet options (#2070) --- docs/src/lib/services/onboard.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/src/lib/services/onboard.js b/docs/src/lib/services/onboard.js index a90c023ee..fdbef44a4 100644 --- a/docs/src/lib/services/onboard.js +++ b/docs/src/lib/services/onboard.js @@ -172,8 +172,10 @@ const intiOnboard = async (theme) => { frame, infinityWallet, blocto, + capsule, particle // capsule + // venly ], chains: [ From ca2b510dbb463da6f756795f1446ee178060f44d Mon Sep 17 00:00:00 2001 From: Hugh Do Date: Tue, 5 Mar 2024 03:19:48 +0900 Subject: [PATCH 13/31] Fix the connect modal getting covered by the bottom bar (#2057) * fix the connect modal being covered by the bottom bar * pump the package version * feat: remove .mobile-safari class * bump packages' version * bump the version of @web3-onboard/core in other packages --------- Co-authored-by: Adam Carpenter --- packages/core/package.json | 2 +- packages/core/src/views/connect/Index.svelte | 11 +---------- packages/core/src/views/shared/Modal.svelte | 1 + packages/demo/package.json | 4 ++-- packages/react/package.json | 4 ++-- packages/solid/package.json | 4 ++-- packages/vue/package.json | 4 ++-- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 39e556e4a..dbc892188 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/core", - "version": "2.21.2", + "version": "2.21.3-alpha.1", "description": "Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized 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.", "keywords": [ "Ethereum", diff --git a/packages/core/src/views/connect/Index.svelte b/packages/core/src/views/connect/Index.svelte index ff984f14d..553c0cc38 100644 --- a/packages/core/src/views/connect/Index.svelte +++ b/packages/core/src/views/connect/Index.svelte @@ -424,10 +424,6 @@ scrollContainer && scrollContainer.scrollTo(0, 0) } - const isSafariMobile = - device.type === 'mobile' && - device.browser.name && - device.browser.name === 'Safari'