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"