From aeddd080f98ef363f00b4e9af5cb50476cd296c1 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Tue, 15 Apr 2025 09:00:41 -0700 Subject: [PATCH 1/3] replace caip-x with caip-348 --- .../MetaMaskMultichainExternallyConnectableProvider.ts | 4 ++-- .../providers/MetaMaskMultichainWindowPostMessageProvider.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sdk/providers/MetaMaskMultichainExternallyConnectableProvider.ts b/src/sdk/providers/MetaMaskMultichainExternallyConnectableProvider.ts index 08a5aed..4eda2b6 100644 --- a/src/sdk/providers/MetaMaskMultichainExternallyConnectableProvider.ts +++ b/src/sdk/providers/MetaMaskMultichainExternallyConnectableProvider.ts @@ -42,7 +42,7 @@ class MetaMaskMultichainExternallyConnectableProvider extends MetaMaskMultichain this.#port.onMessage.addListener((message) => { const { type, data } = message; - if (type !== 'caip-x') { + if (type !== 'caip-348') { return; } this._handleMessage(data); @@ -72,7 +72,7 @@ class MetaMaskMultichainExternallyConnectableProvider extends MetaMaskMultichain } _sendRequest(request: JsonRpcRequest) { - this.#port?.postMessage({ type: 'caip-x', data: request }); + this.#port?.postMessage({ type: 'caip-348', data: request }); } } diff --git a/src/sdk/providers/MetaMaskMultichainWindowPostMessageProvider.ts b/src/sdk/providers/MetaMaskMultichainWindowPostMessageProvider.ts index 680b0cb..b888ebb 100644 --- a/src/sdk/providers/MetaMaskMultichainWindowPostMessageProvider.ts +++ b/src/sdk/providers/MetaMaskMultichainWindowPostMessageProvider.ts @@ -25,7 +25,7 @@ class MetaMaskMultichainWindowPostMessageProvider extends MetaMaskMultichainBase if ( target !== INPAGE || data?.name !== MULTICHAIN_SUBSTREAM_NAME || - data?.data.type !== 'caip-x' + data?.data.type !== 'caip-348' ) { return; } @@ -55,7 +55,7 @@ class MetaMaskMultichainWindowPostMessageProvider extends MetaMaskMultichainBase data: { name: MULTICHAIN_SUBSTREAM_NAME, data: { - type: 'caip-x', + type: 'caip-348', data: request, }, }, From cb4b586194a24d91dc3bdd9d1f0a36498b5214d1 Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Tue, 15 Apr 2025 11:59:59 -0700 Subject: [PATCH 2/3] handle caip-348 target --- src/App.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index f1849d9..cc35f80 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -160,7 +160,8 @@ function App() { const handleWalletAnnounce = useCallback( (ev: Event) => { const customEvent = ev as CustomEvent; - const { extensionId: announcedId, rdns } = customEvent.detail.params; + const { targets, rdns } = customEvent.detail.params; + const announcedId = targets?.find((target: {type: string, value: string}) => target.type === 'caip-348')?.value const newExtensionId = rdns === 'io.metamask.flask' && !announcedId ? WINDOW_POST_MESSAGE_ID From 9a4c2022ff7e2c136fd81a271f872fd222f3829a Mon Sep 17 00:00:00 2001 From: Jiexi Luan Date: Wed, 16 Apr 2025 13:43:17 -0700 Subject: [PATCH 3/3] lint --- src/App.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index cc35f80..aafeebc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -161,7 +161,9 @@ function App() { (ev: Event) => { const customEvent = ev as CustomEvent; const { targets, rdns } = customEvent.detail.params; - const announcedId = targets?.find((target: {type: string, value: string}) => target.type === 'caip-348')?.value + const announcedId = targets?.find( + (target: { type: string; value: string }) => target.type === 'caip-348', + )?.value; const newExtensionId = rdns === 'io.metamask.flask' && !announcedId ? WINDOW_POST_MESSAGE_ID