@circle-fin/adapter-ethers-v6 1.7.0 → 1.8.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @circle-fin/adapter-ethers-v6
 
+## 1.8.0
+
+### Minor Changes
+
+- Improves the error you get when attempting a Gateway spend with a smart-contract account (SCA) as the signer. The failure previously surfaced as a confusing `invalid integer value <nil>/<nil> for type uint256` response from the Circle Wallets backend; you now get a clear `INPUT_UNSUPPORTED_ACTION` error up front that points at the delegate workflow (`kit.unifiedBalance.addDelegate` + `kit.unifiedBalance.spend` with the delegate EOA as `from.address` and the SCA as `from.sourceAccount`).
+
+### Patch Changes
+
+- Fix excessive MetaMask mobile app-switching prompts during bridge estimation and support chain switching for WalletConnect/Dynamic mobile wallet providers
+
 ## 1.7.0
 
 ### Minor Changes

package/index.cjs

@@ -17102,41 +17102,37 @@ function isBrowserWithEthereum() {
     return (typeof window !== 'undefined' && !!window.ethereum);
 }
 /**
- * Attempts to switch the connected chain in a browser wallet, or adds the chain if it is not recognized.
+ * Switch or add a chain via an EIP-1193 provider, then return a fresh signer.
  *
- * @param signer - The current Ethers.js Signer instance, expected to be connected to a browser provider.
- * @param chain - The EVM chain definition to switch to.
- * @returns A promise resolving to the new Signer instance connected to the target chain.
- *
- * @remarks
- * This function uses the EIP-3326 `wallet_switchEthereumChain` and EIP-3085 `wallet_addEthereumChain` methods
- * to prompt the user to switch or add the specified chain in their browser wallet.
- *
- * @throws {Error} If the provider does not support chain switching, or if the user rejects the request,
- * or if the operation fails for any other reason.
+ * @param provider - An EIP-1193 compatible provider with a `send` method.
+ * @param chain - The target EVM chain definition.
+ * @returns A promise resolving to a new Signer connected to the target chain.
+ * @throws When the user rejects the switch or the provider fails.
  */
-async function switchOrAddChainInBrowser(signer, chain) {
-    const win = window;
-    const signerWithProvider = signer;
-    if (!signerWithProvider?.provider?.send) {
-        throw new Error('Browser provider does not support chain switching');
-    }
+async function switchOrAddViaProvider(provider, chain) {
     try {
-        await signerWithProvider.provider.send('wallet_switchEthereumChain', [
+        await provider.send('wallet_switchEthereumChain', [
             { chainId: `0x${chain.chainId.toString(16)}` },
         ]);
-        return await getBrowserSigner(win);
     }
     catch (error) {
         if (typeof error === 'object' &&
             error !== null &&
             'code' in error &&
             error.code === UNRECOGNIZED_CHAIN_ID_ERROR_CODE) {
-            await addChainInBrowser(signerWithProvider, chain);
-            return await getBrowserSigner(win);
+            await addChainInBrowser({ provider }, chain);
+            await provider.send('wallet_switchEthereumChain', [
+                { chainId: `0x${chain.chainId.toString(16)}` },
+            ]);
+        }
+        else {
+            throw error;
         }
-        throw error;
     }
+    const browserProvider = provider instanceof ethers.BrowserProvider
+        ? provider
+        : new ethers.BrowserProvider(provider);
+    return await browserProvider.getSigner();
 }
 /**
  * Adds a new EVM chain to the user's browser wallet using the EIP-3085 `wallet_addEthereumChain` method.
@@ -17151,9 +17147,9 @@ async function switchOrAddChainInBrowser(signer, chain) {
  *
  * @throws {Error} If the provider does not support the `send` method or if the request fails.
  */
-async function addChainInBrowser(signerWithProvider, chain) {
+async function addChainInBrowser(providerLike, chain) {
     const rpcUrl = chain.rpcEndpoints[0];
-    await signerWithProvider.provider.send('wallet_addEthereumChain', [
+    await providerLike.provider.send('wallet_addEthereumChain', [
         {
             chainId: `0x${chain.chainId.toString(16)}`,
             chainName: chain.name,
@@ -17165,24 +17161,9 @@ async function addChainInBrowser(signerWithProvider, chain) {
         },
     ]);
 }
-/**
- * Returns a Signer instance from the browser's injected Ethereum provider.
- *
- * @param win - The browser window object with an injected `ethereum` provider.
- * @returns  A promise resolving Signer instance connected to the browser's provider.
- *
- * @remarks
- * This function wraps the Ethers.js `BrowserProvider` to obtain a Signer for user interaction.
- *
- * @throws {Error} If the `ethereum` provider is not available or if the signer cannot be retrieved.
- */
-async function getBrowserSigner(win) {
-    const browserProvider = new ethers.BrowserProvider(win.ethereum);
-    return await browserProvider.getSigner();
-}
 /**
  * Switches the chain for the given signer and returns a new signer for the target chain.
- * Handles both browser and server-side environments.
+ * Handles browser (injected + WalletConnect/Dynamic) and server-side environments.
  *
  * @param signer - The current signer instance
  * @param chain - The target chain definition
@@ -17190,8 +17171,21 @@ async function getBrowserSigner(win) {
  * @throws If switching fails or the environment is unsupported
  */
 async function switchChain(signer, chain) {
+    // Injected browser wallet (window.ethereum present)
     if (isBrowserWithEthereum()) {
-        return switchOrAddChainInBrowser(signer, chain);
+        const signerWithProvider = signer;
+        if (!signerWithProvider?.provider?.send) {
+            throw new Error('Browser provider does not support chain switching');
+        }
+        return switchOrAddViaProvider(signerWithProvider.provider, chain);
+    }
+    // Browser without window.ethereum (e.g., WalletConnect/Dynamic mobile wallets)
+    const signerWithProvider = signer;
+    const signerProvider = signerWithProvider.provider;
+    if (globalThis.window !== undefined &&
+        signerProvider &&
+        'send' in signerProvider) {
+        return switchOrAddViaProvider(signerProvider, chain);
     }
     // Server-side: recreate the provider and signer
     const rpcUrl = chain.rpcEndpoints[0];
@@ -18167,6 +18161,36 @@ class EthersAdapter extends EvmAdapter {
             });
         }
     }
+    /**
+     * Reads the on-chain bytecode for a given address via ethers' `getCode`.
+     *
+     * Returns the hex-encoded bytecode when the address is a contract, or
+     * `'0x'` when the address has no code (EOA). Used by Gateway burn-intent
+     * signing to detect smart-contract accounts, which are not supported by
+     * Gateway's ecrecover-based verification path.
+     */
+    async readBytecode(address, chain) {
+        const provider = await this.getProvider(chain);
+        try {
+            const code = await provider.getCode(address);
+            return code;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new KitError({
+                ...RpcError.ENDPOINT_ERROR,
+                recoverability: 'RETRYABLE',
+                message: `Failed to read bytecode for ${address}: ${errorMessage}`,
+                cause: {
+                    trace: {
+                        operation: 'readBytecode',
+                        address,
+                        chain: chain.name,
+                    },
+                },
+            });
+        }
+    }
     /**
      * Signs EIP-712 typed data using the configured signer with OperationContext.
      *

package/index.d.ts

@@ -3974,6 +3974,37 @@ declare abstract class EvmAdapter<TAdapterCapabilities extends AdapterCapabiliti
      * @throws Error when balance retrieval fails.
      */
     abstract readNativeBalance(address: string, chain: EVMChainDefinition): Promise<bigint>;
+    /**
+     * Reads the on-chain bytecode for a given address.
+     *
+     * Returns the deployed contract bytecode as a hex string (`0x`-prefixed),
+     * or `'0x'` when the address has no code (i.e. is a plain EOA).
+     * Implementations MUST normalize a "no code" RPC response to `'0x'` so
+     * callers can compare against a single sentinel.
+     *
+     * Useful for detecting smart-contract accounts before attempting an
+     * operation that only supports EOA signing (e.g. Gateway burn intents).
+     *
+     * @param address - The address to read bytecode for.
+     * @param chain - The chain definition to read from.
+     * @returns Promise resolving to `'0x'` for an EOA, or the hex-encoded
+     *   deployed bytecode otherwise.
+     * @throws Error when the underlying RPC call fails.
+     *
+     * @example
+     * ```typescript
+     * import { ViemAdapter } from '@circle-fin/adapter-viem-v2'
+     * import { Ethereum } from '@core/chains'
+     *
+     * const adapter = new ViemAdapter({ publicClient, walletClient })
+     * const code = await adapter.readBytecode('0xabc...', Ethereum)
+     *
+     * if (code !== '0x') {
+     *   throw new Error('signer has on-chain bytecode')
+     * }
+     * ```
+     */
+    abstract readBytecode(address: string, chain: EVMChainDefinition): Promise<`0x${string}`>;
     /**
      * Calculate the total transaction fee including compute cost and buffer for the configured chain.
      *
@@ -4573,6 +4604,15 @@ declare class EthersAdapter<TAdapterCapabilities extends AdapterCapabilities = A
      * ```
      */
     readNativeBalance(address: string, chain: EVMChainDefinition): Promise<bigint>;
+    /**
+     * Reads the on-chain bytecode for a given address via ethers' `getCode`.
+     *
+     * Returns the hex-encoded bytecode when the address is a contract, or
+     * `'0x'` when the address has no code (EOA). Used by Gateway burn-intent
+     * signing to detect smart-contract accounts, which are not supported by
+     * Gateway's ecrecover-based verification path.
+     */
+    readBytecode(address: string, chain: EVMChainDefinition): Promise<`0x${string}`>;
     /**
      * Signs EIP-712 typed data using the configured signer with OperationContext.
      *

package/index.mjs

@@ -17097,41 +17097,37 @@ function isBrowserWithEthereum() {
     return (typeof window !== 'undefined' && !!window.ethereum);
 }
 /**
- * Attempts to switch the connected chain in a browser wallet, or adds the chain if it is not recognized.
+ * Switch or add a chain via an EIP-1193 provider, then return a fresh signer.
  *
- * @param signer - The current Ethers.js Signer instance, expected to be connected to a browser provider.
- * @param chain - The EVM chain definition to switch to.
- * @returns A promise resolving to the new Signer instance connected to the target chain.
- *
- * @remarks
- * This function uses the EIP-3326 `wallet_switchEthereumChain` and EIP-3085 `wallet_addEthereumChain` methods
- * to prompt the user to switch or add the specified chain in their browser wallet.
- *
- * @throws {Error} If the provider does not support chain switching, or if the user rejects the request,
- * or if the operation fails for any other reason.
+ * @param provider - An EIP-1193 compatible provider with a `send` method.
+ * @param chain - The target EVM chain definition.
+ * @returns A promise resolving to a new Signer connected to the target chain.
+ * @throws When the user rejects the switch or the provider fails.
  */
-async function switchOrAddChainInBrowser(signer, chain) {
-    const win = window;
-    const signerWithProvider = signer;
-    if (!signerWithProvider?.provider?.send) {
-        throw new Error('Browser provider does not support chain switching');
-    }
+async function switchOrAddViaProvider(provider, chain) {
     try {
-        await signerWithProvider.provider.send('wallet_switchEthereumChain', [
+        await provider.send('wallet_switchEthereumChain', [
             { chainId: `0x${chain.chainId.toString(16)}` },
         ]);
-        return await getBrowserSigner(win);
     }
     catch (error) {
         if (typeof error === 'object' &&
             error !== null &&
             'code' in error &&
             error.code === UNRECOGNIZED_CHAIN_ID_ERROR_CODE) {
-            await addChainInBrowser(signerWithProvider, chain);
-            return await getBrowserSigner(win);
+            await addChainInBrowser({ provider }, chain);
+            await provider.send('wallet_switchEthereumChain', [
+                { chainId: `0x${chain.chainId.toString(16)}` },
+            ]);
+        }
+        else {
+            throw error;
         }
-        throw error;
     }
+    const browserProvider = provider instanceof BrowserProvider
+        ? provider
+        : new BrowserProvider(provider);
+    return await browserProvider.getSigner();
 }
 /**
  * Adds a new EVM chain to the user's browser wallet using the EIP-3085 `wallet_addEthereumChain` method.
@@ -17146,9 +17142,9 @@ async function switchOrAddChainInBrowser(signer, chain) {
  *
  * @throws {Error} If the provider does not support the `send` method or if the request fails.
  */
-async function addChainInBrowser(signerWithProvider, chain) {
+async function addChainInBrowser(providerLike, chain) {
     const rpcUrl = chain.rpcEndpoints[0];
-    await signerWithProvider.provider.send('wallet_addEthereumChain', [
+    await providerLike.provider.send('wallet_addEthereumChain', [
         {
             chainId: `0x${chain.chainId.toString(16)}`,
             chainName: chain.name,
@@ -17160,24 +17156,9 @@ async function addChainInBrowser(signerWithProvider, chain) {
         },
     ]);
 }
-/**
- * Returns a Signer instance from the browser's injected Ethereum provider.
- *
- * @param win - The browser window object with an injected `ethereum` provider.
- * @returns  A promise resolving Signer instance connected to the browser's provider.
- *
- * @remarks
- * This function wraps the Ethers.js `BrowserProvider` to obtain a Signer for user interaction.
- *
- * @throws {Error} If the `ethereum` provider is not available or if the signer cannot be retrieved.
- */
-async function getBrowserSigner(win) {
-    const browserProvider = new BrowserProvider(win.ethereum);
-    return await browserProvider.getSigner();
-}
 /**
  * Switches the chain for the given signer and returns a new signer for the target chain.
- * Handles both browser and server-side environments.
+ * Handles browser (injected + WalletConnect/Dynamic) and server-side environments.
  *
  * @param signer - The current signer instance
  * @param chain - The target chain definition
@@ -17185,8 +17166,21 @@ async function getBrowserSigner(win) {
  * @throws If switching fails or the environment is unsupported
  */
 async function switchChain(signer, chain) {
+    // Injected browser wallet (window.ethereum present)
     if (isBrowserWithEthereum()) {
-        return switchOrAddChainInBrowser(signer, chain);
+        const signerWithProvider = signer;
+        if (!signerWithProvider?.provider?.send) {
+            throw new Error('Browser provider does not support chain switching');
+        }
+        return switchOrAddViaProvider(signerWithProvider.provider, chain);
+    }
+    // Browser without window.ethereum (e.g., WalletConnect/Dynamic mobile wallets)
+    const signerWithProvider = signer;
+    const signerProvider = signerWithProvider.provider;
+    if (globalThis.window !== undefined &&
+        signerProvider &&
+        'send' in signerProvider) {
+        return switchOrAddViaProvider(signerProvider, chain);
     }
     // Server-side: recreate the provider and signer
     const rpcUrl = chain.rpcEndpoints[0];
@@ -18162,6 +18156,36 @@ class EthersAdapter extends EvmAdapter {
             });
         }
     }
+    /**
+     * Reads the on-chain bytecode for a given address via ethers' `getCode`.
+     *
+     * Returns the hex-encoded bytecode when the address is a contract, or
+     * `'0x'` when the address has no code (EOA). Used by Gateway burn-intent
+     * signing to detect smart-contract accounts, which are not supported by
+     * Gateway's ecrecover-based verification path.
+     */
+    async readBytecode(address, chain) {
+        const provider = await this.getProvider(chain);
+        try {
+            const code = await provider.getCode(address);
+            return code;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new KitError({
+                ...RpcError.ENDPOINT_ERROR,
+                recoverability: 'RETRYABLE',
+                message: `Failed to read bytecode for ${address}: ${errorMessage}`,
+                cause: {
+                    trace: {
+                        operation: 'readBytecode',
+                        address,
+                        chain: chain.name,
+                    },
+                },
+            });
+        }
+    }
     /**
      * Signs EIP-712 typed data using the configured signer with OperationContext.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@circle-fin/adapter-ethers-v6",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "EVM blockchain adapter powered by Ethers v6",
   "keywords": [
     "circle",