@coinbase/cdp-sdk 1.15.0 → 1.17.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CDP SDK Changelog
 
+## 1.17.0
+
+### Minor Changes
+
+- [#220](https://github.com/coinbase/cdp-sdk/pull/220) [`c91b8da`](https://github.com/coinbase/cdp-sdk/commit/c91b8da383f747de683019a011cbe3453684d6aa) Thanks [@sammccord](https://github.com/sammccord)! - Added support for `EvmDataCriterion` in policies, which can restrict smart contract interactions
+
+## 1.16.0
+
+### Minor Changes
+
+- [#165](https://github.com/coinbase/cdp-sdk/pull/165) [`b39c739`](https://github.com/coinbase/cdp-sdk/commit/b39c739979e92f97f7dd232e2932442bd0251436) Thanks [@derek-cb](https://github.com/derek-cb)! - Added swap support for EVM Smart Accounts.
+
+- [#165](https://github.com/coinbase/cdp-sdk/pull/165) [`b39c739`](https://github.com/coinbase/cdp-sdk/commit/b39c739979e92f97f7dd232e2932442bd0251436) Thanks [@derek-cb](https://github.com/derek-cb)! - Added idempotency support for getSwapPrice and createSwapQuote
+
+### Patch Changes
+
+- [#165](https://github.com/coinbase/cdp-sdk/pull/165) [`b39c739`](https://github.com/coinbase/cdp-sdk/commit/b39c739979e92f97f7dd232e2932442bd0251436) Thanks [@derek-cb](https://github.com/derek-cb)! - Fix usage of optional idempotency keys for one-line swap approach.
+
+- [#211](https://github.com/coinbase/cdp-sdk/pull/211) [`3a497cf`](https://github.com/coinbase/cdp-sdk/commit/3a497cfee26cd5f143940cb067fa5d438e79c590) Thanks [@0xRAG](https://github.com/0xRAG)! - Updated types for signTypedData to fix TypeError when wrapping CDP Account in viem's toAccount helper
+
 ## 1.15.0
 
 ### Minor Changes

package/README.md

@@ -393,7 +393,7 @@ const userOperation = await cdp.sendUserOperation({
 
 ### EVM Swaps
 
-You can use the CDP SDK to swap tokens on EVM networks.
+You can use the CDP SDK to swap tokens on EVM networks using both regular accounts (EOAs) and smart accounts.
 
 The SDK provides three approaches for performing token swaps:
 
@@ -401,6 +401,7 @@ The SDK provides three approaches for performing token swaps:
 
 The simplest approach for performing swaps. Creates and executes the swap in a single line of code:
 
+**Regular Account (EOA):**
 ```typescript
 // Retrieve an existing EVM account with funds already in it
 const account = await cdp.evm.getOrCreateAccount({ name: "MyExistingFundedAccount" });
@@ -417,6 +418,29 @@ const { transactionHash } = await account.swap({
 console.log(`Swap executed: ${transactionHash}`);
 ```
 
+**Smart Account:**
+```typescript
+// Create or retrieve a smart account with funds already in it
+const owner = await cdp.evm.getOrCreateAccount({ name: "MyOwnerAccount" });
+const smartAccount = await cdp.evm.getOrCreateSmartAccount({ name: "MyExistingFundedSmartAccount", owner });
+
+// Execute a swap directly on a smart account in one line
+const { userOpHash } = await smartAccount.swap({
+  network: "base",
+  toToken: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", // USDC on Base
+  fromToken: "0x4200000000000000000000000000000000000006", // WETH on Base
+  fromAmount: BigInt("1000000000000000000"), // 1 WETH in wei
+  slippageBps: 100, // 1% slippage tolerance
+  // Optional: paymasterUrl: "https://paymaster.example.com" // For gas sponsorship
+});
+
+console.log(`Smart account swap executed: ${userOpHash}`);
+
+// Wait for the user operation to complete
+const receipt = await smartAccount.waitForUserOperation({ userOpHash });
+console.log(`Status: ${receipt.status}`);
+```
+
 #### 2. Get pricing information
 
 Use `getSwapPrice` for quick price estimates and display purposes. This is ideal for showing exchange rates without committing to a swap:
@@ -440,10 +464,11 @@ if (swapPrice.liquidityAvailable) {
 
 #### 3. Create and execute separately
 
-Use `createSwapQuote` when you need full control over the swap process. This returns complete transaction data for execution:
+Use `account.quoteSwap()` / `smartAccount.quoteSwap()` when you need full control over the swap process. This returns complete transaction data for execution:
 
-**Important:** `createSwapQuote` signals a soft commitment to swap and may reserve funds on-chain. It is rate-limited more strictly than `getSwapPrice` to prevent abuse.
+**Important:** `quoteSwap()` signals a soft commitment to swap and may reserve funds on-chain. It is rate-limited more strictly than `getSwapPrice` to prevent abuse.
 
+**Regular Account (EOA):**
 ```typescript
 // Retrieve an existing EVM account with funds already in it
 const account = await cdp.evm.getOrCreateAccount({ name: "MyExistingFundedAccount" });
@@ -463,21 +488,51 @@ if (!swapQuote.liquidityAvailable) {
   return;
 }
 
-// Step 3: Execute using the quote (two options)
-// Option 3A: Use the execute method on the quote
-const { transactionHash } = await swapQuote.execute({});
+// Step 3: Execute using the quote
+const { transactionHash } = await swapQuote.execute();
+```
 
-// Option 3B: Pass the quote to account.swap()
-const { transactionHash } = await account.swap({
-  swapQuote: swapQuote
+**Smart Account:**
+```typescript
+// Create or retrieve a smart account with funds already in it
+const owner = await cdp.evm.getOrCreateAccount({ name: "MyOwnerAccount" });
+const smartAccount = await cdp.evm.getOrCreateSmartAccount({ name: "MyExistingFundedSmartAccount", owner });
+
+// Step 1: Create a swap quote with full transaction details for smart account
+const swapQuote = await smartAccount.quoteSwap({
+  network: "base",
+  toToken: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", // USDC
+  fromToken: "0x4200000000000000000000000000000000000006", // WETH
+  fromAmount: BigInt("1000000000000000000"), // 1 WETH in wei
+  slippageBps: 100, // 1% slippage tolerance
 });
+
+// Step 2: Check if liquidity is available, and/or perform other analysis on the swap quote
+if (!swapQuote.liquidityAvailable) {
+  console.error("Insufficient liquidity for swap");
+  return;
+}
+
+// Step 3: Execute using the quote
+const { userOpHash } = await swapQuote.execute();
+
+// Wait for the user operation to complete
+const receipt = await smartAccount.waitForUserOperation({ userOpHash });
+console.log(`Status: ${receipt.status}`);
 ```
 
 #### When to use each approach:
 
-- **All-in-one (`account.swap()`)**: Best for most use cases. Simple, handles everything automatically.
+- **All-in-one (`account.swap()` / `smartAccount.swap()`)**: Best for most use cases. Simple, handles everything automatically.
 - **Price only (`getSwapPrice`)**: For displaying exchange rates, building price calculators, or checking liquidity without executing. Suitable when frequent price updates are needed - although the data may be slightly less precise.
-- **Create then execute (`createSwapQuote`)**: When you need to inspect swap details, implement custom logic, or handle complex scenarios before execution. Note: May reserve funds on-chain and is more strictly rate-limited.
+- **Create then execute (`account.quoteSwap()` / `smartAccount.quoteSwap()`)**: When you need to inspect swap details, implement custom logic, or handle complex scenarios before execution. Note: May reserve funds on-chain and is more strictly rate-limited.
+
+#### Key differences between Regular Accounts (EOAs) and Smart Accounts:
+
+- **Regular accounts (EOAs)** return `transactionHash` and execute immediately on-chain
+- **Smart accounts** return `userOpHash` and execute via user operations with optional gas sponsorship through paymasters
+- **Smart accounts** require an owner account for signing operations
+- **Smart accounts** support batch operations and advanced account abstraction features
 
 All approaches handle Permit2 signatures automatically for ERC20 token swaps. Make sure tokens have proper allowances set for the Permit2 contract before swapping.
 
@@ -485,18 +540,25 @@ All approaches handle Permit2 signatures automatically for ERC20 token swaps. Ma
 
 To help you get started with token swaps in your application, we provide the following fully-working examples demonstrating different scenarios:
 
-**Core swap patterns:**
-- [Get a swap price estimate](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/getSwapPrice.ts) - Price estimation without commitment
-- [Create a concrete swap quote for execution](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/createSwapQuote.ts) - Direct API usage with explicit taker
-- [Execute a swap transaction using CDP Wallets (RECOMMENDED)](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/account.swap.ts) - All-in-one swap execution
-
-**Account-based swap examples:**
+**Regular account (EOA) swap examples:**
+- [Execute a swap transaction using account (RECOMMENDED)](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/account.swap.ts) - All-in-one regular account swap execution
 - [Quote swap using account convenience method](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/account.quoteSwap.ts) - Account convenience method for creating quotes
 - [Two-step quote and execute process](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/account.quoteSwapAndExecute.ts) - Detailed two-step approach with analysis
 
-**External wallet integration:**
-- [Execute a swap transaction using an external account (Viem)](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/viem.swap.ts) - Full swap execution with viem wallets
-- [Create swap quotes using Viem wallets](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/viem.quoteSwap.ts) - Quote creation with external wallets
+**Smart account swap examples:**
+- [Execute a swap transaction using smart account (RECOMMENDED)](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/smartAccount.swap.ts) - All-in-one smart account swap execution with user operations and optional paymaster support
+- [Quote swap using smart account convenience method](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/smartAccount.quoteSwap.ts) - Smart account convenience method for creating quotes
+- [Two-step quote and execute process](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/smartAccount.quoteSwapAndExecute.ts) - Detailed two-step approach with analysis
+
+**BYO wallet (viem) regular account (EOA) swap examples:**
+- [Execute a swap transaction using viem account](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/viem.account.swap.ts) - All-in-one swap execution with viem wallets
+- [Two-step quote and execute process using viem account](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/viem.account.quoteSwapAndExecute.ts) - Detailed two-step approach with viem wallets
+
+**BYO wallet (viem + account abstraction) smart account swap examples:**
+- [Execute a swap transaction using viem smart account](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/viem.smartAccount.swap.ts) - All-in-one smart account swap with custom bundler/paymaster setup
+- [Two-step quote and execute process using viem smart account](https://github.com/coinbase/cdp-sdk/blob/main/examples/typescript/evm/viem.smartAccount.quoteSwapAndExecute.ts) - Advanced account abstraction integration
+
+**Note:** The viem smart account examples require additional dependencies (`permissionless` package) and external service setup (bundler, optional paymaster). For simpler smart account usage, consider CDP's built-in smart account features instead.
 
 ### Transferring tokens
 

package/_cjs/accounts/evm/toEvmServerAccount.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toEvmServerAccount = toEvmServerAccount;
 const viem_1 = require("viem");
+const toNetworkScopedEvmServerAccount_js_1 = require("./toNetworkScopedEvmServerAccount.js");
 const fund_js_1 = require("../../actions/evm/fund/fund.js");
 const quoteFund_js_1 = require("../../actions/evm/fund/quoteFund.js");
 const waitForFundOperationReceipt_js_1 = require("../../actions/evm/fund/waitForFundOperationReceipt.js");
@@ -42,13 +43,19 @@ function toEvmServerAccount(apiClient, options) {
             });
             return result.signedTransaction;
         },
-        async signTypedData(message) {
-            if (!message.types.EIP712Domain) {
-                message.types.EIP712Domain = (0, viem_1.getTypesForEIP712Domain)({
-                    domain: message.domain,
-                });
-            }
-            const result = await apiClient.signEvmTypedData(options.account.address, message);
+        async signTypedData(parameters) {
+            const { domain = {}, message, primaryType } = parameters;
+            const types = {
+                EIP712Domain: (0, viem_1.getTypesForEIP712Domain)({ domain }),
+                ...parameters.types,
+            };
+            const openApiMessage = {
+                domain: domain,
+                types,
+                primaryType,
+                message,
+            };
+            const result = await apiClient.signEvmTypedData(options.account.address, openApiMessage);
             return result.signature;
         },
         async transfer(transferArgs) {
@@ -103,6 +110,12 @@ function toEvmServerAccount(apiClient, options) {
         name: options.account.name,
         type: "evm-server",
         policies: options.account.policies,
+        __experimental_useNetwork: async (networkOrRpcUrl) => {
+            return (0, toNetworkScopedEvmServerAccount_js_1.toNetworkScopedEvmServerAccount)(apiClient, {
+                account,
+                network: networkOrRpcUrl,
+            });
+        },
     };
     return account;
 }

package/_cjs/accounts/evm/toEvmServerAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"toEvmServerAccount.js","sourceRoot":"","sources":["../../../accounts/evm/toEvmServerAccount.ts"],"names":[],"mappings":";;AA0DA,gDAiGC;AA3JD,+BAAmG;AAEnG,4DAAmE;AAEnE,sEAAkF;AAElF,0GAI+D;AAC/D,iFAIgD;AAChD,yEAI4C;AAC5C,6EAAuE;AACvE,kFAA4E;AAC5E,0FAAoF;AACpF,sGAAgG;AAChG,wEAAkE;AAwBlE;;;;;;;;GAQG;AACH,SAAgB,kBAAkB,CAChC,SAA+B,EAC/B,OAAkC;IAElC,MAAM,OAAO,GAAqB;QAChC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAkB;QAC3C,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YAC3B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;gBACrE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,SAAgB,CAAC;QACjC,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,UAA0B;YACnC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;gBAClE,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,SAAgB,CAAC;QACjC,CAAC;QAED,KAAK,CAAC,eAAe,CAAC,WAAoC;YACxD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;gBACzE,WAAW,EAAE,IAAA,2BAAoB,EAAC,WAAW,CAAC;aAC/C,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,iBAAwB,CAAC;QACzC,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,OAAsB;YACxC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBAChC,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,IAAA,8BAAuB,EAAC;oBACnD,MAAM,EAAE,OAAO,CAAC,MAAM;iBACvB,CAAC,CAAC;YACL,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAClF,OAAO,MAAM,CAAC,SAAgB,CAAC;QACjC,CAAC;QACD,KAAK,CAAC,QAAQ,CAAC,YAAY;YACzB,OAAO,IAAA,sBAAQ,EAAC,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,oDAAuB,CAAC,CAAC;QAC7E,CAAC;QACD,KAAK,CAAC,iBAAiB,CACrB,OAAkD;YAElD,OAAO,IAAA,wCAAiB,EAAC,SAAS,EAAE;gBAClC,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,aAAa,CACjB,OAA8C;YAE9C,OAAO,IAAA,gCAAa,EAAC,SAAS,EAAE;gBAC9B,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,OAAgD;YACpE,OAAO,IAAA,oCAAe,EAAC,SAAS,EAAE;gBAChC,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,OAA0C;YACxD,OAAO,IAAA,wBAAS,EAAC,SAAS,EAAE;gBAC1B,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,OAAqC;YAC9C,OAAO,IAAA,cAAI,EAAC,SAAS,EAAE;gBACrB,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,2BAA2B,CAC/B,OAAoC;YAEpC,OAAO,IAAA,4DAA2B,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,OAAyB;YACvC,OAAO,IAAA,oCAAe,EAAC,SAAS,EAAE;gBAChC,GAAG,OAAO;gBACV,KAAK,EAAE,IAAI,CAAC,OAAO;aACpB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,OAAoB;YAC7B,OAAO,IAAA,4CAAmB,EAAC,SAAS,EAAE;gBACpC,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,wCAAwC;aAC9D,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;KACnC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"toEvmServerAccount.js","sourceRoot":"","sources":["../../../accounts/evm/toEvmServerAccount.ts"],"names":[],"mappings":"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"}

package/_cjs/accounts/evm/toEvmSmartAccount.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toEvmSmartAccount = toEvmSmartAccount;
+const toNetworkScopedEvmSmartAccount_js_1 = require("./toNetworkScopedEvmSmartAccount.js");
 const fund_js_1 = require("../../actions/evm/fund/fund.js");
 const quoteFund_js_1 = require("../../actions/evm/fund/quoteFund.js");
 const waitForFundOperationReceipt_js_1 = require("../../actions/evm/fund/waitForFundOperationReceipt.js");
@@ -8,6 +9,8 @@ const getUserOperation_js_1 = require("../../actions/evm/getUserOperation.js");
 const listTokenBalances_js_1 = require("../../actions/evm/listTokenBalances.js");
 const requestFaucet_js_1 = require("../../actions/evm/requestFaucet.js");
 const sendUserOperation_js_1 = require("../../actions/evm/sendUserOperation.js");
+const createSwapQuote_js_1 = require("../../actions/evm/swap/createSwapQuote.js");
+const sendSwapOperation_js_1 = require("../../actions/evm/swap/sendSwapOperation.js");
 const smartAccountTransferStrategy_js_1 = require("../../actions/evm/transfer/smartAccountTransferStrategy.js");
 const transfer_js_1 = require("../../actions/evm/transfer/transfer.js");
 const waitForUserOperation_js_1 = require("../../actions/evm/waitForUserOperation.js");
@@ -75,8 +78,31 @@ function toEvmSmartAccount(apiClient, options) {
         async waitForFundOperationReceipt(options) {
             return (0, waitForFundOperationReceipt_js_1.waitForFundOperationReceipt)(apiClient, options);
         },
+        async quoteSwap(options) {
+            return (0, createSwapQuote_js_1.createSwapQuote)(apiClient, {
+                ...options,
+                taker: this.address, // Always use smart account's address as taker
+                signerAddress: this.owners[0].address, // Always use owner's address as signer
+                smartAccount: account, // Pass smart account for execute method support
+            });
+        },
+        async swap(options) {
+            return (0, sendSwapOperation_js_1.sendSwapOperation)(apiClient, {
+                ...options,
+                smartAccount: account,
+                taker: this.address, // Always use smart account's address as taker
+                signerAddress: this.owners[0].address, // Always use owner's address as signer
+            });
+        },
         name: options.smartAccount.name,
         type: "evm-smart",
+        __experimental_useNetwork: async (networkOrRpcUrl) => {
+            return (0, toNetworkScopedEvmSmartAccount_js_1.toNetworkScopedEvmSmartAccount)(apiClient, {
+                smartAccount: account,
+                owner: options.owner,
+                network: networkOrRpcUrl,
+            });
+        },
     };
     return account;
 }

package/_cjs/accounts/evm/toEvmSmartAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"toEvmSmartAccount.js","sourceRoot":"","sources":["../../../accounts/evm/toEvmSmartAccount.ts"],"names":[],"mappings":";;AA+DA,8CAwEC;AAvID,4DAAmE;AAEnE,sEAAkF;AAElF,0GAI+D;AAC/D,+EAAyE;AACzE,iFAIgD;AAChD,yEAI4C;AAC5C,iFAIgD;AAChD,gHAA0G;AAC1G,wEAAkE;AAClE,uFAImD;AAoBnD;;;;;;;;;;;GAWG;AACH,SAAgB,iBAAiB,CAC/B,SAA+B,EAC/B,OAAiC;IAEjC,MAAM,OAAO,GAAoB;QAC/B,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,OAAkB;QAChD,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QACvB,KAAK,CAAC,QAAQ,CAAC,YAAY;YACzB,OAAO,IAAA,sBAAQ,EAAC,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,8DAA4B,CAAC,CAAC;QAClF,CAAC;QACD,KAAK,CAAC,iBAAiB,CACrB,OAAkD;YAElD,OAAO,IAAA,wCAAiB,EAAC,SAAS,EAAE;gBAClC,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,iBAAiB,CACrB,OAAkE;YAElE,OAAO,IAAA,wCAAiB,EAAC,SAAS,EAAE;gBAClC,GAAG,OAAO;gBACV,YAAY,EAAE,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,oBAAoB,CACxB,OAAiE;YAEjE,OAAO,IAAA,8CAAoB,EAAC,SAAS,EAAE;gBACrC,GAAG,OAAO;gBACV,mBAAmB,EAAE,OAAO,CAAC,OAAO;aACrC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,gBAAgB,CACpB,OAAsD;YAEtD,OAAO,IAAA,sCAAgB,EAAC,SAAS,EAAE;gBACjC,GAAG,OAAO;gBACV,YAAY,EAAE,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,aAAa,CACjB,OAA8C;YAE9C,OAAO,IAAA,gCAAa,EAAC,SAAS,EAAE;gBAC9B,GAAG,OAAO;gBACV,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,OAA0C;YACxD,OAAO,IAAA,wBAAS,EAAC,SAAS,EAAE;gBAC1B,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,OAAqC;YAC9C,OAAO,IAAA,cAAI,EAAC,SAAS,EAAE;gBACrB,GAAG,OAAO;gBACV,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,2BAA2B,CAC/B,OAAoC;YAEpC,OAAO,IAAA,4DAA2B,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI;QAC/B,IAAI,EAAE,WAAW;KAClB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"toEvmSmartAccount.js","sourceRoot":"","sources":["../../../accounts/evm/toEvmSmartAccount.ts"],"names":[],"mappings":"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"}

package/_cjs/accounts/evm/toNetworkScopedEvmServerAccount.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toNetworkScopedEvmServerAccount = toNetworkScopedEvmServerAccount;
+/**
+ * Creates a Network-scoped Server-managed EvmAccount instance from an existing EvmAccount.
+ * Use this to interact with previously deployed EvmAccounts on a specific network.
+ *
+ * @param {CdpOpenApiClientType} apiClient - The API client.
+ * @param {ToNetworkScopedEvmServerAccountOptions} options - Configuration options.
+ * @param {EvmServerAccount} options.account - The EvmServerAccount that was previously created.
+ * @param {string} options.network - The network to scope the account to.
+ * @returns {NetworkScopedEvmServerAccount} A configured NetworkScopedEvmServerAccount instance ready for signing.
+ */
+function toNetworkScopedEvmServerAccount(apiClient, options) {
+    const account = {
+        address: options.account.address,
+        network: options.network,
+        signMessage: options.account.signMessage,
+        sign: options.account.sign,
+        signTransaction: options.account.signTransaction,
+        signTypedData: options.account.signTypedData,
+        name: options.account.name,
+        type: "evm-server",
+        policies: options.account.policies,
+    };
+    return account;
+}
+//# sourceMappingURL=toNetworkScopedEvmServerAccount.js.map

package/_cjs/accounts/evm/toNetworkScopedEvmServerAccount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toNetworkScopedEvmServerAccount.js","sourceRoot":"","sources":["../../../accounts/evm/toNetworkScopedEvmServerAccount.ts"],"names":[],"mappings":";;AAwBA,0EAiBC;AA3BD;;;;;;;;;GASG;AACH,SAAgB,+BAA+B,CAC7C,SAA+B,EAC/B,OAA+C;IAE/C,MAAM,OAAO,GAAkC;QAC7C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAkB;QAC3C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW;QACxC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAC1B,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe;QAChD,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;QAC5C,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAC1B,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;KACnC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/_cjs/accounts/evm/toNetworkScopedEvmSmartAccount.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toNetworkScopedEvmSmartAccount = toNetworkScopedEvmSmartAccount;
+/**
+ * Creates a NetworkScopedEvmSmartAccount instance from an existing EvmSmartAccount and owner.
+ * Use this to interact with previously deployed EvmSmartAccounts, rather than creating new ones.
+ *
+ * The owner must be the original owner of the evm smart account.
+ *
+ * @param {CdpOpenApiClientType} apiClient - The API client.
+ * @param {ToEvmSmartAccountOptions} options - Configuration options.
+ * @param {EvmSmartAccount} options.smartAccount - The deployed evm smart account.
+ * @param {EvmAccount} options.owner - The owner which signs for the smart account.
+ * @returns {NetworkScopedEvmSmartAccount} A configured NetworkScopedEvmSmartAccount instance ready for user operation submission.
+ */
+function toNetworkScopedEvmSmartAccount(apiClient, options) {
+    const account = {
+        address: options.smartAccount.address,
+        network: options.network,
+        owners: [options.owner],
+        name: options.smartAccount.name,
+        type: "evm-smart",
+    };
+    return account;
+}
+//# sourceMappingURL=toNetworkScopedEvmSmartAccount.js.map

package/_cjs/accounts/evm/toNetworkScopedEvmSmartAccount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toNetworkScopedEvmSmartAccount.js","sourceRoot":"","sources":["../../../accounts/evm/toNetworkScopedEvmSmartAccount.ts"],"names":[],"mappings":";;AA2BA,wEAaC;AAzBD;;;;;;;;;;;GAWG;AACH,SAAgB,8BAA8B,CAC5C,SAA+B,EAC/B,OAAiC;IAEjC,MAAM,OAAO,GAAiC;QAC5C,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO;QACrC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;QACvB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI;QAC/B,IAAI,EAAE,WAAW;KAClB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/_cjs/actions/evm/signAndWrapTypedDataForSmartAccount.js

@@ -0,0 +1,186 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signAndWrapTypedDataForSmartAccount = signAndWrapTypedDataForSmartAccount;
+exports.createReplaySafeTypedData = createReplaySafeTypedData;
+exports.createSmartAccountSignatureWrapper = createSmartAccountSignatureWrapper;
+const viem_1 = require("viem");
+/**
+ * Signs and wraps an EIP-712 message for a smart account using the required Coinbase Smart Wallet signature format.
+ *
+ * **Important: Coinbase Smart Wallet Contract Requirements**
+ *
+ * Due to the Coinbase Smart Wallet contract implementation (ERC-1271), CDP Smart Wallets have
+ * specific requirements for EIP-712 message signing:
+ *
+ * 1. **Replay-Safe Hashing**: All typed messages must be wrapped in a replay-safe hash that
+ *    includes the chain ID and smart account address. This prevents the same signature from
+ *    being valid across different chains or accounts.
+ *
+ * 2. **Signature Wrapping**: The resulting signature must be wrapped in a `SignatureWrapper`
+ *    struct that identifies which owner signed and contains the signature data in the format
+ *    expected by the smart contract's `isValidSignature()` method.
+ *
+ * This function handles both requirements automatically, making it safe and convenient for
+ * developers to sign EIP-712 messages with CDP Smart Wallets.
+ *
+ * @param {CdpOpenApiClientType} client - The CDP API client
+ * @param {SignAndWrapTypedDataForSmartAccountOptions} options - Parameters for signing and wrapping the EIP-712 message.
+ * @returns A promise that resolves to the signature that can be used with smart contracts.
+ *
+ * @example
+ * ```ts
+ * const result = await signAndWrapTypedDataForSmartAccount(client, {
+ *   smartAccount: smartAccount,
+ *   chainId: 1n,
+ *   typedData: {
+ *     domain: {
+ *       name: "Permit2",
+ *       chainId: 1,
+ *       verifyingContract: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+ *     },
+ *     types: {
+ *       EIP712Domain: [
+ *         { name: "name", type: "string" },
+ *         { name: "chainId", type: "uint256" },
+ *         { name: "verifyingContract", type: "address" },
+ *       ],
+ *       PermitTransferFrom: [
+ *         { name: "permitted", type: "TokenPermissions" },
+ *         { name: "spender", type: "address" },
+ *         { name: "nonce", type: "uint256" },
+ *         { name: "deadline", type: "uint256" },
+ *       ],
+ *       TokenPermissions: [
+ *         { name: "token", type: "address" },
+ *         { name: "amount", type: "uint256" },
+ *       ],
+ *     },
+ *     primaryType: "PermitTransferFrom",
+ *     message: {
+ *       permitted: {
+ *         token: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+ *         amount: "1000000",
+ *       },
+ *       spender: "0xFfFfFfFFfFFfFFfFFfFFFFFffFFFffffFfFFFfFf",
+ *       nonce: "0",
+ *       deadline: "1717123200",
+ *     },
+ *   },
+ * });
+ *
+ * // Use result.signature for smart contract calls
+ * console.log(`Signature: ${result.signature}`);
+ * ```
+ */
+async function signAndWrapTypedDataForSmartAccount(client, options) {
+    const { smartAccount, chainId, typedData, ownerIndex = 0n } = options;
+    // Create the replay-safe typed data
+    const replaySafeTypedData = createReplaySafeTypedData({
+        typedData,
+        chainId,
+        smartAccountAddress: smartAccount.address,
+    });
+    // Sign the replay-safe typed data with the smart account owner
+    const owner = smartAccount.owners[Number(ownerIndex)];
+    const signature = await client.signEvmTypedData(owner.address, replaySafeTypedData, options.idempotencyKey);
+    // Wrap the signature in the format expected by the smart contract
+    const wrappedSignature = createSmartAccountSignatureWrapper({
+        signatureHex: signature.signature,
+        ownerIndex,
+    });
+    return {
+        signature: wrappedSignature,
+    };
+}
+/**
+ * Creates a replay-safe EIP-712 typed data structure by wrapping the original typed data with
+ * chain ID and smart account address.
+ *
+ * **Coinbase Smart Wallet Requirement**: Due to the Coinbase Smart Wallet contract's ERC-1271
+ * implementation, all EIP-712 messages must be wrapped in a replay-safe hash before signing.
+ * This prevents signature replay attacks across different chains or smart account addresses.
+ *
+ * The smart contract's `isValidSignature()` method expects signatures to be validated against
+ * this replay-safe hash, not the original message hash.
+ *
+ * @param params - The replay-safe hash parameters
+ * @param params.typedData - The original EIP-712 typed data to make replay-safe
+ * @param params.chainId - The chain ID for replay protection
+ * @param params.smartAccountAddress - The smart account address for additional context
+ * @returns The EIP-712 typed data structure for the replay-safe hash
+ */
+function createReplaySafeTypedData({ typedData, chainId, smartAccountAddress, }) {
+    // First hash the original typed data
+    const originalHash = (0, viem_1.hashTypedData)(typedData);
+    // Create and return the replay-safe typed data structure
+    return {
+        domain: {
+            name: "Coinbase Smart Wallet",
+            version: "1",
+            chainId: Number(chainId),
+            verifyingContract: smartAccountAddress,
+        },
+        types: {
+            EIP712Domain: [
+                { name: "name", type: "string" },
+                { name: "version", type: "string" },
+                { name: "chainId", type: "uint256" },
+                { name: "verifyingContract", type: "address" },
+            ],
+            CoinbaseSmartWalletMessage: [{ name: "hash", type: "bytes32" }],
+        },
+        primaryType: "CoinbaseSmartWalletMessage",
+        message: {
+            hash: originalHash,
+        },
+    };
+}
+/**
+ * Builds a signature wrapper for Coinbase Smart Wallets by decomposing a hex signature
+ * into r, s, v components and encoding them in the format expected by the smart contract.
+ *
+ * All signatures on Coinbase Smart Wallets must be wrapped in this format to identify
+ * which owner signed and provide the signature data.
+ *
+ * @param params - The signature parameters
+ * @param params.signatureHex - The hex signature to wrap (65 bytes: r + s + v)
+ * @param params.ownerIndex - The index of the owner that signed (from MultiOwnable.ownerAtIndex)
+ * @returns The encoded signature wrapper in the format expected by the smart contract
+ */
+function createSmartAccountSignatureWrapper({ signatureHex, ownerIndex, }) {
+    // Decompose 65-byte hex signature into r (32 bytes), s (32 bytes), v (1 byte)
+    const r = (0, viem_1.sliceHex)(signatureHex, 0, 32);
+    const s = (0, viem_1.sliceHex)(signatureHex, 32, 64);
+    const v = Number(`0x${signatureHex.slice(130, 132)}`); // 130 = 2 + 64 + 64
+    const signatureData = (0, viem_1.encodePacked)(["bytes32", "bytes32", "uint8"], [r, s, v]);
+    return (0, viem_1.encodeAbiParameters)([SignatureWrapperStruct], [
+        {
+            ownerIndex: Number(ownerIndex),
+            signatureData,
+        },
+    ]);
+}
+/**
+ * The ABI structure for the SignatureWrapper struct expected by Coinbase Smart Wallets.
+ * This matches the struct defined in the smart contract:
+ *
+ * struct SignatureWrapper {
+ *   uint256 ownerIndex;
+ *   bytes signatureData;
+ * }
+ */
+const SignatureWrapperStruct = {
+    components: [
+        {
+            name: "ownerIndex",
+            type: "uint8",
+        },
+        {
+            name: "signatureData",
+            type: "bytes",
+        },
+    ],
+    name: "SignatureWrapper",
+    type: "tuple",
+};
+//# sourceMappingURL=signAndWrapTypedDataForSmartAccount.js.map

package/_cjs/actions/evm/signAndWrapTypedDataForSmartAccount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signAndWrapTypedDataForSmartAccount.js","sourceRoot":"","sources":["../../../actions/evm/signAndWrapTypedDataForSmartAccount.ts"],"names":[],"mappings":"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"}

package/_cjs/actions/evm/swap/createSwapQuote.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSwapQuote = createSwapQuote;
+const sendSwapOperation_js_1 = require("./sendSwapOperation.js");
 const sendSwapTransaction_js_1 = require("./sendSwapTransaction.js");
 /**
  * Creates a quote for a swap between two tokens on an EVM network.
@@ -38,7 +39,7 @@ async function createSwapQuote(client, options) {
         signerAddress: options.signerAddress,
         gasPrice: options.gasPrice?.toString(),
         slippageBps: options.slippageBps,
-    });
+    }, options.idempotencyKey);
     // Check if liquidity is unavailable
     if (!response.liquidityAvailable) {
         // Return the SwapUnavailableResult
@@ -112,13 +113,30 @@ async function createSwapQuote(client, options) {
             : undefined,
         // Add the execute method
         execute: async (executeOptions = {}) => {
-            const { transactionHash } = await (0, sendSwapTransaction_js_1.sendSwapTransaction)(client, {
-                address: options.signerAddress || taker, // Use signerAddress for smart accounts, taker for EOAs
-                network: result.network,
-                swapQuote: result,
-                idempotencyKey: executeOptions.idempotencyKey,
-            });
-            return { transactionHash };
+            if (options.smartAccount) {
+                // Smart account execution - use sendSwapOperation
+                const userOpResult = await (0, sendSwapOperation_js_1.sendSwapOperation)(client, {
+                    smartAccount: options.smartAccount,
+                    network: result.network,
+                    swapQuote: result,
+                    idempotencyKey: executeOptions.idempotencyKey,
+                });
+                return {
+                    userOpHash: userOpResult.userOpHash,
+                    smartAccountAddress: userOpResult.smartAccountAddress,
+                    status: userOpResult.status,
+                };
+            }
+            else {
+                // EOA execution - use sendSwapTransaction
+                const { transactionHash } = await (0, sendSwapTransaction_js_1.sendSwapTransaction)(client, {
+                    address: taker,
+                    network: result.network,
+                    swapQuote: result,
+                    idempotencyKey: executeOptions.idempotencyKey,
+                });
+                return { transactionHash };
+            }
         },
     };
     return result;