@multiplatform.one/web3 7.33.0 → 7.33.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/web3",
-  "version": "7.33.0",
+  "version": "7.33.1",
   "description": "Web3 wallet integration for multiplatform.one ecosystem with ConnectKit and wagmi",
   "keywords": [
     "connectkit",
@@ -120,10 +120,10 @@
     "@aave/account": "^0.2.0",
     "@coinbase/wallet-sdk": "^4.3.6",
     "@metamask/connect-evm": "^2.1.1",
-    "@multiplatform.one/connectkit": "7.33.0",
-    "@multiplatform.one/gpg": "7.33.0",
-    "@multiplatform.one/platform": "7.33.0",
-    "@multiplatform.one/theme": "7.33.0",
+    "@multiplatform.one/connectkit": "7.33.1",
+    "@multiplatform.one/gpg": "7.33.1",
+    "@multiplatform.one/platform": "7.33.1",
+    "@multiplatform.one/theme": "7.33.1",
     "@noble/curves": "^1.9.7",
     "@solana/kit": "^8.3.0",
     "@solana/wallet-adapter-base": "^0.9.27",
@@ -145,7 +145,7 @@
     "wagmi": "^3.7.1"
   },
   "devDependencies": {
-    "@multiplatform.one/config": "7.33.0",
+    "@multiplatform.one/config": "7.33.1",
     "@tamagui/build": "2.7.6",
     "@tanstack/react-query": "^5.100.7",
     "@testing-library/jest-dom": "^6.9.1",

package/src/connectkit/connectors/metaMaskConnectConnector.spec.ts

@@ -339,6 +339,50 @@ describe("metaMaskConnect under wagmi", () => {
     expect(request.mock.calls.map(([call]) => call.method)).toContain("personal_sign");
   });
 
+  it("signs under mainnet's scope when the desktop extension sits on a chain the app does not list", async () => {
+    // As @metamask/connect-evm's EIP1193Provider: the scope comes from
+    // selectedChainId before the first await, and a chain outside
+    // supportedNetworks is refused there.
+    const scopes: string[] = [];
+    const provider = {
+      selectedChainId: "0x2105" as string | undefined,
+      request: vi.fn(({ method }: { method: string }) => {
+        const chainId = provider.selectedChainId!;
+        const { api } = createEVMClient.mock.calls[0]![0] as {
+          api: { supportedNetworks: Record<string, string> };
+        };
+        if (!api.supportedNetworks[chainId])
+          return Promise.reject(
+            new Error(`Chain eip155:${Number(chainId)} is not configured in supportedNetworks`),
+          );
+        scopes.push(`eip155:${Number(chainId)}`);
+        return Promise.resolve(method === "personal_sign" ? "0x5167" : "0xabc");
+      }),
+    };
+    client.getChainId.mockImplementation(() => provider.selectedChainId!);
+    client.getProvider.mockReturnValue(provider as never);
+    client.connect.mockImplementationOnce(async () => ({ accounts: [first], chainId: "0x1" }));
+    const config = createConfig({
+      chains: [polygon, mainnet],
+      connectors: [metaMaskConnect({ dapp: { name: "test", url: "https://example.test" } })],
+      transports: { [polygon.id]: http(), [mainnet.id]: http() },
+      multiInjectedProviderDiscovery: false,
+      storage: null,
+    });
+    await connect(config, { connector: config.connectors[0]! });
+    (await clientEvents()).chainChanged("0x2105");
+
+    const signature = await signMessage(config, { message: "prove it" });
+
+    expect(signature).toBe("0x5167");
+    expect(scopes).toEqual(["eip155:1"]);
+    expect(provider.selectedChainId).toBe("0x2105");
+    await expect(sendTransaction(config, { to: second, value: 1n, gas: 21000n })).rejects.toThrow();
+    expect(provider.request.mock.calls.map(([call]) => call.method)).not.toContain(
+      "eth_sendTransaction",
+    );
+  });
+
   it("sends no transaction or typed signature on mainnet for an app that does not list it", async () => {
     const request = vi.fn(async ({ method }: { method: string }) =>
       method === "eth_chainId" ? "0x1" : "0xabc",

package/src/connectkit/connectors/metaMaskConnectConnector.ts

@@ -115,20 +115,45 @@ const offListMethods = new Set([
   "wallet_registerOnboarding",
 ]);
 
+/**
+ * MetaMask Connect scopes a request to the provider's selected chain and refuses
+ * one outside supportedNetworks. The desktop extension moves that chain to
+ * wherever the user's MetaMask sits, Base say, so personal_sign there never
+ * reached the wallet (MPO-494). It goes under mainnet's scope instead, which
+ * MetaMask Connect adds to every session. The provider reads the scope before
+ * its first await, so the selected chain is put back before anything else runs.
+ */
+function signUnderMainnet(
+  provider: EIP1193Provider,
+  args: { method: string; params?: unknown },
+): Promise<unknown> {
+  const selected = provider.selectedChainId;
+  provider.selectedChainId = numberToHex(mainnet.id);
+  try {
+    return provider.request(args as never);
+  } finally {
+    provider.selectedChainId = selected;
+  }
+}
+
 function listedChainsOnly(
   provider: EIP1193Provider,
   mm: MetamaskConnectEVM,
   networks: Record<Hex, string>,
+  supportedNetworks: Record<Hex, string>,
 ): EIP1193Provider {
   const request = (async (args: { method: string; params?: unknown }) => {
     const chainId = mm.getChainId();
-    if (chainId && !networks[numberToHex(Number(chainId))] && !offListMethods.has(args.method))
+    const current = chainId ? numberToHex(Number(chainId)) : undefined;
+    if (current && !networks[current] && !offListMethods.has(args.method))
       throw Object.assign(
         new Error(
           `MetaMask is on chain ${Number(chainId)}, which this app does not list, so ${args.method} was not sent`,
         ),
         { code: 4901 },
       );
+    if (current && !supportedNetworks[current] && args.method === "personal_sign")
+      return signUnderMainnet(provider, args);
     return provider.request(args as never);
   }) as EIP1193Provider["request"];
   return new Proxy(provider, {
@@ -383,7 +408,10 @@ export function metaMaskConnect(parameters: MetaMaskConnectParameters) {
         const mm = await claim();
         const provider = mm.getProvider();
         if (guarded?.provider !== provider)
-          guarded = { provider, wrapped: listedChainsOnly(provider, mm, networks) };
+          guarded = {
+            provider,
+            wrapped: listedChainsOnly(provider, mm, networks, supportedNetworks),
+          };
         return guarded.wrapped;
       },
       async isAuthorized() {

package/types/connectkit/connectors/metaMaskConnectConnector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metaMaskConnectConnector.d.ts","sourceRoot":"","sources":["../../../src/connectkit/connectors/metaMaskConnectConnector.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,uBAAuB,CAAC;AAEjF,OAAO,EAA2B,KAAK,iBAAiB,EAAmB,MAAM,OAAO,CAAC;AACzF,OAAO,EAEL,KAAK,KAAK,EAEV,KAAK,GAAG,EAKT,MAAM,MAAM,CAAC;AAKd,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,6EAA6E;IAC7E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;CAC3C,CAAC;AAEF,KAAK,eAAe,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AAGxD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,SAAS,KAAK,EAAE,EACxB,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GACzC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAQrB;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,EAC7B,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GACzC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAOrB;AA6ED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE1D;AAOD,wGAAwG;AACxG,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE,CAK9F;AAqBD;;;;;;GAMG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAIxC;AAgFD,oFAAoF;AACpF,wBAAgB,0BAA0B,IAAI,IAAI,CAIjD;AAWD,wBAAgB,eAAe,CAAC,UAAU,EAAE,yBAAyB,wFAqJpE;yBArJe,eAAe"}
+{"version":3,"file":"metaMaskConnectConnector.d.ts","sourceRoot":"","sources":["../../../src/connectkit/connectors/metaMaskConnectConnector.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,uBAAuB,CAAC;AAEjF,OAAO,EAA2B,KAAK,iBAAiB,EAAmB,MAAM,OAAO,CAAC;AACzF,OAAO,EAEL,KAAK,KAAK,EAEV,KAAK,GAAG,EAKT,MAAM,MAAM,CAAC;AAKd,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,6EAA6E;IAC7E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;CAC3C,CAAC;AAEF,KAAK,eAAe,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AAGxD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,SAAS,KAAK,EAAE,EACxB,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GACzC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAQrB;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,EAC7B,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GACzC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAOrB;AAsGD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE1D;AAOD,wGAAwG;AACxG,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE,CAK9F;AAqBD;;;;;;GAMG;AACH,wBAAgB,cAAc,IAAI,OAAO,CAIxC;AAgFD,oFAAoF;AACpF,wBAAgB,0BAA0B,IAAI,IAAI,CAIjD;AAWD,wBAAgB,eAAe,CAAC,UAAU,EAAE,yBAAyB,wFAwJpE;yBAxJe,eAAe"}