diff --git a/apps/demo/CHANGELOG.md b/apps/demo/CHANGELOG.md index b99f165a6d..6f81d4e9ac 100644 --- a/apps/demo/CHANGELOG.md +++ b/apps/demo/CHANGELOG.md @@ -1,5 +1,14 @@ # @apps/demo +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/wagmi@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/apps/demo/package.json b/apps/demo/package.json index 98510b7cf6..632f0e2857 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -1,6 +1,6 @@ { "name": "@apps/demo", - "version": "5.0.1", + "version": "5.0.2", "private": true, "scripts": { "dev:demo": "next dev", @@ -11,7 +11,7 @@ "dependencies": { "@radix-ui/react-switch": "1.0.3", "@tanstack/react-query": "5.24.8", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "clsx": "2.1.0", "framer-motion": "11.0.8", "next": "14.2.3", diff --git a/apps/gallery/CHANGELOG.md b/apps/gallery/CHANGELOG.md index 3a214b3728..2b10b46c74 100644 --- a/apps/gallery/CHANGELOG.md +++ b/apps/gallery/CHANGELOG.md @@ -1,5 +1,15 @@ # @apps/gallery +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/common@5.0.2 + - @web3modal/ui@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/apps/gallery/package.json b/apps/gallery/package.json index ff3cc8c0a1..903836f117 100644 --- a/apps/gallery/package.json +++ b/apps/gallery/package.json @@ -1,6 +1,6 @@ { "name": "@apps/gallery", - "version": "5.0.1", + "version": "5.0.2", "private": true, "main": "index.js", "scripts": { @@ -9,8 +9,8 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@web3modal/common": "5.0.1", - "@web3modal/ui": "5.0.1", + "@web3modal/common": "5.0.2", + "@web3modal/ui": "5.0.2", "lit": "3.1.0", "storybook": "7.6.7" }, diff --git a/apps/laboratory/.env.example b/apps/laboratory/.env.example index 58aad67f24..26516d5f96 100644 --- a/apps/laboratory/.env.example +++ b/apps/laboratory/.env.example @@ -9,3 +9,5 @@ MAILSAC_API_KEY="" NEXT_PUBLIC_SECURE_SITE_SDK_URL="" SOCIAL_TEST_EMAIL="" SOCIAL_TEST_PASSWORD="" +NEXT_PUBLIC_DEFAULT_LOG_LEVEL="" + diff --git a/apps/laboratory/CHANGELOG.md b/apps/laboratory/CHANGELOG.md index 89a48d8797..49421f7f3d 100644 --- a/apps/laboratory/CHANGELOG.md +++ b/apps/laboratory/CHANGELOG.md @@ -1,5 +1,17 @@ # @apps/laboratory +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/ethers@5.0.2 + - @web3modal/siwe@5.0.2 + - @web3modal/solana@5.0.2 + - @web3modal/wagmi@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json index 14fe000464..6510bb946c 100644 --- a/apps/laboratory/package.json +++ b/apps/laboratory/package.json @@ -1,6 +1,6 @@ { "name": "@apps/laboratory", - "version": "5.0.1", + "version": "5.0.2", "private": true, "scripts": { "dev:laboratory": "next dev", @@ -37,10 +37,10 @@ "@sentry/react": "7.92.0", "@solana/web3.js": "1.91.7", "@tanstack/react-query": "5.24.8", - "@web3modal/ethers": "5.0.1", - "@web3modal/siwe": "5.0.1", - "@web3modal/solana": "5.0.1", - "@web3modal/wagmi": "5.0.1", + "@web3modal/ethers": "5.0.2", + "@web3modal/siwe": "5.0.2", + "@web3modal/solana": "5.0.2", + "@web3modal/wagmi": "5.0.2", "ethers": "6.13.0", "framer-motion": "10.17.9", "next": "14.2.3", diff --git a/apps/laboratory/src/components/Wagmi/WagmiModalInfo.tsx b/apps/laboratory/src/components/Wagmi/WagmiModalInfo.tsx index afc7b8cad5..7a7063f005 100644 --- a/apps/laboratory/src/components/Wagmi/WagmiModalInfo.tsx +++ b/apps/laboratory/src/components/Wagmi/WagmiModalInfo.tsx @@ -10,7 +10,7 @@ export function WagmiModalInfo() { async function getClientId() { if (connector?.type === 'walletConnect') { - const provider = await connector?.getProvider() + const provider = await connector?.getProvider?.() const ethereumProvider = provider as EthereumProvider return ethereumProvider?.signer?.client?.core?.crypto?.getClientId() diff --git a/apps/laboratory/tests/siwe.spec.ts b/apps/laboratory/tests/siwe.spec.ts index 3c1ecbec28..3f76acdf1e 100644 --- a/apps/laboratory/tests/siwe.spec.ts +++ b/apps/laboratory/tests/siwe.spec.ts @@ -32,3 +32,21 @@ testMWSiwe( await modalValidator.expectUnauthenticated() } ) + +testMWSiwe( + 'it should require re-authentication when switching networks', + async ({ modalPage, walletPage, modalValidator, walletValidator }) => { + const uri = await modalPage.getConnectUri() + await walletPage.connectWithUri(uri) + await walletPage.handleSessionProposal(DEFAULT_SESSION_PARAMS) + await modalValidator.expectAuthenticated() + await modalValidator.expectConnected() + await walletValidator.expectConnected() + await modalPage.switchNetwork('Polygon') + + // Re-authentication required + await modalValidator.expectUnauthenticated() + await modalPage.closeModal() + await modalValidator.expectDisconnected() + } +) diff --git a/examples/html-ethers5/CHANGELOG.md b/examples/html-ethers5/CHANGELOG.md index 4186250931..b09d5f4e88 100644 --- a/examples/html-ethers5/CHANGELOG.md +++ b/examples/html-ethers5/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/html-ethers5 +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/ethers5@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/html-ethers5/package.json b/examples/html-ethers5/package.json index 38fa012bf8..2681542581 100644 --- a/examples/html-ethers5/package.json +++ b/examples/html-ethers5/package.json @@ -1,13 +1,13 @@ { "name": "@examples/html-ethers5", "private": true, - "version": "5.0.1", + "version": "5.0.2", "scripts": { "dev:example": "vite --port 3011", "build:examples": "vite build" }, "dependencies": { - "@web3modal/ethers5": "5.0.1", + "@web3modal/ethers5": "5.0.2", "ethers": "5.7.2" }, "devDependencies": { diff --git a/examples/html-wagmi/CHANGELOG.md b/examples/html-wagmi/CHANGELOG.md index 62b7d78087..3dbfa017fc 100644 --- a/examples/html-wagmi/CHANGELOG.md +++ b/examples/html-wagmi/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/html-wagmi +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/wagmi@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/html-wagmi/package.json b/examples/html-wagmi/package.json index e680ae0b4f..a7f358bba7 100644 --- a/examples/html-wagmi/package.json +++ b/examples/html-wagmi/package.json @@ -1,7 +1,7 @@ { "name": "@examples/html-wagmi", "private": true, - "version": "5.0.1", + "version": "5.0.2", "scripts": { "dev:example": "vite --port 3001", "build:examples": "vite build" @@ -9,7 +9,7 @@ "dependencies": { "@wagmi/connectors": "5.0.8", "@wagmi/core": "2.10.5", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/examples/next-wagmi/CHANGELOG.md b/examples/next-wagmi/CHANGELOG.md index 1e28e10fec..ea8baaa798 100644 --- a/examples/next-wagmi/CHANGELOG.md +++ b/examples/next-wagmi/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/next-wagmi +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/wagmi@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/next-wagmi/package.json b/examples/next-wagmi/package.json index 1cf21ae388..b232c5f5b3 100644 --- a/examples/next-wagmi/package.json +++ b/examples/next-wagmi/package.json @@ -1,6 +1,6 @@ { "name": "@examples/next-wagmi", - "version": "5.0.1", + "version": "5.0.2", "private": true, "scripts": { "dev": "next dev", @@ -10,7 +10,7 @@ }, "dependencies": { "@tanstack/react-query": "5.24.8", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "next": "14.2.3", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/examples/react-ethers/CHANGELOG.md b/examples/react-ethers/CHANGELOG.md index 37407387fa..598cf844a1 100644 --- a/examples/react-ethers/CHANGELOG.md +++ b/examples/react-ethers/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/react-ethers5 +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/ethers@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/react-ethers/package.json b/examples/react-ethers/package.json index 8c29c73da8..f0ee72aed4 100644 --- a/examples/react-ethers/package.json +++ b/examples/react-ethers/package.json @@ -1,13 +1,13 @@ { "name": "@examples/react-ethers", "private": true, - "version": "5.0.1", + "version": "5.0.2", "scripts": { "dev:example": "vite --port 3012", "build:examples": "vite build" }, "dependencies": { - "@web3modal/ethers": "5.0.1", + "@web3modal/ethers": "5.0.2", "ethers": "6.9.0", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/examples/react-ethers5/CHANGELOG.md b/examples/react-ethers5/CHANGELOG.md index d7fbe1518a..e85efaf20d 100644 --- a/examples/react-ethers5/CHANGELOG.md +++ b/examples/react-ethers5/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/react-ethers5 +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/ethers5@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/react-ethers5/package.json b/examples/react-ethers5/package.json index 83da50baec..4f74458299 100644 --- a/examples/react-ethers5/package.json +++ b/examples/react-ethers5/package.json @@ -1,13 +1,13 @@ { "name": "@examples/react-ethers5", "private": true, - "version": "5.0.1", + "version": "5.0.2", "scripts": { "dev:example": "vite --port 3012", "build:examples": "vite build" }, "dependencies": { - "@web3modal/ethers5": "5.0.1", + "@web3modal/ethers5": "5.0.2", "ethers": "5.7.2", "react": "18.2.0", "react-dom": "18.2.0" diff --git a/examples/react-wagmi/CHANGELOG.md b/examples/react-wagmi/CHANGELOG.md index bbfdda1fb5..f625b89481 100644 --- a/examples/react-wagmi/CHANGELOG.md +++ b/examples/react-wagmi/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/react-wagmi +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/wagmi@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/react-wagmi/package.json b/examples/react-wagmi/package.json index 7cf919f8dc..1de52937d3 100644 --- a/examples/react-wagmi/package.json +++ b/examples/react-wagmi/package.json @@ -1,14 +1,14 @@ { "name": "@examples/react-wagmi", "private": true, - "version": "5.0.1", + "version": "5.0.2", "scripts": { "dev:example": "vite --port 3002", "build:examples": "vite build" }, "dependencies": { "@tanstack/react-query": "5.24.8", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "react": "18.2.0", "react-dom": "18.2.0", "vite": "5.2.11", diff --git a/examples/vue-ethers5/CHANGELOG.md b/examples/vue-ethers5/CHANGELOG.md index f89aa1f685..333890238f 100644 --- a/examples/vue-ethers5/CHANGELOG.md +++ b/examples/vue-ethers5/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/vue-ethers5 +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/ethers5@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/vue-ethers5/package.json b/examples/vue-ethers5/package.json index 781458463c..063ff514a0 100644 --- a/examples/vue-ethers5/package.json +++ b/examples/vue-ethers5/package.json @@ -1,13 +1,13 @@ { "name": "@examples/vue-ethers5", "private": true, - "version": "5.0.1", + "version": "5.0.2", "scripts": { "dev:example": "vite --port 3013", "build:examples": "vite build" }, "dependencies": { - "@web3modal/ethers5": "5.0.1", + "@web3modal/ethers5": "5.0.2", "ethers": "5.7.2" }, "devDependencies": { diff --git a/examples/vue-wagmi/CHANGELOG.md b/examples/vue-wagmi/CHANGELOG.md index 785f60f6f2..1bb1a9073f 100644 --- a/examples/vue-wagmi/CHANGELOG.md +++ b/examples/vue-wagmi/CHANGELOG.md @@ -1,5 +1,14 @@ # @examples/vue-wagmi +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/wagmi@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/examples/vue-wagmi/package.json b/examples/vue-wagmi/package.json index 820eb5cb24..7e4dcfee08 100644 --- a/examples/vue-wagmi/package.json +++ b/examples/vue-wagmi/package.json @@ -1,7 +1,7 @@ { "name": "@examples/vue-wagmi", "private": true, - "version": "5.0.1", + "version": "5.0.2", "scripts": { "dev:example": "vite --port 3003", "build:examples": "vite build" @@ -9,7 +9,7 @@ "dependencies": { "@wagmi/connectors": "5.0.8", "@wagmi/core": "2.10.5", - "@web3modal/wagmi": "5.0.1" + "@web3modal/wagmi": "5.0.2" }, "devDependencies": { "@vitejs/plugin-vue": "5.0.2" diff --git a/package-lock.json b/package-lock.json index 24afb864c8..84b89c3756 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,11 +44,11 @@ }, "apps/demo": { "name": "@apps/demo", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { "@radix-ui/react-switch": "1.0.3", "@tanstack/react-query": "5.24.8", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "clsx": "2.1.0", "framer-motion": "11.0.8", "next": "14.2.3", @@ -128,10 +128,10 @@ }, "apps/gallery": { "name": "@apps/gallery", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { - "@web3modal/common": "5.0.1", - "@web3modal/ui": "5.0.1", + "@web3modal/common": "5.0.2", + "@web3modal/ui": "5.0.2", "lit": "3.1.0", "storybook": "7.6.7" }, @@ -147,7 +147,7 @@ }, "apps/laboratory": { "name": "@apps/laboratory", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { "@chakra-ui/icons": "2.1.1", "@chakra-ui/react": "2.8.2", @@ -159,10 +159,10 @@ "@tanstack/react-query": "5.24.8", "@wagmi/connectors": "5.0.8", "@walletconnect/utils": "2.13.1", - "@web3modal/ethers": "5.0.1", - "@web3modal/siwe": "5.0.1", - "@web3modal/solana": "5.0.1", - "@web3modal/wagmi": "5.0.1", + "@web3modal/ethers": "5.0.2", + "@web3modal/siwe": "5.0.2", + "@web3modal/solana": "5.0.2", + "@web3modal/wagmi": "5.0.2", "ethers": "6.13.0", "framer-motion": "10.17.9", "next": "14.2.3", @@ -219,9 +219,9 @@ }, "examples/html-ethers5": { "name": "@examples/html-ethers5", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { - "@web3modal/ethers5": "5.0.1", + "@web3modal/ethers5": "5.0.2", "ethers": "5.7.2" }, "devDependencies": { @@ -277,11 +277,11 @@ }, "examples/html-wagmi": { "name": "@examples/html-wagmi", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { "@wagmi/connectors": "5.0.8", "@wagmi/core": "2.10.5", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "react": "18.2.0", "react-dom": "18.2.0" }, @@ -291,10 +291,10 @@ }, "examples/next-wagmi": { "name": "@examples/next-wagmi", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { "@tanstack/react-query": "5.24.8", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "next": "14.2.3", "react": "18.2.0", "react-dom": "18.2.0", @@ -337,9 +337,9 @@ }, "examples/react-ethers": { "name": "@examples/react-ethers", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { - "@web3modal/ethers": "5.0.1", + "@web3modal/ethers": "5.0.2", "ethers": "6.9.0", "react": "18.2.0", "react-dom": "18.2.0" @@ -388,9 +388,9 @@ }, "examples/react-ethers5": { "name": "@examples/react-ethers5", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { - "@web3modal/ethers5": "5.0.1", + "@web3modal/ethers5": "5.0.2", "ethers": "5.7.2", "react": "18.2.0", "react-dom": "18.2.0" @@ -449,10 +449,10 @@ }, "examples/react-wagmi": { "name": "@examples/react-wagmi", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { "@tanstack/react-query": "5.24.8", - "@web3modal/wagmi": "5.0.1", + "@web3modal/wagmi": "5.0.2", "react": "18.2.0", "react-dom": "18.2.0", "viem": "2.10.3", @@ -466,9 +466,9 @@ }, "examples/vue-ethers5": { "name": "@examples/vue-ethers5", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { - "@web3modal/ethers5": "5.0.1", + "@web3modal/ethers5": "5.0.2", "ethers": "5.7.2" }, "devDependencies": { @@ -524,11 +524,11 @@ }, "examples/vue-wagmi": { "name": "@examples/vue-wagmi", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { "@wagmi/connectors": "5.0.8", "@wagmi/core": "2.10.5", - "@web3modal/wagmi": "5.0.1" + "@web3modal/wagmi": "5.0.2" }, "devDependencies": { "@vitejs/plugin-vue": "5.0.2" @@ -32731,12 +32731,12 @@ }, "packages/cdn": { "name": "@web3modal/cdn", - "version": "5.0.1", + "version": "5.0.2", "dependencies": { "@wagmi/connectors": "5.0.8", "@wagmi/core": "2.10.5", - "@web3modal/ethers": "5.0.1", - "@web3modal/wagmi": "5.0.1", + "@web3modal/ethers": "5.0.2", + "@web3modal/wagmi": "5.0.2", "viem": "2.10.3", "vite": "5.2.11" }, @@ -32755,7 +32755,7 @@ }, "packages/common": { "name": "@web3modal/common", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "bignumber.js": "9.1.2", @@ -32769,11 +32769,11 @@ }, "packages/core": { "name": "@web3modal/core", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { - "@web3modal/common": "5.0.1", - "@web3modal/wallet": "5.0.1", + "@web3modal/common": "5.0.2", + "@web3modal/wallet": "5.0.2", "valtio": "1.11.2" }, "devDependencies": { @@ -32782,17 +32782,17 @@ }, "packages/ethers": { "name": "@web3modal/ethers", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "@coinbase/wallet-sdk": "4.0.0", "@walletconnect/ethereum-provider": "2.13.0", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", - "@web3modal/siwe": "5.0.1", + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", + "@web3modal/siwe": "5.0.2", "valtio": "1.11.2" }, "devDependencies": { @@ -32946,17 +32946,17 @@ }, "packages/ethers5": { "name": "@web3modal/ethers5", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "@coinbase/wallet-sdk": "4.0.0", "@walletconnect/ethereum-provider": "2.13.0", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", - "@web3modal/siwe": "5.0.1", + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", + "@web3modal/siwe": "5.0.2", "valtio": "1.11.2" }, "devDependencies": { @@ -33159,7 +33159,7 @@ }, "packages/polyfills": { "name": "@web3modal/polyfills", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "buffer": "6.0.3" @@ -33167,24 +33167,24 @@ }, "packages/scaffold": { "name": "@web3modal/scaffold", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { - "@web3modal/common": "5.0.1", - "@web3modal/core": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/siwe": "5.0.1", - "@web3modal/ui": "5.0.1", - "@web3modal/wallet": "5.0.1", + "@web3modal/common": "5.0.2", + "@web3modal/core": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/siwe": "5.0.2", + "@web3modal/ui": "5.0.2", + "@web3modal/wallet": "5.0.2", "lit": "3.1.0" } }, "packages/scaffold-react": { "name": "@web3modal/scaffold-react", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { - "@web3modal/scaffold": "5.0.1" + "@web3modal/scaffold": "5.0.2" }, "devDependencies": { "react": "18.2.0", @@ -33205,20 +33205,20 @@ }, "packages/scaffold-utils": { "name": "@web3modal/scaffold-utils", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { - "@web3modal/core": "5.0.1", - "@web3modal/polyfills": "5.0.1", + "@web3modal/core": "5.0.2", + "@web3modal/polyfills": "5.0.2", "valtio": "1.11.2" } }, "packages/scaffold-vue": { "name": "@web3modal/scaffold-vue", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { - "@web3modal/scaffold": "5.0.1" + "@web3modal/scaffold": "5.0.2" }, "devDependencies": { "vue": "3.4.3" @@ -33360,12 +33360,12 @@ }, "packages/siwe": { "name": "@web3modal/siwe", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "@walletconnect/utils": "2.12.0", - "@web3modal/core": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", + "@web3modal/core": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", "lit": "3.1.0", "valtio": "1.11.2" } @@ -33447,7 +33447,7 @@ }, "packages/solana": { "name": "@web3modal/solana", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "@ethersproject/sha2": "5.7.0", @@ -33459,11 +33459,11 @@ "@solana/wallet-adapter-walletconnect": "0.1.16", "@solana/web3.js": "1.91.7", "@walletconnect/universal-provider": "2.11.2", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", "bn.js": "5.2.1", "bs58": "5.0.0" }, @@ -33502,7 +33502,7 @@ }, "packages/ui": { "name": "@web3modal/ui", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "lit": "3.1.0", @@ -33510,23 +33510,23 @@ }, "devDependencies": { "@types/qrcode": "1.5.5", - "@web3modal/common": "5.0.1", + "@web3modal/common": "5.0.2", "eslint-plugin-lit": "1.11.0", "eslint-plugin-wc": "2.0.4" } }, "packages/wagmi": { "name": "@web3modal/wagmi", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { "@walletconnect/ethereum-provider": "2.13.0", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", - "@web3modal/siwe": "5.0.1" + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", + "@web3modal/siwe": "5.0.2" }, "devDependencies": { "@wagmi/connectors": "5.0.8", @@ -33684,10 +33684,11 @@ }, "packages/wallet": { "name": "@web3modal/wallet", - "version": "5.0.1", + "version": "5.0.2", "license": "Apache-2.0", "dependencies": { - "@web3modal/polyfills": "5.0.1", + "@walletconnect/logger": "2.1.2", + "@web3modal/polyfills": "5.0.2", "zod": "3.22.4" } } diff --git a/packages/cdn/CHANGELOG.md b/packages/cdn/CHANGELOG.md index 34c78c2742..fb2acf8c25 100644 --- a/packages/cdn/CHANGELOG.md +++ b/packages/cdn/CHANGELOG.md @@ -1,5 +1,15 @@ # @web3modal/cdn +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/ethers@5.0.2 + - @web3modal/wagmi@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/cdn/package.json b/packages/cdn/package.json index 8018b90008..05e35c64c3 100644 --- a/packages/cdn/package.json +++ b/packages/cdn/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/cdn", - "version": "5.0.1", + "version": "5.0.2", "main": "dist/wagmi.js", "type": "module", "files": [ @@ -28,8 +28,8 @@ "dependencies": { "@wagmi/connectors": "5.0.8", "@wagmi/core": "2.10.5", - "@web3modal/wagmi": "5.0.1", - "@web3modal/ethers": "5.0.1", + "@web3modal/wagmi": "5.0.2", + "@web3modal/ethers": "5.0.2", "viem": "2.10.3", "vite": "5.2.11" } diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md index 356a832f2e..69bb564677 100644 --- a/packages/common/CHANGELOG.md +++ b/packages/common/CHANGELOG.md @@ -1,5 +1,11 @@ # @web3modal/common +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + ## 5.0.1 ### Patch Changes diff --git a/packages/common/package.json b/packages/common/package.json index 3e602c558b..a13882f7a5 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/common", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 5b3c5ac9d0..e993b7d4a0 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,5 +1,15 @@ # @web3modal/core +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/common@5.0.2 + - @web3modal/wallet@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/core/package.json b/packages/core/package.json index c455c237a8..89a5438616 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/core", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", @@ -17,8 +17,8 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@web3modal/common": "5.0.1", - "@web3modal/wallet": "5.0.1", + "@web3modal/common": "5.0.2", + "@web3modal/wallet": "5.0.2", "valtio": "1.11.2" }, "devDependencies": { diff --git a/packages/core/src/controllers/ApiController.ts b/packages/core/src/controllers/ApiController.ts index 7f3525d83c..5b34f91bd7 100644 --- a/packages/core/src/controllers/ApiController.ts +++ b/packages/core/src/controllers/ApiController.ts @@ -30,6 +30,7 @@ export interface ApiControllerState { wallets: WcWallet[] search: WcWallet[] isAnalyticsEnabled: boolean + excludedRDNS: string[] } type StateKey = keyof ApiControllerState @@ -42,7 +43,8 @@ const state = proxy({ recommended: [], wallets: [], search: [], - isAnalyticsEnabled: false + isAnalyticsEnabled: false, + excludedRDNS: [] }) // -- Controller ---------------------------------------- // @@ -193,6 +195,27 @@ export const ApiController = { state.page = page }, + async searchWalletByIds({ ids }: { ids: string[] }) { + const { data } = await api.get({ + path: '/getWallets', + headers: ApiController._getApiHeaders(), + params: { + page: '1', + entries: String(ids.length), + chains: NetworkController.state.caipNetwork?.id, + include: ids?.join(',') + } + }) + + if (data) { + data.forEach(wallet => { + if (wallet?.rdns) { + state.excludedRDNS.push(wallet.rdns) + } + }) + } + }, + async searchWallet({ search }: Pick) { const { includeWalletIds, excludeWalletIds } = OptionsController.state state.search = [] diff --git a/packages/core/src/controllers/NetworkController.ts b/packages/core/src/controllers/NetworkController.ts index 3a36944902..0a8f32689c 100644 --- a/packages/core/src/controllers/NetworkController.ts +++ b/packages/core/src/controllers/NetworkController.ts @@ -106,7 +106,6 @@ export const NetworkController = { async switchActiveNetwork(network: NetworkControllerState['caipNetwork']) { await this._getClient().switchCaipNetwork(network) - state.caipNetwork = network if (network) { EventsController.sendEvent({ diff --git a/packages/core/src/controllers/OptionsController.ts b/packages/core/src/controllers/OptionsController.ts index 8da026bbdc..27ebda3004 100644 --- a/packages/core/src/controllers/OptionsController.ts +++ b/packages/core/src/controllers/OptionsController.ts @@ -1,6 +1,7 @@ import { subscribeKey as subKey } from 'valtio/vanilla/utils' import { proxy, snapshot } from 'valtio/vanilla' import type { CustomWallet, Metadata, ProjectId, SdkVersion, Tokens } from '../utils/TypeUtil.js' +import { ApiController } from './ApiController.js' // -- Types --------------------------------------------- // export interface OptionsControllerState { @@ -53,6 +54,9 @@ export const OptionsController = { setExcludeWalletIds(excludeWalletIds: OptionsControllerState['excludeWalletIds']) { state.excludeWalletIds = excludeWalletIds + if (excludeWalletIds) { + ApiController.searchWalletByIds({ ids: excludeWalletIds }) + } }, setFeaturedWalletIds(featuredWalletIds: OptionsControllerState['featuredWalletIds']) { diff --git a/packages/core/tests/controllers/ApiController.test.ts b/packages/core/tests/controllers/ApiController.test.ts index 830071d227..19ec909170 100644 --- a/packages/core/tests/controllers/ApiController.test.ts +++ b/packages/core/tests/controllers/ApiController.test.ts @@ -18,7 +18,8 @@ describe('ApiController', () => { recommended: [], wallets: [], search: [], - isAnalyticsEnabled: false + isAnalyticsEnabled: false, + excludedRDNS: [] }) }) @@ -348,6 +349,51 @@ describe('ApiController', () => { expect(ApiController.state.wallets).toEqual(data) }) + it('should fetch excludedWalletIds and check if RDNS of EIP6963 matches', async () => { + const excludeWalletIds = ['12345', '12346'] + const EIP6963Wallets = [ + { name: 'MetaMask', rdns: 'io.metamask' }, + { name: 'Rainbow', rdns: 'me.rainbow' } + ] + const filteredWallet = [{ name: 'Rainbow', rdns: 'me.rainbow' }] + const data = [ + { + id: '12345', + name: 'MetaMask', + rdns: 'io.metamask' + }, + { + id: '12346', + name: 'Phantom', + rdns: 'app.phantom' + } + ] + + OptionsController.setExcludeWalletIds(excludeWalletIds) + + const fetchSpy = vi.spyOn(api, 'get').mockResolvedValue({ data, count: data.length }) + const fetchWalletsSpy = vi.spyOn(ApiController, 'searchWalletByIds') + + await ApiController.searchWalletByIds({ ids: excludeWalletIds }) + + expect(fetchSpy).toHaveBeenCalledWith({ + path: '/getWallets', + headers: ApiController._getApiHeaders(), + params: { + page: '1', + entries: String(excludeWalletIds.length), + include: excludeWalletIds.join(',') + } + }) + + expect(fetchWalletsSpy).toHaveBeenCalledOnce() + expect(ApiController.state.excludedRDNS).toEqual(['io.metamask', 'app.phantom']) + const result = EIP6963Wallets.filter( + wallet => !ApiController.state.excludedRDNS.includes(wallet.rdns) + ) + expect(result).toEqual(filteredWallet) + }) + // Wallet search with exact wallet name it('should search wallet with search term', async () => { const includeWalletIds = ['12341', '12342'] diff --git a/packages/ethers/CHANGELOG.md b/packages/ethers/CHANGELOG.md index 5a24d6c914..f38fa359a0 100644 --- a/packages/ethers/CHANGELOG.md +++ b/packages/ethers/CHANGELOG.md @@ -1,5 +1,19 @@ # @web3modal/ethers +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/polyfills@5.0.2 + - @web3modal/scaffold@5.0.2 + - @web3modal/scaffold-react@5.0.2 + - @web3modal/scaffold-utils@5.0.2 + - @web3modal/scaffold-vue@5.0.2 + - @web3modal/siwe@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/ethers/package.json b/packages/ethers/package.json index c58e93274f..def15f62d5 100644 --- a/packages/ethers/package.json +++ b/packages/ethers/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/ethers", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/exports/index.js", "types": "./dist/types/exports/index.d.ts", @@ -45,12 +45,12 @@ "dependencies": { "@coinbase/wallet-sdk": "4.0.0", "@walletconnect/ethereum-provider": "2.13.0", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", - "@web3modal/siwe": "5.0.1", + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", + "@web3modal/siwe": "5.0.2", "valtio": "1.11.2" }, "peerDependencies": { diff --git a/packages/ethers5/CHANGELOG.md b/packages/ethers5/CHANGELOG.md index 6280a2c568..7710a8754f 100644 --- a/packages/ethers5/CHANGELOG.md +++ b/packages/ethers5/CHANGELOG.md @@ -1,5 +1,19 @@ # @web3modal/ethers5 +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/polyfills@5.0.2 + - @web3modal/scaffold@5.0.2 + - @web3modal/scaffold-react@5.0.2 + - @web3modal/scaffold-utils@5.0.2 + - @web3modal/scaffold-vue@5.0.2 + - @web3modal/siwe@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/ethers5/package.json b/packages/ethers5/package.json index 00e9a4fb86..5aec3734ad 100644 --- a/packages/ethers5/package.json +++ b/packages/ethers5/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/ethers5", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/exports/index.js", "types": "./dist/types/exports/index.d.ts", @@ -45,12 +45,12 @@ "dependencies": { "@coinbase/wallet-sdk": "4.0.0", "@walletconnect/ethereum-provider": "2.13.0", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", - "@web3modal/siwe": "5.0.1", + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", + "@web3modal/siwe": "5.0.2", "valtio": "1.11.2" }, "devDependencies": { diff --git a/packages/polyfills/CHANGELOG.md b/packages/polyfills/CHANGELOG.md index 127e6416cb..083a783a1a 100644 --- a/packages/polyfills/CHANGELOG.md +++ b/packages/polyfills/CHANGELOG.md @@ -1,5 +1,11 @@ # @web3modal/polyfills +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + ## 5.0.1 ### Patch Changes diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json index c8af330946..5c3088965f 100644 --- a/packages/polyfills/package.json +++ b/packages/polyfills/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/polyfills", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", diff --git a/packages/scaffold-react/CHANGELOG.md b/packages/scaffold-react/CHANGELOG.md index a842a2b2d4..06c6c51600 100644 --- a/packages/scaffold-react/CHANGELOG.md +++ b/packages/scaffold-react/CHANGELOG.md @@ -1,5 +1,14 @@ # @web3modal/scaffold-react +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/scaffold@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/scaffold-react/package.json b/packages/scaffold-react/package.json index d054ff2d23..fa02c3f577 100644 --- a/packages/scaffold-react/package.json +++ b/packages/scaffold-react/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/scaffold-react", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", @@ -16,7 +16,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@web3modal/scaffold": "5.0.1" + "@web3modal/scaffold": "5.0.2" }, "peerDependencies": { "react": ">=17", diff --git a/packages/scaffold-utils/CHANGELOG.md b/packages/scaffold-utils/CHANGELOG.md index b80089c35b..27948a713a 100644 --- a/packages/scaffold-utils/CHANGELOG.md +++ b/packages/scaffold-utils/CHANGELOG.md @@ -1,5 +1,15 @@ # @web3modal/scaffold-utils +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/core@5.0.2 + - @web3modal/polyfills@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/scaffold-utils/package.json b/packages/scaffold-utils/package.json index a2aaca3aa2..7a4409c923 100644 --- a/packages/scaffold-utils/package.json +++ b/packages/scaffold-utils/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/scaffold-utils", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/exports/index.js", "types": "./dist/types/exports/index.d.ts", @@ -40,8 +40,8 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@web3modal/core": "5.0.1", - "@web3modal/polyfills": "5.0.1", + "@web3modal/core": "5.0.2", + "@web3modal/polyfills": "5.0.2", "valtio": "1.11.2" }, "keywords": [ diff --git a/packages/scaffold-utils/src/ConstantsUtil.ts b/packages/scaffold-utils/src/ConstantsUtil.ts index 91fdc4f254..2dc2c3b1f0 100644 --- a/packages/scaffold-utils/src/ConstantsUtil.ts +++ b/packages/scaffold-utils/src/ConstantsUtil.ts @@ -14,5 +14,5 @@ export const ConstantsUtil = { CONNECTOR_RDNS_MAP: { coinbaseWallet: 'com.coinbase.wallet' } as Record, - VERSION: '5.0.1' + VERSION: '5.0.2' } diff --git a/packages/scaffold-vue/CHANGELOG.md b/packages/scaffold-vue/CHANGELOG.md index 6aaec7abc6..bb13a15ff5 100644 --- a/packages/scaffold-vue/CHANGELOG.md +++ b/packages/scaffold-vue/CHANGELOG.md @@ -1,5 +1,14 @@ # @web3modal/scaffold-vue +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/scaffold@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/scaffold-vue/package.json b/packages/scaffold-vue/package.json index 3ebbc90413..e60f63ce15 100644 --- a/packages/scaffold-vue/package.json +++ b/packages/scaffold-vue/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/scaffold-vue", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", @@ -16,7 +16,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@web3modal/scaffold": "5.0.1" + "@web3modal/scaffold": "5.0.2" }, "peerDependencies": { "vue": ">=3" diff --git a/packages/scaffold/CHANGELOG.md b/packages/scaffold/CHANGELOG.md index 18e6daf018..257cb4e0d3 100644 --- a/packages/scaffold/CHANGELOG.md +++ b/packages/scaffold/CHANGELOG.md @@ -1,5 +1,19 @@ # @web3modal/scaffold +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/common@5.0.2 + - @web3modal/core@5.0.2 + - @web3modal/scaffold-utils@5.0.2 + - @web3modal/siwe@5.0.2 + - @web3modal/ui@5.0.2 + - @web3modal/wallet@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/scaffold/package.json b/packages/scaffold/package.json index 7a5562ef22..cff75ce4e0 100644 --- a/packages/scaffold/package.json +++ b/packages/scaffold/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/scaffold", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", @@ -16,13 +16,13 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "@web3modal/common": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/core": "5.0.1", - "@web3modal/ui": "5.0.1", + "@web3modal/common": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/core": "5.0.2", + "@web3modal/ui": "5.0.2", "lit": "3.1.0", - "@web3modal/siwe": "5.0.1", - "@web3modal/wallet": "5.0.1" + "@web3modal/siwe": "5.0.2", + "@web3modal/wallet": "5.0.2" }, "keywords": [ "web3", diff --git a/packages/scaffold/src/modal/w3m-modal/index.ts b/packages/scaffold/src/modal/w3m-modal/index.ts index 33cf7bd26c..f85fed77c5 100644 --- a/packages/scaffold/src/modal/w3m-modal/index.ts +++ b/packages/scaffold/src/modal/w3m-modal/index.ts @@ -189,7 +189,10 @@ export class W3mModal extends LitElement { return } - // If the network has changed and signOnNetworkChange is enabled, sign out + /* + * If the network has changed and signOnNetworkChange is enabled, sign out + * Covers case where network is switched wallet-side + */ if (session && previousNetworkId && newNetworkId && previousNetworkId !== newNetworkId) { if (SIWEController.state._client?.options.signOutOnNetworkChange) { await SIWEController.signOut() diff --git a/packages/scaffold/src/partials/w3m-connect-announced-widget/index.ts b/packages/scaffold/src/partials/w3m-connect-announced-widget/index.ts index 1c6a390b9a..a797efb608 100644 --- a/packages/scaffold/src/partials/w3m-connect-announced-widget/index.ts +++ b/packages/scaffold/src/partials/w3m-connect-announced-widget/index.ts @@ -1,5 +1,11 @@ import type { Connector } from '@web3modal/core' -import { AssetUtil, ConnectorController, CoreHelperUtil, RouterController } from '@web3modal/core' +import { + ApiController, + AssetUtil, + ConnectorController, + CoreHelperUtil, + RouterController +} from '@web3modal/core' import { customElement } from '@web3modal/ui' import { LitElement, html } from 'lit' import { state } from 'lit/decorators.js' @@ -36,8 +42,14 @@ export class W3mConnectAnnouncedWidget extends LitElement { return html` - ${announcedConnectors.map( - connector => html` + ${announcedConnectors.map(connector => { + if (connector.info?.rdns && ApiController.state.excludedRDNS) { + if (ApiController.state.excludedRDNS.includes(connector?.info?.rdns)) { + return null + } + } + + return html` ` - )} + })} ` } diff --git a/packages/scaffold/src/partials/w3m-connect-injected-widget/index.ts b/packages/scaffold/src/partials/w3m-connect-injected-widget/index.ts index 799f9371a7..dff0358f61 100644 --- a/packages/scaffold/src/partials/w3m-connect-injected-widget/index.ts +++ b/packages/scaffold/src/partials/w3m-connect-injected-widget/index.ts @@ -1,5 +1,6 @@ import type { Connector } from '@web3modal/core' import { + ApiController, AssetUtil, ConnectionController, ConnectorController, @@ -56,6 +57,12 @@ export class W3mConnectInjectedWidget extends LitElement { return null } + if (connector.info?.rdns && ApiController.state.excludedRDNS) { + if (ApiController.state.excludedRDNS.includes(connector?.info?.rdns)) { + return null + } + } + return html` void)[] = [] - private desktopWindow?: Window | null - - private mobileWindow?: Window | null + private popupWindow?: Window | null // -- State & Properties -------------------------------- // @state() private connectors = ConnectorController.state.connectors @@ -162,13 +160,11 @@ export class W3mSocialLoginWidget extends LitElement { RouterController.push('ConnectingSocial') } const authConnector = ConnectorController.getAuthConnector() - if (CoreHelperUtil.isMobile()) { - this.mobileWindow = CoreHelperUtil.returnOpenHref( - '', - 'popupWindow', - 'width=600,height=800,scrollbars=yes' - ) - } + this.popupWindow = CoreHelperUtil.returnOpenHref( + '', + 'popupWindow', + 'width=600,height=800,scrollbars=yes' + ) try { if (authConnector && socialProvider) { @@ -176,23 +172,16 @@ export class W3mSocialLoginWidget extends LitElement { provider: socialProvider }) - if (!CoreHelperUtil.isMobile()) { - this.desktopWindow = CoreHelperUtil.returnOpenHref( - uri, - 'popupWindow', - 'width=600,height=800,scrollbars=yes' - ) - } - if (this.desktopWindow && uri) { - AccountController.setSocialWindow(this.desktopWindow) - } else if (this.mobileWindow && uri) { - this.mobileWindow.location.href = uri - AccountController.setSocialWindow(this.mobileWindow) + if (this.popupWindow && uri) { + AccountController.setSocialWindow(this.popupWindow) + this.popupWindow.location.href = uri } else { + this.popupWindow?.close() throw new Error('Something went wrong') } } } catch (error) { + this.popupWindow?.close() SnackController.showError('Something went wrong') } } diff --git a/packages/scaffold/src/utils/NetworkUtil.ts b/packages/scaffold/src/utils/NetworkUtil.ts new file mode 100644 index 0000000000..0e79cd65de --- /dev/null +++ b/packages/scaffold/src/utils/NetworkUtil.ts @@ -0,0 +1,16 @@ +import { OptionsController, RouterUtil } from '@web3modal/core' + +export const NetworkUtil = { + onNetworkChange: async () => { + if (OptionsController.state.isSiweEnabled) { + const { SIWEController } = await import('@web3modal/siwe') + if (SIWEController.state._client?.options?.signOutOnNetworkChange) { + await SIWEController.signOut() + } else { + RouterUtil.navigateAfterNetworkSwitch() + } + } else { + RouterUtil.navigateAfterNetworkSwitch() + } + } +} diff --git a/packages/scaffold/src/views/w3m-connecting-social-view/index.ts b/packages/scaffold/src/views/w3m-connecting-social-view/index.ts index 3451c17d82..6921c608eb 100644 --- a/packages/scaffold/src/views/w3m-connecting-social-view/index.ts +++ b/packages/scaffold/src/views/w3m-connecting-social-view/index.ts @@ -163,6 +163,14 @@ export class W3mConnectingSocialView extends LitElement { } private connectSocial() { + const interval = setInterval(() => { + if (this.socialWindow?.closed) { + if (!this.connecting && RouterController.state.view === 'ConnectingSocial') { + RouterController.goBack() + } + clearInterval(interval) + } + }, 1000) window.addEventListener('message', this.handleSocialConnection, false) } diff --git a/packages/scaffold/src/views/w3m-network-switch-view/index.ts b/packages/scaffold/src/views/w3m-network-switch-view/index.ts index 9bee16f361..498ac5eaad 100644 --- a/packages/scaffold/src/views/w3m-network-switch-view/index.ts +++ b/packages/scaffold/src/views/w3m-network-switch-view/index.ts @@ -2,9 +2,7 @@ import { AssetUtil, ConnectorController, NetworkController, - OptionsController, RouterController, - RouterUtil, StorageUtil } from '@web3modal/core' import { customElement } from '@web3modal/ui' @@ -12,6 +10,7 @@ import { LitElement, html } from 'lit' import { state } from 'lit/decorators.js' import { ifDefined } from 'lit/directives/if-defined.js' import styles from './styles.js' +import { NetworkUtil } from '../../utils/NetworkUtil.js' @customElement('w3m-network-switch-view') export class W3mNetworkSwitchView extends LitElement { @@ -134,9 +133,7 @@ export class W3mNetworkSwitchView extends LitElement { this.error = false if (this.network) { await NetworkController.switchActiveNetwork(this.network) - if (!OptionsController.state.isSiweEnabled) { - RouterUtil.navigateAfterNetworkSwitch() - } + await NetworkUtil.onNetworkChange() } } catch { this.error = true diff --git a/packages/scaffold/src/views/w3m-networks-view/index.ts b/packages/scaffold/src/views/w3m-networks-view/index.ts index 51219c453a..a0921ac54f 100644 --- a/packages/scaffold/src/views/w3m-networks-view/index.ts +++ b/packages/scaffold/src/views/w3m-networks-view/index.ts @@ -5,14 +5,14 @@ import { CoreHelperUtil, EventsController, NetworkController, - RouterController, - RouterUtil + RouterController } from '@web3modal/core' import { customElement } from '@web3modal/ui' import { LitElement, html } from 'lit' import { state } from 'lit/decorators.js' import { ifDefined } from 'lit/directives/if-defined.js' import styles from './styles.js' +import { NetworkUtil } from '../../utils/NetworkUtil.js' @customElement('w3m-networks-view') export class W3mNetworksView extends LitElement { @@ -92,7 +92,7 @@ export class W3mNetworksView extends LitElement { if (isConnected && caipNetwork?.id !== network.id) { if (approvedCaipNetworkIds?.includes(network.id)) { await NetworkController.switchActiveNetwork(network) - RouterUtil.navigateAfterNetworkSwitch() + await NetworkUtil.onNetworkChange() } else if (supportsAllNetworks) { RouterController.push('SwitchNetwork', { ...data, network }) } diff --git a/packages/scaffold/src/views/w3m-unsupported-chain-view/index.ts b/packages/scaffold/src/views/w3m-unsupported-chain-view/index.ts index 617ba00685..5118b366cf 100644 --- a/packages/scaffold/src/views/w3m-unsupported-chain-view/index.ts +++ b/packages/scaffold/src/views/w3m-unsupported-chain-view/index.ts @@ -8,7 +8,6 @@ import { ModalController, NetworkController, RouterController, - RouterUtil, SnackController } from '@web3modal/core' @@ -18,6 +17,7 @@ import { LitElement, html } from 'lit' import { state } from 'lit/decorators.js' import { ifDefined } from 'lit/directives/if-defined.js' import styles from './styles.js' +import { NetworkUtil } from '../../utils/NetworkUtil.js' @customElement('w3m-unsupported-chain-view') export class W3mUnsupportedChainView extends LitElement { @@ -132,7 +132,7 @@ export class W3mUnsupportedChainView extends LitElement { if (isConnected && caipNetwork?.id !== network.id) { if (approvedCaipNetworkIds?.includes(network.id)) { await NetworkController.switchActiveNetwork(network) - RouterUtil.navigateAfterNetworkSwitch() + await NetworkUtil.onNetworkChange() } else if (supportsAllNetworks) { RouterController.push('SwitchNetwork', { ...data, network }) } diff --git a/packages/siwe/CHANGELOG.md b/packages/siwe/CHANGELOG.md index 96643ec971..c0ca5090f6 100644 --- a/packages/siwe/CHANGELOG.md +++ b/packages/siwe/CHANGELOG.md @@ -1,5 +1,15 @@ # @web3modal/siwe +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/core@5.0.2 + - @web3modal/scaffold-utils@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/siwe/package.json b/packages/siwe/package.json index 0d6bdc31c6..720fecd9a0 100644 --- a/packages/siwe/package.json +++ b/packages/siwe/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/siwe", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/exports/index.js", "types": "./dist/types/exports/index.d.ts", @@ -17,8 +17,8 @@ }, "dependencies": { "@walletconnect/utils": "2.12.0", - "@web3modal/core": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", + "@web3modal/core": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", "valtio": "1.11.2", "lit": "3.1.0" }, diff --git a/packages/solana/CHANGELOG.md b/packages/solana/CHANGELOG.md index 3f1867602b..56f72382c1 100644 --- a/packages/solana/CHANGELOG.md +++ b/packages/solana/CHANGELOG.md @@ -1,5 +1,18 @@ # @web3modal/solana +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/polyfills@5.0.2 + - @web3modal/scaffold@5.0.2 + - @web3modal/scaffold-react@5.0.2 + - @web3modal/scaffold-utils@5.0.2 + - @web3modal/scaffold-vue@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/solana/package.json b/packages/solana/package.json index 1d2313f2ba..997735eac8 100644 --- a/packages/solana/package.json +++ b/packages/solana/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/solana", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/exports/index.js", "types": "./dist/types/exports/index.d.ts", @@ -52,11 +52,11 @@ "@solana/wallet-adapter-trust": "0.1.13", "@solana/wallet-adapter-walletconnect": "0.1.16", "@walletconnect/universal-provider": "2.11.2", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", "bn.js": "5.2.1", "bs58": "5.0.0" }, diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md index 517a779666..19328662b8 100644 --- a/packages/ui/CHANGELOG.md +++ b/packages/ui/CHANGELOG.md @@ -1,5 +1,11 @@ # @web3modal/ui +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + ## 5.0.1 ### Patch Changes diff --git a/packages/ui/package.json b/packages/ui/package.json index bca00d2e09..11995fc7c6 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/ui", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", @@ -22,7 +22,7 @@ }, "devDependencies": { "@types/qrcode": "1.5.5", - "@web3modal/common": "5.0.1", + "@web3modal/common": "5.0.2", "eslint-plugin-lit": "1.11.0", "eslint-plugin-wc": "2.0.4" }, diff --git a/packages/wagmi/CHANGELOG.md b/packages/wagmi/CHANGELOG.md index 3ffbe4f53a..9d417152f3 100644 --- a/packages/wagmi/CHANGELOG.md +++ b/packages/wagmi/CHANGELOG.md @@ -1,5 +1,19 @@ # @web3modal/wagmi +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/polyfills@5.0.2 + - @web3modal/scaffold@5.0.2 + - @web3modal/scaffold-react@5.0.2 + - @web3modal/scaffold-utils@5.0.2 + - @web3modal/scaffold-vue@5.0.2 + - @web3modal/siwe@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/wagmi/package.json b/packages/wagmi/package.json index b31fd13d6e..406ba9e366 100644 --- a/packages/wagmi/package.json +++ b/packages/wagmi/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/wagmi", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/exports/index.js", "types": "./dist/types/exports/index.d.ts", @@ -52,12 +52,12 @@ }, "dependencies": { "@walletconnect/ethereum-provider": "2.13.0", - "@web3modal/polyfills": "5.0.1", - "@web3modal/scaffold": "5.0.1", - "@web3modal/scaffold-react": "5.0.1", - "@web3modal/scaffold-utils": "5.0.1", - "@web3modal/scaffold-vue": "5.0.1", - "@web3modal/siwe": "5.0.1" + "@web3modal/polyfills": "5.0.2", + "@web3modal/scaffold": "5.0.2", + "@web3modal/scaffold-react": "5.0.2", + "@web3modal/scaffold-utils": "5.0.2", + "@web3modal/scaffold-vue": "5.0.2", + "@web3modal/siwe": "5.0.2" }, "devDependencies": { "@wagmi/connectors": "5.0.8", diff --git a/packages/wallet/CHANGELOG.md b/packages/wallet/CHANGELOG.md index 6a8e1dd5ce..57c2467b28 100644 --- a/packages/wallet/CHANGELOG.md +++ b/packages/wallet/CHANGELOG.md @@ -1,5 +1,14 @@ # @web3modal/wallet +## 5.0.2 + +### Patch Changes + +- fix: siwe signOutOnNetwork change issue. fix: wallets filtered by rdns matched from explorer api. fix: solana network id issue + +- Updated dependencies []: + - @web3modal/polyfills@5.0.2 + ## 5.0.1 ### Patch Changes diff --git a/packages/wallet/package.json b/packages/wallet/package.json index 8a30581c43..e23b7ce326 100644 --- a/packages/wallet/package.json +++ b/packages/wallet/package.json @@ -1,6 +1,6 @@ { "name": "@web3modal/wallet", - "version": "5.0.1", + "version": "5.0.2", "type": "module", "main": "./dist/esm/index.js", "types": "./dist/types/index.d.ts", @@ -16,8 +16,9 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx" }, "dependencies": { - "zod": "3.22.4", - "@web3modal/polyfills": "5.0.1" + "@walletconnect/logger": "2.1.2", + "@web3modal/polyfills": "5.0.2", + "zod": "3.22.4" }, "keywords": [ "web3", diff --git a/packages/wallet/src/W3mFrameConstants.ts b/packages/wallet/src/W3mFrameConstants.ts index cb10fe44d5..169537b6f3 100644 --- a/packages/wallet/src/W3mFrameConstants.ts +++ b/packages/wallet/src/W3mFrameConstants.ts @@ -1,6 +1,8 @@ export const SECURE_SITE_SDK = process.env['NEXT_PUBLIC_SECURE_SITE_SDK_URL'] || 'https://secure.walletconnect.com/sdk' +export const DEFAULT_LOG_LEVEL = process.env['NEXT_PUBLIC_DEFAULT_LOG_LEVEL'] || 'error' + export const W3mFrameConstants = { APP_EVENT_KEY: '@w3m-app/', FRAME_EVENT_KEY: '@w3m-frame/', diff --git a/packages/wallet/src/W3mFrameProvider.ts b/packages/wallet/src/W3mFrameProvider.ts index 5bcee9453a..308ca3bcbb 100644 --- a/packages/wallet/src/W3mFrameProvider.ts +++ b/packages/wallet/src/W3mFrameProvider.ts @@ -1,8 +1,15 @@ import { W3mFrame } from './W3mFrame.js' import type { W3mFrameTypes } from './W3mFrameTypes.js' -import { W3mFrameConstants, W3mFrameRpcConstants } from './W3mFrameConstants.js' +import { DEFAULT_LOG_LEVEL, W3mFrameConstants, W3mFrameRpcConstants } from './W3mFrameConstants.js' import { W3mFrameStorage } from './W3mFrameStorage.js' import { W3mFrameHelpers } from './W3mFrameHelpers.js' +import { + generateChildLogger, + generatePlatformLogger, + getDefaultLoggerOptions, + type ChunkLoggerController, + type Logger +} from '@walletconnect/logger' // -- Types ----------------------------------------------------------- type Resolver = { resolve: (value: T) => void; reject: (reason?: unknown) => void } | undefined @@ -71,11 +78,40 @@ export class W3mFrameProvider { private setPreferredAccountResolver: SetPreferredAccountResolver = undefined + public logger: Logger + + public chunkLoggerController: ChunkLoggerController | null + public constructor(projectId: string) { + const loggerOptions = getDefaultLoggerOptions({ + level: DEFAULT_LOG_LEVEL + }) + + const { logger, chunkLoggerController } = generatePlatformLogger({ + opts: loggerOptions + }) + this.logger = generateChildLogger(logger, this.constructor.name) + this.chunkLoggerController = chunkLoggerController + + if (typeof window !== 'undefined' && this.chunkLoggerController?.downloadLogsBlobInBrowser) { + // @ts-expect-error any + if (!window.dowdownloadAppKitLogsBlob) { + // @ts-expect-error any + window.downloadAppKitLogsBlob = {} + } + // @ts-expect-error any + window.downloadAppKitLogsBlob['sdk'] = () => { + if (this.chunkLoggerController?.downloadLogsBlobInBrowser) { + this.chunkLoggerController.downloadLogsBlobInBrowser({ + projectId + }) + } + } + } + this.w3mFrame = new W3mFrame(projectId, true) this.w3mFrame.events.onFrameEvent(event => { - // eslint-disable-next-line no-console - console.log('💻 received', event) + this.logger.info({ event }, 'Event received') switch (event.type) { case W3mFrameConstants.FRAME_CONNECT_EMAIL_SUCCESS: diff --git a/renovate.json b/renovate.json index 5cb6072672..ea200d58d9 100644 --- a/renovate.json +++ b/renovate.json @@ -7,6 +7,7 @@ ":semanticCommits", ":semanticCommitScope(deps)" ], + "rebaseWhen": "conflicted", "packageRules": [ { "matchPackagePatterns": ["*"],