@circle-fin/app-kit 1.11.0 → 1.12.1

package/unifiedBalance.cjs

@@ -2325,6 +2325,8 @@ class KitError extends Error {
     Blockchain["World_Chain_Sepolia"] = "World_Chain_Sepolia";
     Blockchain["XDC"] = "XDC";
     Blockchain["XDC_Apothem"] = "XDC_Apothem";
+    Blockchain["X_Layer"] = "X_Layer";
+    Blockchain["X_Layer_Testnet"] = "X_Layer_Testnet";
     Blockchain["ZKSync_Era"] = "ZKSync_Era";
     Blockchain["ZKSync_Sepolia"] = "ZKSync_Sepolia";
 })(Blockchain || (Blockchain = {}));
@@ -2378,6 +2380,7 @@ var BridgeChain;
     BridgeChain["Unichain"] = "Unichain";
     BridgeChain["World_Chain"] = "World_Chain";
     BridgeChain["XDC"] = "XDC";
+    BridgeChain["X_Layer"] = "X_Layer";
     // Testnet chains with CCTPv2 support
     BridgeChain["Arc_Testnet"] = "Arc_Testnet";
     BridgeChain["Arbitrum_Sepolia"] = "Arbitrum_Sepolia";
@@ -2403,6 +2406,7 @@ var BridgeChain;
     BridgeChain["Unichain_Sepolia"] = "Unichain_Sepolia";
     BridgeChain["World_Chain_Sepolia"] = "World_Chain_Sepolia";
     BridgeChain["XDC_Apothem"] = "XDC_Apothem";
+    BridgeChain["X_Layer_Testnet"] = "X_Layer_Testnet";
 })(BridgeChain || (BridgeChain = {}));
 var UnifiedBalanceChain;
 (function(UnifiedBalanceChain) {
@@ -4950,7 +4954,8 @@ var EarnChain;
     isTestnet: true,
     explorerUrl: 'https://amoy.polygonscan.com/tx/{hash}',
     rpcEndpoints: [
-        'https://rpc-amoy.polygon.technology'
+        'https://polygon-amoy-bor-rpc.publicnode.com',
+        'https://polygon-amoy.drpc.org'
     ],
     eurcAddress: null,
     usdcAddress: '0x41e94eb019c0762f9bfcf9fb1e58725bfb0e7582',
@@ -5815,6 +5820,104 @@ var EarnChain;
     }
 });
 
+/**
+ * X Layer Mainnet chain definition
+ * @remarks
+ * This represents the official production network for the X Layer blockchain.
+ * X Layer is an EVM-compatible OP Stack Layer-2 blockchain built by OKX,
+ * using OKB as its native gas token. (Migrated from Polygon zkEVM/CDK to the
+ * OP Stack on 2025-10-27; older docs describing it as zkEVM are obsolete.)
+ */ const XLayer = defineChain({
+    type: 'evm',
+    chain: Blockchain.X_Layer,
+    name: 'X Layer',
+    title: 'X Layer Mainnet',
+    nativeCurrency: {
+        name: 'OKB',
+        symbol: 'OKB',
+        decimals: 18
+    },
+    chainId: 196,
+    isTestnet: false,
+    explorerUrl: 'https://www.oklink.com/xlayer/tx/{hash}',
+    rpcEndpoints: [
+        'https://xlayerrpc.okx.com'
+    ],
+    eurcAddress: null,
+    usdcAddress: '0xB6CEceAB302E2E4948951eE7843FC24E92933061',
+    usdtAddress: null,
+    cctp: {
+        domain: 37,
+        contracts: {
+            v2: {
+                type: 'split',
+                tokenMessenger: '0x28b5a0e9C621a5BadaA536219b3a228C8168cf5d',
+                messageTransmitter: '0x81D40F21F12A8F0E3252Bccb954D722d4c464B64',
+                confirmations: 65,
+                fastConfirmations: 1
+            }
+        },
+        forwarderSupported: {
+            source: false,
+            destination: false
+        }
+    },
+    kitContracts: {
+        bridge: BRIDGE_CONTRACT_EVM_MAINNET
+    }
+});
+
+/**
+ * X Layer Testnet chain definition
+ * @remarks
+ * This represents the official test network for the X Layer blockchain.
+ * X Layer is an EVM-compatible OP Stack Layer-2 blockchain built by OKX,
+ * using OKB as its native gas token. (Migrated from Polygon zkEVM/CDK to the
+ * OP Stack on 2025-10-27; older docs describing it as zkEVM are obsolete.)
+ */ const XLayerTestnet = defineChain({
+    type: 'evm',
+    chain: Blockchain.X_Layer_Testnet,
+    name: 'X Layer Testnet',
+    title: 'X Layer Testnet',
+    nativeCurrency: {
+        name: 'OKB',
+        symbol: 'OKB',
+        decimals: 18
+    },
+    chainId: 1952,
+    isTestnet: true,
+    // Deliberately not oklink.com (used for mainnet): viem's bundled OKLink
+    // testnet URL targets the deprecated pre-rebrand chain ID 195, not this
+    // chain's ID (1952). Verified against the internal chain-expansion-scripts
+    // config (`v2config.sandbox.yml`) — do not "normalize" this to match mainnet.
+    explorerUrl: 'https://web3.okx.com/explorer/x-layer-testnet/tx/{hash}',
+    rpcEndpoints: [
+        'https://testrpc.xlayer.tech'
+    ],
+    eurcAddress: null,
+    usdcAddress: '0xDec90b78111Ba2fc6FC6d84d8B9ec159A2d4b9B3',
+    usdtAddress: null,
+    cctp: {
+        domain: 37,
+        contracts: {
+            v2: {
+                type: 'split',
+                tokenMessenger: '0x8FE6B999Dc680CcFDD5Bf7EB0974218be2542DAA',
+                messageTransmitter: '0xE737e5cEBEEBa77EFE34D4aa090756590b1CE275',
+                confirmations: 65,
+                fastConfirmations: 1
+            }
+        },
+        forwarderSupported: {
+            source: false,
+            destination: false
+        }
+    },
+    kitContracts: {
+        bridge: BRIDGE_CONTRACT_EVM_TESTNET
+    }
+});
+
 /**
  * ZKSync Era Mainnet chain definition
  * @remarks
@@ -5934,6 +6037,8 @@ var Chains = {
   WorldChainSepolia: WorldChainSepolia,
   XDC: XDC,
   XDCApothem: XDCApothem,
+  XLayer: XLayer,
+  XLayerTestnet: XLayerTestnet,
   ZKSyncEra: ZKSyncEra,
   ZKSyncEraSepolia: ZKSyncEraSepolia
 };
@@ -7886,6 +7991,7 @@ function parseOrThrow(value, schema, context) {
         [Blockchain.Unichain]: '0x078D782b760474a361dDA0AF3839290b0EF57AD6',
         [Blockchain.World_Chain]: '0x79A02482A880bCE3F13e09Da970dC34db4CD24d1',
         [Blockchain.XDC]: '0xfA2958CB79b0491CC627c1557F441eF849Ca8eb1',
+        [Blockchain.X_Layer]: '0xB6CEceAB302E2E4948951eE7843FC24E92933061',
         [Blockchain.ZKSync_Era]: '0x1d17CBcF0D6D143135aE902365D2E5e2A16538D4',
         // =========================================================================
         // Testnets (alphabetically sorted)
@@ -7894,6 +8000,7 @@ function parseOrThrow(value, schema, context) {
         [Blockchain.Arbitrum_Sepolia]: '0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d',
         [Blockchain.Avalanche_Fuji]: '0x5425890298aed601595a70AB815c96711a31Bc65',
         [Blockchain.Base_Sepolia]: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
+        [Blockchain.Celo_Alfajores_Testnet]: '0x2F25deB3848C207fc8E0c34035B3Ba7fC157602B',
         [Blockchain.Codex_Testnet]: '0x6d7f141b6819C2c9CC2f818e6ad549E7Ca090F8f',
         [Blockchain.Cronos_Testnet]: '0xEb33dc5fac03833e132593659e1dE7256aB59794',
         [Blockchain.Edge_Testnet]: '0x2d9F7CAD728051AA35Ecdc472a14cf8cDF5CFD6B',
@@ -7920,6 +8027,7 @@ function parseOrThrow(value, schema, context) {
         [Blockchain.Unichain_Sepolia]: '0x31d0220469e10c4E71834a79b1f276d740d3768F',
         [Blockchain.World_Chain_Sepolia]: '0x66145f38cBAC35Ca6F1Dfb4914dF98F1614aeA88',
         [Blockchain.XDC_Apothem]: '0xb5AB69F7bBada22B28e79C8FFAECe55eF1c771D4',
+        [Blockchain.X_Layer_Testnet]: '0xDec90b78111Ba2fc6FC6d84d8B9ec159A2d4b9B3',
         [Blockchain.ZKSync_Sepolia]: '0xAe045DE5638162fa134807Cb558E15A3F5A7F853'
     }
 };
@@ -8785,7 +8893,7 @@ function parseOrThrow(value, schema, context) {
 }
 
 var name = "@circle-fin/unified-balance-kit";
-var version = "1.3.1";
+var version = "1.4.1";
 var pkg = {
 	name: name,
 	version: version};
@@ -9068,6 +9176,110 @@ var pkg = {
  * ```
  */ const USDC_DECIMALS$1 = 6;
 
+/**
+ * Canonical list of actions that do not prepare or submit transactions.
+ *
+ * @internal
+ */ const READ_ACTION_KEYS = [
+    'token.allowance',
+    'token.balanceOf',
+    'token.name',
+    'native.balanceOf',
+    'usdc.allowance',
+    'usdc.balanceOf',
+    'usdc.name',
+    'gateway.v1.isDelegate',
+    'gateway.v1.withdrawingBalance',
+    'gateway.v1.withdrawalBlock',
+    'gateway.v1.signBurnIntents'
+];
+const READ_ACTION_KEY_SET = new Set(READ_ACTION_KEYS);
+/**
+ * Check whether a runtime value identifies a read action.
+ *
+ * @param action - The value to classify.
+ * @returns Whether the value is a registered read-action key.
+ *
+ * @example
+ * ```typescript
+ * import { isReadActionKey } from '@core/adapter'
+ *
+ * if (isReadActionKey(value)) {
+ *   await adapter.readAction(value, params, context)
+ * }
+ * ```
+ *
+ * @internal
+ */ function isReadActionKey(action) {
+    return typeof action === 'string' && READ_ACTION_KEY_SET.has(action);
+}
+
+/**
+ * Create the standard error for a missing or non-read action.
+ *
+ * @param action - The unsupported action value.
+ * @returns A fatal unsupported-action error.
+ *
+ * @internal
+ */ function createUnsupportedReadActionError(action) {
+    return new KitError({
+        ...InputError.UNSUPPORTED_ACTION,
+        recoverability: 'FATAL',
+        message: `Read action "${String(action)}" is not registered in this adapter.`
+    });
+}
+/**
+ * Execute a read through the adapter's dedicated read seam when available.
+ *
+ * @remarks
+ * Fall back to the legacy `prepareAction().execute()` contract so providers
+ * remain runtime-compatible with adapter versions released before `readAction`.
+ * Consumers must upgrade their adapter package for reads to bypass custom
+ * `prepareAction` wrappers.
+ *
+ * @typeParam TAdapterCapabilities - The adapter capabilities type.
+ * @typeParam TActionKey - The read action key.
+ * @param adapter - The adapter that owns the read action.
+ * @param action - The read action to execute.
+ * @param params - The parameters for the read action.
+ * @param ctx - The operation context.
+ * @returns The raw read-action result.
+ * @throws {KitError} When `action` is not a supported read-action key.
+ *
+ * @example
+ * ```typescript
+ * import { executeAdapterReadAction } from '@core/adapter'
+ * import { Ethereum } from '@core/chains'
+ *
+ * const allowance = await executeAdapterReadAction(
+ *   adapter,
+ *   'token.allowance',
+ *   { tokenAddress, delegate },
+ *   { chain: Ethereum },
+ * )
+ * ```
+ *
+ * @internal
+ */ async function executeAdapterReadAction(adapter, action, params, ctx) {
+    if (!isReadActionKey(action)) {
+        throw createUnsupportedReadActionError(action);
+    }
+    const runtimeAdapter = adapter;
+    if (typeof runtimeAdapter.readAction === 'function') {
+        return runtimeAdapter.readAction(action, params, ctx);
+    }
+    let request;
+    try {
+        request = await adapter.prepareAction(action, params, ctx);
+    } catch (error) {
+        if (error instanceof Error && error.message === `Action ${action} is not supported`) {
+            throw createUnsupportedReadActionError(action);
+        }
+        throw error;
+    }
+    return request.execute();
+}
+
 /**
  * Schema for validating hexadecimal strings with '0x' prefix.
  *
@@ -9277,16 +9489,15 @@ var pkg = {
  * ```
  */ const validateBalanceForTransaction = async (params)=>{
     const { amount, adapter, token, tokenAddress, operationContext } = params;
-    const balancePrepared = await adapter.prepareAction('usdc.balanceOf', {
+    const balance = await executeAdapterReadAction(adapter, 'usdc.balanceOf', {
         walletAddress: operationContext.address
     }, operationContext);
-    const balance = await balancePrepared.execute();
-    if (BigInt(balance) < BigInt(amount)) {
+    if (BigInt(String(balance)) < BigInt(amount)) {
         // Extract chain name from operationContext
         const chainName = extractChainInfo(operationContext.chain).name;
         // Create KitError with rich context in trace
         throw createInsufficientTokenBalanceError(chainName, token, {
-            balance: balance.toString(),
+            balance: String(balance),
             amount,
             tokenAddress,
             walletAddress: operationContext.address
@@ -12066,72 +12277,55 @@ function evmSigningData(burnIntent) {
  * `0xef0100` followed by the 20-byte delegate address (23 bytes total).
  * The underlying secp256k1 key still produces `ecrecover`-verifiable
  * signatures, so for Gateway's purposes a 7702-delegated address is
- * an EOA, not an SCA.
+ * an EOA, not a contract signer.
  *
  * Spec: https://eips.ethereum.org/EIPS/eip-7702
  */ const EIP_7702_DELEGATION_PREFIX = '0xef0100';
 /**
- * Assert that `address` on `chain` can sign Gateway burn intents.
- *
- * Gateway verifies burn-intent signatures with plain `ecrecover` (see
- * `evm-gateway-contracts/src/lib/EIP712Domain.sol`). Smart-contract
- * accounts (SCAs) produce signatures over wrapped hashes (ERC-1271 /
- * ERC-6492 / ERC-6900 replay-safe hashes) that Gateway cannot verify.
- * Additionally, the Circle Wallets backend rejects SCA typed-data signing
- * against Gateway's chainId-less domain with an opaque
- * `invalid integer value <nil>/<nil> for type uint256` error.
+ * Determine whether `address` on `chain` signs as a contract (ERC-1271)
+ * rather than as an EOA.
  *
- * EIP-7702-delegated EOAs are exempt: they expose non-empty bytecode
- * (`0xef0100<delegate>`) but the underlying secp256k1 key still produces
- * `ecrecover`-verifiable signatures, so Gateway accepts them.
+ * Gateway validates burn-intent signatures two ways: a static `ecrecover`
+ * check for EOAs, and — for requests that carry `contractSigner: true` —
+ * an offchain `isValidSignature` simulation against the signing contract
+ * (ERC-1271). Gateway does not infer which one to use, so the caller must
+ * declare it. This detects the contract case from on-chain bytecode.
  *
- * When the signer is a true SCA, raises an `INPUT_UNSUPPORTED_ACTION`
- * error directing the caller to register an EOA delegate against the
- * SCA and then submit the spend with the delegate EOA as the signer
- * and the SCA as the source account. See the unified-balance / Gateway
- * docs for the exact API.
+ * EIP-7702-delegated EOAs are treated as EOAs: they expose non-empty
+ * bytecode (`0xef0100<delegate>`) but the underlying secp256k1 key still
+ * produces `ecrecover`-verifiable signatures, so the cheaper EOA path
+ * stays correct for them.
  *
- * If bytecode cannot be read (RPC failure, etc.) the pre-check is
- * skipped and downstream signing surfaces its own error — a warning is
- * logged so the skip is diagnosable.
+ * If bytecode cannot be read (RPC failure, etc.) the address is reported
+ * as an EOA and a warning is logged so the fallback is diagnosable. A
+ * genuine contract signer misreported this way is rejected by Gateway with
+ * an invalid-signature error rather than silently mis-attested.
  *
  * @param adapter - Anything exposing {@link EvmAdapterLike.readBytecode}.
- * @param address - Signer address to validate.
+ * @param address - Signer address to classify.
  * @param chain - EVM chain where the signer lives.
- * @throws {KitError} INPUT_UNSUPPORTED_ACTION when `address` is an SCA.
+ * @returns `true` when the signer is a contract account and the transfer
+ *   request must set `contractSigner: true`; `false` otherwise.
  *
  * @example
  * ```typescript
- * import { assertSignerIsEoa } from '@core/adapter-evm'
+ * import { isContractSigner } from '@core/adapter-evm'
  * import { Ethereum } from '@core/chains'
  *
- * await assertSignerIsEoa(adapter, '0xabc...', Ethereum)
+ * const useErc1271 = await isContractSigner(adapter, '0xabc...', Ethereum)
  * ```
- */ async function assertSignerIsEoa(adapter, address, chain) {
+ */ async function isContractSigner(adapter, address, chain) {
     let code;
     try {
         code = await adapter.readBytecode(address, chain);
     } catch (err) {
-        console.warn(`[gateway] assertSignerIsEoa skipped (readBytecode failed for ` + `${address} on ${chain.name}): ` + (err instanceof Error ? err.message : String(err)));
-        return;
+        console.warn(`[gateway] isContractSigner defaulting to EOA (readBytecode failed ` + `for ${address} on ${chain.name}): ` + (err instanceof Error ? err.message : String(err)));
+        return false;
     }
     if (code === undefined || code === '0x' || code.toLowerCase().startsWith(EIP_7702_DELEGATION_PREFIX)) {
-        return;
+        return false;
     }
-    throw new KitError({
-        ...InputError.UNSUPPORTED_ACTION,
-        recoverability: 'FATAL',
-        message: `Gateway burn-intent signing requires an EOA signer (Gateway ` + `verifies signatures with ecrecover and does not support ERC-1271). ` + `The signer ${address} on ${chain.name} has on-chain bytecode, ` + `indicating it is a smart-contract account (SCA). Register an EOA ` + `delegate against the SCA, then submit the spend with the delegate ` + `EOA as the signer and the SCA as the source account. See DEVX-2774.`,
-        cause: {
-            trace: {
-                operation: 'signEvmIntentGroup.assertSignerIsEoa',
-                address,
-                chain: chain.name,
-                bytecodeBytes: (code.length - 2) / 2,
-                bytecodePrefix: code.slice(0, 12)
-            }
-        }
-    });
+    return true;
 }
 
 /**
@@ -12158,78 +12352,177 @@ function evmSigningData(burnIntent) {
     return typeof value === 'object' && value !== null && 'readBytecode' in value && typeof value.readBytecode === 'function';
 }
 
+function resolveIntentChain(group, intent) {
+    const sourceDomain = intent.spec.sourceDomain;
+    const chain = group.chainsByDomain.get(sourceDomain);
+    if (chain !== undefined) return chain;
+    throw createValidationFailedError$1('intent.spec.sourceDomain', sourceDomain, `No source chain found for Gateway domain ${String(sourceDomain)}`);
+}
+function normalizeSignatureResult(result) {
+    if (typeof result === 'string') {
+        return {
+            signature: result,
+            contractSigner: false
+        };
+    }
+    if (typeof result === 'object' && result !== null && 'signature' in result && typeof result.signature === 'string') {
+        return {
+            signature: result.signature,
+            contractSigner: 'contractSigner' in result && result.contractSigner === true
+        };
+    }
+    throw createValidationFailedError$1('signature', result, 'must be a signature string or an object containing a signature string');
+}
+function validateGroupIntents(intents) {
+    evmSigningData(intents);
+}
+function collectChainsByDomain(group) {
+    const chainsByDomain = new Map();
+    for (const intent of group.intents){
+        chainsByDomain.set(intent.spec.sourceDomain, resolveIntentChain(group, intent));
+    }
+    return chainsByDomain;
+}
+async function classifySignerTypes(group, chainsByDomain) {
+    const { adapter, address } = group;
+    // Duck-typed on readBytecode rather than `instanceof EvmAdapter` because
+    // each consumer package bundles its own copy of the base class and the
+    // `instanceof` identity check fails across package boundaries.
+    // Empty strings are rejected to avoid calling eth_getCode('') on the RPC.
+    const hasResolvedSigner = typeof address === 'string' && address.length > 0;
+    const signerTypes = await Promise.all([
+        ...chainsByDomain
+    ].map(async ([sourceDomain, sourceChain])=>{
+        const contractSigner = hasResolvedSigner && sourceChain.type === 'evm' && isEvmAdapterLike(adapter) ? await isContractSigner(adapter, address, sourceChain) : false;
+        return [
+            sourceDomain,
+            contractSigner
+        ];
+    }));
+    return new Map(signerTypes);
+}
+function createSigningUnits(group, signerTypeByDomain) {
+    const contractUnitsByDomain = new Map();
+    let eoaUnit;
+    for (const [index, intent] of group.intents.entries()){
+        const sourceDomain = intent.spec.sourceDomain;
+        const contractSigner = signerTypeByDomain.get(sourceDomain) ?? false;
+        if (contractSigner) {
+            const existingUnit = contractUnitsByDomain.get(sourceDomain);
+            if (existingUnit === undefined) {
+                contractUnitsByDomain.set(sourceDomain, {
+                    intents: [
+                        intent
+                    ],
+                    chain: resolveIntentChain(group, intent),
+                    contractSigner: true,
+                    firstIntentIndex: index
+                });
+            } else {
+                existingUnit.intents.push(intent);
+            }
+        } else {
+            eoaUnit ??= {
+                intents: [],
+                chain: resolveIntentChain(group, intent),
+                contractSigner: false,
+                firstIntentIndex: index
+            };
+            eoaUnit.intents.push(intent);
+        }
+    }
+    const signingUnits = [
+        ...contractUnitsByDomain.values()
+    ];
+    if (eoaUnit !== undefined) signingUnits.push(eoaUnit);
+    signingUnits.sort((a, b)=>a.firstIntentIndex - b.firstIntentIndex);
+    return signingUnits;
+}
+async function signUnit(group, unit) {
+    const { adapter, address } = group;
+    const firstIntent = unit.intents[0];
+    const typedData = unit.intents.length === 1 && firstIntent !== undefined ? evmSigningData(firstIntent) : evmSigningData(unit.intents);
+    const operationContext = address === undefined ? {
+        chain: unit.chain
+    } : {
+        chain: unit.chain,
+        address
+    };
+    const signRequest = await adapter.prepareAction('gateway.v1.signBurnIntents', {
+        typedData,
+        chain: unit.chain
+    }, operationContext);
+    const result = normalizeSignatureResult(await signRequest.execute());
+    return {
+        intents: unit.intents,
+        signature: result.signature,
+        contractSigner: result.contractSigner || unit.contractSigner
+    };
+}
+async function signUnits(group, signingUnits) {
+    const signedSets = [];
+    // Keep wallet prompts deterministic. Multiple adapter groups can still sign
+    // in parallel, but one signer is asked for its chain-bound signatures in
+    // source-intent order.
+    for (const unit of signingUnits){
+        signedSets.push(await signUnit(group, unit));
+    }
+    return signedSets;
+}
 /**
- * Sign an EVM adapter group: batches all intents and produces a single
- * EIP-712 ECDSA signature.
+ * Sign an EVM adapter group.
  *
- * For a single-intent group, `primaryType` is `'BurnIntent'`.
- * For multi-intent groups, `primaryType` is `'BurnIntentSet'`.
+ * EOA intents remain batched into one EIP-712 `BurnIntentSet`. ERC-1271
+ * intents are grouped and signed per source chain because smart accounts
+ * commonly include `chainId` in their replay-safe signature hash.
+ * All returned entries can still be submitted together in one atomic Gateway
+ * transfer request.
  *
- * Before signing, asserts that the signer address is an EOA. Gateway
- * verifies burn-intent signatures with plain `ecrecover` (no ERC-1271
- * fallback), so signatures produced by smart-contract accounts (SCAs)
- * cannot be verified. When an SCA is detected, a clear error is raised
- * directing the caller to the delegate workflow (DEVX-2774).
+ * Before signing, classifies the signer as an EOA or a contract account.
+ * Gateway validates EOA signatures with `ecrecover` and contract-account
+ * signatures with ERC-1271, but it does not infer which one applies — the
+ * transfer request has to declare it. The returned `contractSigner` flag
+ * carries that decision through to `buildTransferRequestBody`.
  *
  * @param group - The adapter group containing the adapter, chain, and
  *   burn intents to sign.
- * @returns A signed set with the intents and the ECDSA signature.
+ * @returns Signed entries with their intents, signatures, and Gateway signer
+ *   validation mode.
+ * @throws KitError when an intent has no source-chain mapping or a signing
+ *   action returns an invalid signature shape.
  *
  * @example
  * ```typescript
  * import { signEvmIntentGroup } from '@core/adapter-evm'
  *
- * const signedSet = await signEvmIntentGroup({
+ * const signedSets = await signEvmIntentGroup({
  *   adapter: evmAdapter,
  *   chain: ethereumChain,
  *   intents: [burnIntent1, burnIntent2],
+ *   chainsByDomain: new Map([
+ *     [0, ethereumChain],
+ *     [6, baseChain],
+ *   ]),
  *   address: '0x...',
  * })
- * console.log(signedSet.signature)
+ * console.log(signedSets)
  * ```
  */ async function signEvmIntentGroup(group) {
-    const { adapter, intents: groupIntents, chain, address } = group;
-    const operationContext = address === undefined ? {
-        chain
-    } : {
-        chain,
-        address
-    };
-    // Gateway verifies burn-intent signatures with plain ecrecover. An SCA
-    // signer silently produces a signature over a wrapped hash that Gateway
-    // cannot verify, and Circle Wallets' KMS rejects the typed data up front
-    // with an opaque `<nil>/<nil>` error. Short-circuit with a clear message
-    // when we can detect bytecode at the signer address. See DEVX-2774.
-    //
-    // Duck-typed on readBytecode rather than `instanceof EvmAdapter` because
-    // each consumer package bundles its own copy of the base class and the
-    // `instanceof` identity check fails across package boundaries.
-    //
-    // Empty string is defended against because assertSignerIsEoa would
-    // otherwise call eth_getCode('') on the RPC.
-    const hasResolvedSigner = typeof address === 'string' && address.length > 0;
-    if (hasResolvedSigner && chain.type === 'evm' && isEvmAdapterLike(adapter)) {
-        await assertSignerIsEoa(adapter, address, chain);
-    }
-    const firstIntent = groupIntents[0];
-    const typedData = groupIntents.length === 1 && firstIntent ? evmSigningData(firstIntent) : evmSigningData(groupIntents);
-    const signRequest = await adapter.prepareAction('gateway.v1.signBurnIntents', {
-        typedData,
-        chain
-    }, operationContext);
-    const sig = await signRequest.execute();
-    return {
-        intents: groupIntents,
-        signature: sig
-    };
+    // Validate the collection before doing bytecode reads or asking a wallet
+    // to sign. evmSigningData owns the canonical BurnIntent validation.
+    validateGroupIntents(group.intents);
+    const chainsByDomain = collectChainsByDomain(group);
+    const signerTypeByDomain = await classifySignerTypes(group, chainsByDomain);
+    const signingUnits = createSigningUnits(group, signerTypeByDomain);
+    return await signUnits(group, signingUnits);
 }
 
 /**
  * Add an EVM intent into the batched EVM group map.
  *
  * On EVM, all intents for the same adapter are batched into a single
- * group so that they can be signed in one EIP-712 `BurnIntentSet`
- * operation.
+ * group. The signing step uses `chainsByDomain` to preserve EOA batching
+ * while signing ERC-1271 intents separately on their source chains.
  *
  * @param intent - The burn intent to group.
  * @param alloc - The allocation that resolved to this intent.
@@ -12246,6 +12539,7 @@ function evmSigningData(burnIntent) {
     const existing = evmGroups.get(alloc.adapter);
     if (existing) {
         existing.intents.push(intent);
+        existing.chainsByDomain.set(alloc.chain.gateway.domain, alloc.chain);
     } else {
         evmGroups.set(alloc.adapter, {
             adapter: alloc.adapter,
@@ -12253,6 +12547,12 @@ function evmSigningData(burnIntent) {
             intents: [
                 intent
             ],
+            chainsByDomain: new Map([
+                [
+                    alloc.chain.gateway.domain,
+                    alloc.chain
+                ]
+            ]),
             address: alloc.sourceSigner
         });
     }
@@ -13778,7 +14078,8 @@ function throwNetworkMismatch(expected, actual) {
     };
 }
 /**
- * Group intents by adapter and chain for signing (Solana one-per-intent, EVM batched by adapter).
+ * Group intents for signing (Solana one-per-intent, EVM batched by adapter
+ * with every source chain retained by Gateway domain).
  *
  * @param intents - Burn intents from estimate response.
  * @param allocations - Normalized allocations used to map domain → adapter/chain.
@@ -16671,22 +16972,32 @@ const DEFAULT_GAS_FEE = parseUnits('0.1', USDC_DECIMALS);
  *
  * Single-intent sets become one burnIntent + signature; multi-intent sets become burnIntentSet + signature.
  *
+ * Sets flagged `contractSigner` carry `contractSigner: true`, which tells
+ * Gateway to validate the signature with ERC-1271 (an offchain
+ * `isValidSignature` simulation) instead of `ecrecover`. The flag is
+ * omitted for EOA signers so their payloads stay byte-identical.
+ *
  * @param signedSets - Signed intent sets (intents + signature per signer).
  * @returns Array of transfer payloads for POST /v1/transfer.
  */ function buildTransferRequestBody(signedSets) {
     return signedSets.map((set)=>{
         const firstIntent = set.intents[0];
+        const contractSigner = set.contractSigner === true ? {
+            contractSigner: true
+        } : {};
         if (set.intents.length === 1 && firstIntent) {
             return {
                 burnIntent: serializeBurnIntent(firstIntent),
-                signature: set.signature
+                signature: set.signature,
+                ...contractSigner
             };
         }
         return {
             burnIntentSet: {
                 intents: set.intents.map(serializeBurnIntent)
             },
-            signature: set.signature
+            signature: set.signature,
+            ...contractSigner
         };
     });
 }
@@ -17049,11 +17360,16 @@ const BPS_DIVISOR = 100_000n;
     return required;
 }
 
+function requireEvmChainsByDomain(group) {
+    if (group.chainsByDomain !== undefined) return group.chainsByDomain;
+    throw createValidationFailedError$1('adapterGroup.chainsByDomain', group.chainsByDomain, 'must be provided for an EVM adapter group');
+}
 /**
- * Sign each adapter group: Solana one intent per signature, EVM batch per adapter.
+ * Sign each adapter group: Solana one intent per signature, and EVM either
+ * batched for EOAs or split by source chain for ERC-1271 signers.
  *
  * @param adapterGroups - Groups from groupIntentsByAdapter.
- * @returns Promise of signed sets (intents + signature) for buildTransferRequestBody.
+ * @returns Promise of signed sets for buildTransferRequestBody.
  *
  * @example
  * ```typescript
@@ -17066,9 +17382,10 @@ const BPS_DIVISOR = 100_000n;
         if (group.chain.type === 'solana') {
             return signSolanaIntentGroup(group);
         }
-        return [
-            await signEvmIntentGroup(group)
-        ];
+        return await signEvmIntentGroup({
+            ...group,
+            chainsByDomain: requireEvmChainsByDomain(group)
+        });
     }));
     return nested.flat();
 }
@@ -17718,7 +18035,8 @@ async function runSpendNormalPath(params, destChain, useForwarder, dispatcher, s
             signedSetCount: signedSets.length,
             signatures: signedSets.map((s)=>({
                     intentCount: s.intents.length,
-                    signature: s.signature
+                    signature: s.signature,
+                    contractSigner: s.contractSigner === true
                 }))
         }
     });
@@ -18173,8 +18491,7 @@ function assertNotSelfDelegation(chain, signerAddress, delegateAddress, action)
         chain
     };
     // Step 1: Quick check at latest block (no HTTP call)
-    const latestRequest = await adapter.prepareAction('gateway.v1.isDelegate', baseActionParams, operationContext);
-    const latestResult = await latestRequest.execute();
+    const latestResult = await executeAdapterReadAction(adapter, 'gateway.v1.isDelegate', baseActionParams, operationContext);
     if (String(latestResult).toLowerCase() !== 'true') {
         return 'none';
     }
@@ -18183,13 +18500,12 @@ function assertNotSelfDelegation(chain, signerAddress, delegateAddress, action)
         // Solana uses confirmed vs finalized commitment as a proxy for
         // Gateway finality. This is conservative — can only over-report
         // 'pending', never falsely report 'ready'.
-        const finalizedRequest = await adapter.prepareAction('gateway.v1.isDelegate', {
-            ...baseActionParams,
-            commitment: 'finalized'
-        }, operationContext);
         let finalizedResult;
         try {
-            finalizedResult = await finalizedRequest.execute();
+            finalizedResult = await executeAdapterReadAction(adapter, 'gateway.v1.isDelegate', {
+                ...baseActionParams,
+                commitment: 'finalized'
+            }, operationContext);
         } catch (error) {
             if (isBlockRangeError(error)) {
                 return 'pending';
@@ -18200,10 +18516,6 @@ function assertNotSelfDelegation(chain, signerAddress, delegateAddress, action)
     }
     // EVM: use processedHeight from /v1/info
     const processedHeight = await getProcessedHeight(chain.isTestnet, chain.gateway.domain);
-    const finalizedRequest = await adapter.prepareAction('gateway.v1.isDelegate', {
-        ...baseActionParams,
-        blockNumber: processedHeight
-    }, operationContext);
     // If the RPC node lags Gateway's indexer view, the historical read at
     // processedHeight may throw a block-range error. This is safe to treat
     // as 'pending' because processedHeight comes from Gateway's /v1/info
@@ -18212,7 +18524,10 @@ function assertNotSelfDelegation(chain, signerAddress, delegateAddress, action)
     // Re-throw structural errors to avoid masking real bugs.
     let finalizedResult;
     try {
-        finalizedResult = await finalizedRequest.execute();
+        finalizedResult = await executeAdapterReadAction(adapter, 'gateway.v1.isDelegate', {
+            ...baseActionParams,
+            blockNumber: processedHeight
+        }, operationContext);
     } catch (error) {
         if (isBlockRangeError(error)) {
             return 'pending';
@@ -18273,8 +18588,8 @@ function parseAmountSafe(amount) {
         chain
     };
     const [withdrawingRaw, withdrawalBlockRaw] = await Promise.all([
-        adapter.prepareAction('gateway.v1.withdrawingBalance', readParams, operationContext).then(async (req)=>req.execute()),
-        adapter.prepareAction('gateway.v1.withdrawalBlock', readParams, operationContext).then(async (req)=>req.execute())
+        executeAdapterReadAction(adapter, 'gateway.v1.withdrawingBalance', readParams, operationContext),
+        executeAdapterReadAction(adapter, 'gateway.v1.withdrawalBlock', readParams, operationContext)
     ]);
     const withdrawingValue = safeBigInt(String(withdrawingRaw), 'withdrawingBalance');
     const withdrawalBlockValue = safeBigInt(String(withdrawalBlockRaw), 'withdrawalBlock');
@@ -18314,12 +18629,11 @@ function parseAmountSafe(amount) {
     const tokenAddress = getTokenAddress(chain, params.token);
     // Read the pending balance before withdrawing — the contract resets it to 0
     // after withdraw() executes, so this is the only way to capture the amount.
-    const withdrawingBalanceReq = await adapter.prepareAction('gateway.v1.withdrawingBalance', {
+    const withdrawingRaw = await executeAdapterReadAction(adapter, 'gateway.v1.withdrawingBalance', {
         token: tokenAddress,
         depositor: signerAddress,
         chain
     }, operationContext);
-    const withdrawingRaw = await withdrawingBalanceReq.execute();
     const withdrawingValue = safeBigInt(String(withdrawingRaw), 'withdrawingBalance');
     if (withdrawingValue === 0n) {
         throw new KitError({