Skip to content

Commit

Permalink
Merge pull request #29 from WalletConnect/refactor/only-approve-activ…
Browse files Browse the repository at this point in the history
…e-chain

refactor: only approve active chain
  • Loading branch information
ganchoradkov authored Apr 30, 2024
2 parents b02159e + 4059778 commit e5d8d92
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 40 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"install:all": "yarn && cd ./examples/dapp && yarn && cd ./../wallet && yarn"
},
"dependencies": {
"@walletconnect/web3wallet": "1.10.3"
"@walletconnect/web3wallet": "1.11.2"
},
"devDependencies": {
"@ethersproject/wallet": "^5.7.0",
Expand Down
6 changes: 1 addition & 5 deletions src/controllers/engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,8 @@ export class Engine extends ISingleEthereumEngine {
const parsed = parseChain(chain);
return parseInt(parsed);
});
const optionalChains = (normalizedOptional[EVM_IDENTIFIER]?.chains || []).map((chain) => {
const parsed = parseChain(chain);
return parseInt(parsed);
});

const approvedChains = [...new Set([chainId, ...requiredChains, ...optionalChains])];
const approvedChains = [...new Set([chainId, ...requiredChains])];
const approveParams = {
id,
namespaces: {
Expand Down
76 changes: 42 additions & 34 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -918,24 +918,24 @@
events "^3.3.0"
isomorphic-unfetch "^3.1.0"

"@walletconnect/core@2.11.3":
version "2.11.3"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.11.3.tgz#c81855722cb9afd411f91f5345c7874f48bade0b"
integrity sha512-/9m4EqiggFUwkQDv5PDWbcTI+yCVnBd/iYW5iIHEkivg2/mnBr2bQz2r/vtPjp19r/ZK62Dx0+UN3U+BWP8ulQ==
"@walletconnect/core@2.12.2":
version "2.12.2"
resolved "https://registry.yarnpkg.com/@walletconnect/core/-/core-2.12.2.tgz#12bd568b90daed876e58ebcc098c12843a3321e6"
integrity sha512-7Adv/b3pp9F42BkvReaaM4KS8NEvlkS7AMtwO3uF/o6aRMKtcfTJq9/jgWdKJh4RP8pPRTRFjCw6XQ/RZtT4aQ==
dependencies:
"@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-provider" "1.0.13"
"@walletconnect/jsonrpc-types" "1.0.3"
"@walletconnect/jsonrpc-utils" "1.0.8"
"@walletconnect/jsonrpc-ws-connection" "1.0.14"
"@walletconnect/keyvaluestorage" "^1.1.1"
"@walletconnect/logger" "^2.0.1"
"@walletconnect/logger" "^2.1.2"
"@walletconnect/relay-api" "^1.0.9"
"@walletconnect/relay-auth" "^1.0.4"
"@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.11.3"
"@walletconnect/utils" "2.11.3"
"@walletconnect/types" "2.12.2"
"@walletconnect/utils" "2.12.2"
events "^3.3.0"
isomorphic-unfetch "3.1.0"
lodash.isequal "4.5.0"
Expand Down Expand Up @@ -1051,7 +1051,15 @@
idb-keyval "^6.2.1"
unstorage "^1.9.0"

"@walletconnect/[email protected]", "@walletconnect/logger@^2.0.1":
"@walletconnect/[email protected]", "@walletconnect/logger@^2.1.2":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@walletconnect/logger/-/logger-2.1.2.tgz#813c9af61b96323a99f16c10089bfeb525e2a272"
integrity sha512-aAb28I3S6pYXZHQm5ESB+V6rDqIYfsnHaQyzFbwUUBFY4H0OXx/YtTl8lvhUNhMMfb9UxbwEBS253TlXUYJWSw==
dependencies:
"@walletconnect/safe-json" "^1.0.2"
pino "7.11.0"

"@walletconnect/logger@^2.0.1":
version "2.0.1"
resolved "https://registry.yarnpkg.com/@walletconnect/logger/-/logger-2.0.1.tgz#7f489b96e9a1ff6bf3e58f0fbd6d69718bf844a8"
integrity sha512-SsTKdsgWm+oDTBeNE/zHxxr5eJfZmE9/5yp/Ku+zJtcTAjELb3DXueWkDXmE9h8uHIbJzIb5wj5lPdzyrjT6hQ==
Expand Down Expand Up @@ -1086,19 +1094,19 @@
dependencies:
tslib "1.14.1"

"@walletconnect/sign-client@2.11.3":
version "2.11.3"
resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.11.3.tgz#3ea7b3acf92ee31cc42b45d42e66c44b4720b28b"
integrity sha512-JVjLTxN/3NjMXv5zalSGKuSYLRyU2yX6AWEdq17cInlrwODpbWZr6PS1uxMWdH4r90DXBLhdtwDbEq/pfd0BPg==
"@walletconnect/sign-client@2.12.2":
version "2.12.2"
resolved "https://registry.yarnpkg.com/@walletconnect/sign-client/-/sign-client-2.12.2.tgz#10cddcba3740f726149c33ef1a9040a808d65e08"
integrity sha512-cM0ualXj6nVvLqS4BDNRk+ZWR+lubcsz/IHreH+3wYrQ2sV+C0fN6ctrd7MMGZss0C0qacWCx0pm62ZBuoKvqA==
dependencies:
"@walletconnect/core" "2.11.3"
"@walletconnect/core" "2.12.2"
"@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "1.2.1"
"@walletconnect/jsonrpc-utils" "1.0.8"
"@walletconnect/logger" "^2.0.1"
"@walletconnect/logger" "^2.1.2"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.11.3"
"@walletconnect/utils" "2.11.3"
"@walletconnect/types" "2.12.2"
"@walletconnect/utils" "2.12.2"
events "^3.3.0"

"@walletconnect/time@^1.0.2":
Expand All @@ -1120,10 +1128,10 @@
"@walletconnect/logger" "^2.0.1"
events "^3.3.0"

"@walletconnect/types@2.11.3":
version "2.11.3"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.11.3.tgz#8ce43cb77e8fd9d5269847cdd73bcfa7cce7dd1a"
integrity sha512-JY4wA9MVosDW9dcJMTpnwliste0aJGJ1X6Q4ulLsQsgWRSEBRkLila0oUT01TDBW9Yq8uUp7uFOUTaKx6KWVAg==
"@walletconnect/types@2.12.2":
version "2.12.2"
resolved "https://registry.yarnpkg.com/@walletconnect/types/-/types-2.12.2.tgz#8b64a2015a0a96972d28acb2ff317a9a994abfdb"
integrity sha512-9CmwTlPbrFTzayTL9q7xM7s3KTJkS6kYFtH2m1/fHFgALs6pIUjf1qAx1TF2E4tv7SEzLAIzU4NqgYUt2vWXTg==
dependencies:
"@walletconnect/events" "^1.0.1"
"@walletconnect/heartbeat" "1.2.1"
Expand Down Expand Up @@ -1152,10 +1160,10 @@
query-string "7.1.3"
uint8arrays "^3.1.0"

"@walletconnect/utils@2.11.3":
version "2.11.3"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.11.3.tgz#3731809b54902655cf202e0bf0e8f268780e8b54"
integrity sha512-jsdNkrl/IcTkzWFn0S2d0urzBXg6RxVJtUYRsUx3qI3wzOGiABP9ui3yiZ3SgZOv9aRe62PaNp1qpbYZ+zPb8Q==
"@walletconnect/utils@2.12.2":
version "2.12.2"
resolved "https://registry.yarnpkg.com/@walletconnect/utils/-/utils-2.12.2.tgz#a2c349d4effef7c1c5e72e74a5483d8dfbb10918"
integrity sha512-zf50HeS3SfoLv1N9GPl2IXTZ9TsXfet4usVAsZmX9P6/Xzq7d/7QakjVQCHH/Wk1O9XkcsfeoZoUhRxoMJ5uJw==
dependencies:
"@stablelib/chacha20poly1305" "1.0.1"
"@stablelib/hkdf" "1.0.1"
Expand All @@ -1165,26 +1173,26 @@
"@walletconnect/relay-api" "^1.0.9"
"@walletconnect/safe-json" "^1.0.2"
"@walletconnect/time" "^1.0.2"
"@walletconnect/types" "2.11.3"
"@walletconnect/types" "2.12.2"
"@walletconnect/window-getters" "^1.0.1"
"@walletconnect/window-metadata" "^1.0.1"
detect-browser "5.3.0"
query-string "7.1.3"
uint8arrays "^3.1.0"

"@walletconnect/web3wallet@1.10.3":
version "1.10.3"
resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.10.3.tgz#8195308757bd298ccc9caa6e3fe9f4ff82b94607"
integrity sha512-1Dr2P8KIDCqEWZ+s4coKGJz/+pj87ogFs+icPDXPu9QpzTgY5Y1WSzuAHaqoY5gTlL7WS58YP49s0E7iacUz4g==
"@walletconnect/web3wallet@1.11.2":
version "1.11.2"
resolved "https://registry.yarnpkg.com/@walletconnect/web3wallet/-/web3wallet-1.11.2.tgz#0c6af495518a92036b0bb72a39e54bc10127b541"
integrity sha512-jrxXmZyg+czkHXg4d0jdhxajjfbgPvS9dW4UzdGdz12dXsX7CFgZxz+LWc/oakhLyngUtwHtyBlgaFWxamS3AQ==
dependencies:
"@walletconnect/auth-client" "2.1.2"
"@walletconnect/core" "2.11.3"
"@walletconnect/core" "2.12.2"
"@walletconnect/jsonrpc-provider" "1.0.13"
"@walletconnect/jsonrpc-utils" "1.0.8"
"@walletconnect/logger" "2.0.1"
"@walletconnect/sign-client" "2.11.3"
"@walletconnect/types" "2.11.3"
"@walletconnect/utils" "2.11.3"
"@walletconnect/logger" "2.1.2"
"@walletconnect/sign-client" "2.12.2"
"@walletconnect/types" "2.12.2"
"@walletconnect/utils" "2.12.2"

"@walletconnect/window-getters@^1.0.1":
version "1.0.1"
Expand Down

0 comments on commit e5d8d92

Please sign in to comment.