From d5c3b7c4922e35c836e02bc3b338e88bfd222318 Mon Sep 17 00:00:00 2001 From: "Chiaki.C" Date: Wed, 24 Jan 2024 16:23:03 +0800 Subject: [PATCH 1/5] fix: clear wagmi switch chain error --- .changeset/wicked-shirts-flash.md | 5 +++++ adapters/wagmi-connector/src/connector.ts | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .changeset/wicked-shirts-flash.md diff --git a/.changeset/wicked-shirts-flash.md b/.changeset/wicked-shirts-flash.md new file mode 100644 index 00000000..5d006c63 --- /dev/null +++ b/.changeset/wicked-shirts-flash.md @@ -0,0 +1,5 @@ +--- +'@blocto/wagmi-connector': patch +--- + +Show not in config error message when attempt to switch dapp unsupport chain diff --git a/adapters/wagmi-connector/src/connector.ts b/adapters/wagmi-connector/src/connector.ts index bb964ba4..9fcc4290 100644 --- a/adapters/wagmi-connector/src/connector.ts +++ b/adapters/wagmi-connector/src/connector.ts @@ -124,7 +124,11 @@ export function blocto({ appId }: BloctoParameters = {}) { ); const isBloctoSupportChain = evmSupportMap[`${chainId}`]; - if (!chain || !isBloctoSupportChain) { + if (!chain) { + throw new SwitchChainError(new Error(`Chain not in config: ${id}`)); + } + + if (!isBloctoSupportChain) { throw new SwitchChainError( new Error(`Blocto unsupported chain: ${id}`) ); From bb5ba5dba8ee90ec7caf4d54c523c0c5cc3b559c Mon Sep 17 00:00:00 2001 From: Calvin Chang Date: Fri, 26 Jan 2024 11:54:29 +0800 Subject: [PATCH 2/5] fix(wagmi): obtain chainId through request --- adapters/wagmi-connector/src/connector.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/adapters/wagmi-connector/src/connector.ts b/adapters/wagmi-connector/src/connector.ts index 9fcc4290..283d0c24 100644 --- a/adapters/wagmi-connector/src/connector.ts +++ b/adapters/wagmi-connector/src/connector.ts @@ -74,9 +74,7 @@ export function blocto({ appId }: BloctoParameters = {}) { }, async getChainId() { const provider = await this.getProvider(); - const chainId = - provider.chainId ?? - (await provider?.request({ method: 'eth_chainId' })); + const chainId = await provider?.request({ method: 'eth_chainId' }); return normalizeChainId(chainId); }, async getProvider({ chainId } = {}) { From 9e6eb2589df8bbb39fdb6e92e1672ba6cc761526 Mon Sep 17 00:00:00 2001 From: Calvin Chang Date: Fri, 26 Jan 2024 11:57:16 +0800 Subject: [PATCH 3/5] chore: add changeset --- .changeset/afraid-hairs-exercise.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/afraid-hairs-exercise.md diff --git a/.changeset/afraid-hairs-exercise.md b/.changeset/afraid-hairs-exercise.md new file mode 100644 index 00000000..01a5be82 --- /dev/null +++ b/.changeset/afraid-hairs-exercise.md @@ -0,0 +1,5 @@ +--- +'@blocto/wagmi-connector': patch +--- + +fix(wagmi): obtain chainId through request From a35987df273c3b479e005c75506366ed42deca9c Mon Sep 17 00:00:00 2001 From: Calvin Chang Date: Fri, 26 Jan 2024 13:55:19 +0800 Subject: [PATCH 4/5] chore: beta-release --- .changeset/pre.json | 20 ++++++++++++++++++++ adapters/wagmi-connector/CHANGELOG.md | 7 +++++++ adapters/wagmi-connector/package.json | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 00000000..bdfb8e68 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,20 @@ +{ + "mode": "exit", + "tag": "beta", + "initialVersions": { + "@blocto/aptos-wallet-adapter-plugin": "0.2.8", + "@blocto/connectkit-connector": "0.2.3", + "@blocto/rainbowkit-connector": "0.2.9", + "@blocto/wagmi-connector": "2.0.0", + "@blocto/web3-react-connector": "1.0.6", + "@blocto/web3modal-connector": "0.1.4", + "@blocto/sdk": "0.9.1", + "@blocto/dappauth": "2.2.2", + "eslint-config-custom": "0.0.0", + "tsconfig": "0.0.0" + }, + "changesets": [ + "afraid-hairs-exercise", + "wicked-shirts-flash" + ] +} diff --git a/adapters/wagmi-connector/CHANGELOG.md b/adapters/wagmi-connector/CHANGELOG.md index 4a2b0bcd..4564ac6c 100644 --- a/adapters/wagmi-connector/CHANGELOG.md +++ b/adapters/wagmi-connector/CHANGELOG.md @@ -1,5 +1,12 @@ # @blocto/wagmi-connector +## 2.0.1-beta.0 + +### Patch Changes + +- 7f68b54: fix(wagmi): obtain chainId through request +- 073daf0: Show not in config error message when attempt to switch dapp unsupport chain + ## 2.0.0 ### Major Changes diff --git a/adapters/wagmi-connector/package.json b/adapters/wagmi-connector/package.json index e2a1d8c4..70ac6bb9 100644 --- a/adapters/wagmi-connector/package.json +++ b/adapters/wagmi-connector/package.json @@ -2,7 +2,7 @@ "name": "@blocto/wagmi-connector", "description": "Blocto wallet connector extend from wagmi Connector", "author": "Calvin Chang", - "version": "2.0.0", + "version": "2.0.1-beta.0", "type": "module", "main": "./dist/index.umd.cjs", "module": "./dist/index.js", From 7262e297965cd296220b610f9cbcab30475a6193 Mon Sep 17 00:00:00 2001 From: q20274982 Date: Wed, 31 Jan 2024 04:12:42 +0000 Subject: [PATCH 5/5] ci: bump package version --- .changeset/afraid-hairs-exercise.md | 5 ----- .changeset/pre.json | 20 -------------------- .changeset/wicked-shirts-flash.md | 5 ----- adapters/wagmi-connector/CHANGELOG.md | 7 +++++++ adapters/wagmi-connector/package.json | 2 +- 5 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 .changeset/afraid-hairs-exercise.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/wicked-shirts-flash.md diff --git a/.changeset/afraid-hairs-exercise.md b/.changeset/afraid-hairs-exercise.md deleted file mode 100644 index 01a5be82..00000000 --- a/.changeset/afraid-hairs-exercise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@blocto/wagmi-connector': patch ---- - -fix(wagmi): obtain chainId through request diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index bdfb8e68..00000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "mode": "exit", - "tag": "beta", - "initialVersions": { - "@blocto/aptos-wallet-adapter-plugin": "0.2.8", - "@blocto/connectkit-connector": "0.2.3", - "@blocto/rainbowkit-connector": "0.2.9", - "@blocto/wagmi-connector": "2.0.0", - "@blocto/web3-react-connector": "1.0.6", - "@blocto/web3modal-connector": "0.1.4", - "@blocto/sdk": "0.9.1", - "@blocto/dappauth": "2.2.2", - "eslint-config-custom": "0.0.0", - "tsconfig": "0.0.0" - }, - "changesets": [ - "afraid-hairs-exercise", - "wicked-shirts-flash" - ] -} diff --git a/.changeset/wicked-shirts-flash.md b/.changeset/wicked-shirts-flash.md deleted file mode 100644 index 5d006c63..00000000 --- a/.changeset/wicked-shirts-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@blocto/wagmi-connector': patch ---- - -Show not in config error message when attempt to switch dapp unsupport chain diff --git a/adapters/wagmi-connector/CHANGELOG.md b/adapters/wagmi-connector/CHANGELOG.md index 4564ac6c..46b68aa1 100644 --- a/adapters/wagmi-connector/CHANGELOG.md +++ b/adapters/wagmi-connector/CHANGELOG.md @@ -1,5 +1,12 @@ # @blocto/wagmi-connector +## 2.0.1 + +### Patch Changes + +- 7f68b54: fix(wagmi): obtain chainId through request +- 073daf0: Show not in config error message when attempt to switch dapp unsupport chain + ## 2.0.1-beta.0 ### Patch Changes diff --git a/adapters/wagmi-connector/package.json b/adapters/wagmi-connector/package.json index 70ac6bb9..bd5b515e 100644 --- a/adapters/wagmi-connector/package.json +++ b/adapters/wagmi-connector/package.json @@ -2,7 +2,7 @@ "name": "@blocto/wagmi-connector", "description": "Blocto wallet connector extend from wagmi Connector", "author": "Calvin Chang", - "version": "2.0.1-beta.0", + "version": "2.0.1", "type": "module", "main": "./dist/index.umd.cjs", "module": "./dist/index.js",