@coinbase/cdp-sdk 1.38.3 → 1.38.5

package/accounts/evm/toNetworkScopedEvmServerAccount.ts

@@ -8,8 +8,6 @@ import { transferWithViem } from "../../actions/evm/transfer/transferWithViem.js
 import { Analytics } from "../../analytics.js";
 
 import type { EvmServerAccount, NetworkScopedEvmServerAccount, DistributedOmit } from "./types.js";
-import type { EvmFundOptions } from "../../actions/evm/fund/fund.js";
-import type { EvmQuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
 import type { ListTokenBalancesOptions } from "../../actions/evm/listTokenBalances.js";
 import type { RequestFaucetOptions } from "../../actions/evm/requestFaucet.js";
 import type {
@@ -19,7 +17,6 @@ import type {
 import type { UseSpendPermissionOptions } from "../../actions/evm/spend-permissions/types.js";
 import type { AccountQuoteSwapOptions, AccountSwapOptions } from "../../actions/evm/swap/types.js";
 import type { TransferOptions } from "../../actions/evm/transfer/types.js";
-import type { WaitForFundOperationOptions } from "../../actions/waitForFundOperationReceipt.js";
 import type { EvmSwapsNetwork } from "../../openapi-client/generated/coinbaseDeveloperPlatformAPIs.schemas.js";
 import type {
   ListEvmTokenBalancesNetwork,
@@ -178,53 +175,6 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     });
   }
 
-  if (isMethodSupportedOnNetwork("quoteFund", resolvedNetworkName)) {
-    Object.assign(account, {
-      quoteFund: async (quoteFundOptions: Omit<EvmQuoteFundOptions, "address">) => {
-        Analytics.trackAction({
-          action: "quote_fund",
-          accountType: "evm_server",
-          properties: {
-            managed: true,
-          },
-        });
-
-        return options.account.quoteFund({
-          ...quoteFundOptions,
-        });
-      },
-    });
-  }
-
-  if (isMethodSupportedOnNetwork("fund", resolvedNetworkName)) {
-    Object.assign(account, {
-      fund: async (fundOptions: Omit<EvmFundOptions, "address">) => {
-        Analytics.trackAction({
-          action: "fund",
-          accountType: "evm_server",
-          properties: {
-            managed: true,
-          },
-        });
-
-        return options.account.fund({
-          ...fundOptions,
-        });
-      },
-      waitForFundOperationReceipt: async (waitOptions: WaitForFundOperationOptions) => {
-        Analytics.trackAction({
-          action: "wait_for_fund_operation_receipt",
-          accountType: "evm_server",
-          properties: {
-            managed: true,
-          },
-        });
-
-        return options.account.waitForFundOperationReceipt(waitOptions);
-      },
-    });
-  }
-
   if (isMethodSupportedOnNetwork("quoteSwap", resolvedNetworkName)) {
     Object.assign(account, {
       quoteSwap: async (quoteSwapOptions: DistributedOmit<AccountQuoteSwapOptions, "network">) => {

package/accounts/evm/toNetworkScopedEvmSmartAccount.ts

@@ -1,7 +1,5 @@
 import { getBaseNodeRpcUrl } from "./getBaseNodeRpcUrl.js";
 import { isMethodSupportedOnNetwork } from "./networkCapabilities.js";
-import { fund } from "../../actions/evm/fund/fund.js";
-import { quoteFund } from "../../actions/evm/fund/quoteFund.js";
 import { getUserOperation } from "../../actions/evm/getUserOperation.js";
 import { listTokenBalances } from "../../actions/evm/listTokenBalances.js";
 import { requestFaucet } from "../../actions/evm/requestFaucet.js";
@@ -12,7 +10,6 @@ import { sendSwapOperation } from "../../actions/evm/swap/sendSwapOperation.js";
 import { smartAccountTransferStrategy } from "../../actions/evm/transfer/smartAccountTransferStrategy.js";
 import { transfer } from "../../actions/evm/transfer/transfer.js";
 import { waitForUserOperation } from "../../actions/evm/waitForUserOperation.js";
-import { waitForFundOperationReceipt } from "../../actions/waitForFundOperationReceipt.js";
 import { Analytics } from "../../analytics.js";
 
 import type {
@@ -22,8 +19,6 @@ import type {
   NetworkScopedEvmSmartAccount,
   DistributedOmit,
 } from "./types.js";
-import type { EvmFundOptions } from "../../actions/evm/fund/fund.js";
-import type { EvmQuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
 import type { ListTokenBalancesOptions } from "../../actions/evm/listTokenBalances.js";
 import type { RequestFaucetOptions } from "../../actions/evm/requestFaucet.js";
 import type { SendUserOperationOptions } from "../../actions/evm/sendUserOperation.js";
@@ -34,7 +29,6 @@ import type {
 } from "../../actions/evm/swap/types.js";
 import type { SmartAccountTransferOptions } from "../../actions/evm/transfer/types.js";
 import type { WaitForUserOperationOptions } from "../../actions/evm/waitForUserOperation.js";
-import type { WaitForFundOperationOptions } from "../../actions/waitForFundOperationReceipt.js";
 import type { GetUserOperationOptions } from "../../client/evm/evm.types.js";
 import type {
   CdpOpenApiClientType,
@@ -206,49 +200,6 @@ export async function toNetworkScopedEvmSmartAccount<Network extends KnownEvmNet
     });
   }
 
-  if (isMethodSupportedOnNetwork("quoteFund", options.network)) {
-    Object.assign(account, {
-      quoteFund: async (quoteOptions: Omit<EvmQuoteFundOptions, "address">) => {
-        Analytics.trackAction({
-          action: "quote_fund",
-          accountType: "evm_smart",
-          properties: {
-            network: options.network,
-            managed: true,
-          },
-        });
-
-        return quoteFund(apiClient, {
-          ...quoteOptions,
-          address: options.smartAccount.address,
-        });
-      },
-    });
-  }
-
-  if (isMethodSupportedOnNetwork("fund", options.network)) {
-    Object.assign(account, {
-      fund: async (fundOptions: Omit<EvmFundOptions, "address">) => {
-        Analytics.trackAction({
-          action: "fund",
-          accountType: "evm_smart",
-          properties: {
-            network: options.network,
-            managed: true,
-          },
-        });
-
-        return fund(apiClient, {
-          ...fundOptions,
-          address: options.smartAccount.address,
-        });
-      },
-      waitForFundOperationReceipt: async (waitOptions: WaitForFundOperationOptions) => {
-        return waitForFundOperationReceipt(apiClient, waitOptions);
-      },
-    });
-  }
-
   if (isMethodSupportedOnNetwork("quoteSwap", options.network)) {
     Object.assign(account, {
       quoteSwap: async (

package/accounts/evm/types.ts

@@ -5,14 +5,10 @@
 import {
   ListTokenBalancesNetworks,
   RequestFaucetNetworks,
-  QuoteFundNetworks,
-  FundNetworks,
   TransferNetworks,
-  QuoteSwapNetworks,
   SwapNetworks,
+  QuoteSwapNetworks,
 } from "./networkCapabilities.js";
-import { EvmFundOptions } from "../../actions/evm/fund/fund.js";
-import { EvmQuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
 import {
   ListTokenBalancesOptions,
   ListTokenBalancesResult,
@@ -25,24 +21,19 @@ import {
 } from "../../actions/evm/sendUserOperation.js";
 import { UseSpendPermissionOptions } from "../../actions/evm/spend-permissions/types.js";
 import {
-  AccountQuoteSwapOptions,
-  AccountQuoteSwapResult,
   AccountSwapOptions,
   AccountSwapResult,
+  AccountQuoteSwapOptions,
+  AccountQuoteSwapResult,
   SmartAccountQuoteSwapOptions,
-  SmartAccountQuoteSwapResult,
   SmartAccountSwapOptions,
   SmartAccountSwapResult,
+  SmartAccountQuoteSwapResult,
 } from "../../actions/evm/swap/types.js";
 import {
   WaitForUserOperationOptions,
   WaitForUserOperationReturnType,
 } from "../../actions/evm/waitForUserOperation.js";
-import { FundOperationResult } from "../../actions/types.js";
-import {
-  WaitForFundOperationOptions,
-  WaitForFundOperationResult,
-} from "../../actions/waitForFundOperationReceipt.js";
 import { GetUserOperationOptions, UserOperation } from "../../client/evm/evm.types.js";
 import { SpendPermissionNetwork } from "../../openapi-client/index.js";
 
@@ -51,7 +42,6 @@ import type {
   TransferOptions,
 } from "../../actions/evm/transfer/types.js";
 import type { AccountActions, SmartAccountActions } from "../../actions/evm/types.js";
-import type { EvmQuote } from "../../actions/Quote.js";
 import type { Address, Hash, Hex } from "../../types/misc.js";
 import type { Prettify } from "../../types/utils.js";
 import type {
@@ -220,30 +210,11 @@ export type NetworkSpecificSmartAccountActions<Network extends string> = Prettif
           ) => Promise<RequestFaucetResult>;
         }
       : EmptyObject) &
-    // Conditionally include quoteFund
-    (Network extends QuoteFundNetworks
-      ? {
-          quoteFund: (
-            options: Omit<EvmQuoteFundOptions, "address" | "network">,
-          ) => Promise<EvmQuote>;
-        }
-      : EmptyObject) &
-    // Conditionally include fund
-    (Network extends FundNetworks
-      ? {
-          fund: (
-            options: Omit<EvmFundOptions, "address" | "network">,
-          ) => Promise<FundOperationResult>;
-          waitForFundOperationReceipt: (
-            options: Omit<WaitForFundOperationOptions, "network">,
-          ) => Promise<WaitForFundOperationResult>;
-        }
-      : EmptyObject) &
     // Conditionally include quoteSwap
     (Network extends QuoteSwapNetworks
       ? {
           quoteSwap: (
-            options: Omit<SmartAccountQuoteSwapOptions, "network">,
+            options: DistributedOmit<SmartAccountQuoteSwapOptions, "network">,
           ) => Promise<SmartAccountQuoteSwapResult>;
         }
       : EmptyObject) &
@@ -314,21 +285,6 @@ export type NetworkSpecificAccountActions<Network extends string> = Prettify<
           ) => Promise<RequestFaucetResult>;
         }
       : EmptyObject) &
-    // Conditionally include quoteFund
-    (Network extends QuoteFundNetworks
-      ? {
-          quoteFund: (options: Omit<EvmQuoteFundOptions, "address">) => Promise<EvmQuote>;
-        }
-      : EmptyObject) &
-    // Conditionally include fund
-    (Network extends FundNetworks
-      ? {
-          fund: (options: Omit<EvmFundOptions, "address">) => Promise<FundOperationResult>;
-          waitForFundOperationReceipt: (
-            options: WaitForFundOperationOptions,
-          ) => Promise<WaitForFundOperationResult>;
-        }
-      : EmptyObject) &
     // Conditionally include transfer
     (Network extends TransferNetworks
       ? {

package/accounts/solana/toSolanaAccount.ts

@@ -1,18 +1,9 @@
 import { Account, SolanaAccount } from "./types.js";
-import { SolanaQuote } from "../../actions/Quote.js";
-import { SolanaFundOptions, fund } from "../../actions/solana/fund/fund.js";
-import { SolanaQuoteFundOptions, quoteFund } from "../../actions/solana/fund/quoteFund.js";
 import { requestFaucet } from "../../actions/solana/requestFaucet.js";
 import { sendTransaction, SendTransactionResult } from "../../actions/solana/sendTransaction.js";
 import { signMessage } from "../../actions/solana/signMessage.js";
 import { signTransaction, SignTransactionResult } from "../../actions/solana/signTransaction.js";
 import { transfer, type TransferOptions } from "../../actions/solana/transfer.js";
-import { FundOperationResult } from "../../actions/types.js";
-import {
-  WaitForFundOperationOptions,
-  WaitForFundOperationResult,
-  waitForFundOperationReceipt,
-} from "../../actions/waitForFundOperationReceipt.js";
 import { Analytics } from "../../analytics.js";
 import {
   RequestFaucetOptions,
@@ -108,38 +99,6 @@ export function toSolanaAccount(
         from: account.address,
       });
     },
-    async quoteFund(options: Omit<SolanaQuoteFundOptions, "address">): Promise<SolanaQuote> {
-      Analytics.trackAction({
-        action: "quote_fund",
-        accountType: "solana",
-      });
-
-      return quoteFund(apiClient, {
-        ...options,
-        address: account.address,
-      });
-    },
-    async fund(options: Omit<SolanaFundOptions, "address">): Promise<FundOperationResult> {
-      Analytics.trackAction({
-        action: "fund",
-        accountType: "solana",
-      });
-
-      return fund(apiClient, {
-        ...options,
-        address: account.address,
-      });
-    },
-    async waitForFundOperationReceipt(
-      options: WaitForFundOperationOptions,
-    ): Promise<WaitForFundOperationResult> {
-      Analytics.trackAction({
-        action: "wait_for_fund_operation_receipt",
-        accountType: "solana",
-      });
-
-      return waitForFundOperationReceipt(apiClient, options);
-    },
   };
 
   return account;

package/actions/evm/sendUserOperation.ts

@@ -63,6 +63,18 @@ export type SendUserOperationReturnType = {
   userOpHash: Hex;
 };
 
+/**
+ * Return type for the prepareAndSendUserOperation function.
+ */
+export type PrepareAndSendUserOperationReturnType = {
+  /** The address of the smart wallet. */
+  smartAccountAddress: Address;
+  /** The status of the user operation. */
+  status: typeof EvmUserOperationStatus.broadcast;
+  /** The hash of the user operation. This is not the transaction hash which is only available after the operation is completed.*/
+  userOpHash: Hex;
+};
+
 /**
  * Sends a user operation to the network.
  *
@@ -132,6 +144,7 @@ export async function sendUserOperation<T extends readonly unknown[]>(
           args: call.args,
         }),
         value,
+        overrideGasLimit: call.overrideGasLimit,
       };
     }
 
@@ -139,6 +152,7 @@ export async function sendUserOperation<T extends readonly unknown[]>(
       to: call.to,
       data: call.data ?? "0x",
       value,
+      overrideGasLimit: call.overrideGasLimit,
     };
   });
 

package/actions/evm/types.ts

@@ -2,14 +2,8 @@
  * @module Actions
  */
 
-import { FundOperationResult } from "../types.js";
-import {
-  WaitForFundOperationOptions,
-  WaitForFundOperationResult,
-} from "../waitForFundOperationReceipt.js";
-import { EvmFundOptions } from "./fund/fund.js";
-import { EvmQuoteFundOptions } from "./fund/quoteFund.js";
 import { SendUserOperationOptions, SendUserOperationReturnType } from "./sendUserOperation.js";
+import { UseSpendPermissionOptions } from "./spend-permissions/types.js";
 import { KnownEvmNetworks } from "../../accounts/evm/types.js";
 import {
   GetUserOperationOptions,
@@ -17,8 +11,6 @@ import {
   UserOperation,
 } from "../../client/evm/evm.types.js";
 import { Hex } from "../../types/misc.js";
-import { EvmQuote } from "../Quote.js";
-import { UseSpendPermissionOptions } from "./spend-permissions/types.js";
 
 import type { ListTokenBalancesOptions, ListTokenBalancesResult } from "./listTokenBalances.js";
 import type { RequestFaucetOptions, RequestFaucetResult } from "./requestFaucet.js";
@@ -78,71 +70,6 @@ export type Actions = {
    * ```
    */
   requestFaucet: (options: Omit<RequestFaucetOptions, "address">) => Promise<RequestFaucetResult>;
-
-  /**
-   * Gets a quote to fund an EVM account.
-   *
-   * @param options - The options for the quote fund.
-   * @param options.network - The network to fund the account on.
-   * @param options.token - The token to fund the account with.
-   * @param options.amount - The amount of the token to fund represented as an atomic unit.
-   * It's common to use `parseUnits` utils from viem to convert to atomic units.
-   * Otherwise, you can pass atomic units directly.
-   *
-   * @returns A promise that resolves to a Quote object containing details about the funding operation.
-   *
-   * @example
-   * ```ts
-   * const quote = await account.quoteFund({
-   *   network: "base",
-   *   token: "usdc",
-   *   amount: 1000000n,
-   * });
-   * ```
-   */
-  quoteFund: (options: Omit<EvmQuoteFundOptions, "address">) => Promise<EvmQuote>;
-
-  /**
-   * Funds an EVM account with the specified token amount.
-   *
-   * @param options - The options for the fund operation.
-   * @param options.network - The network to fund the account on.
-   * @param options.token - The token to fund the account with (e.g., 'usdc').
-   * @param options.amount - The amount of the token to fund represented as an atomic unit.
-   * It's common to use `parseUnits` utils from viem to convert to atomic units.
-   * Otherwise, you can pass atomic units directly.
-   *
-   * @returns A promise that resolves to the fund operation result containing the transfer details.
-   *
-   * @example
-   * ```ts
-   * const fundOperation = await account.fund({
-   *   network: "base",
-   *   token: "usdc",
-   *   amount: 1000000n,
-   * });
-   * ```
-   */
-  fund: (options: Omit<EvmFundOptions, "address">) => Promise<FundOperationResult>;
-
-  /**
-   * Waits for a fund operation to complete and returns the transfer receipt.
-   *
-   * @param options - The options for the wait for fund operation.
-   * @param options.transferId - The ID of the transfer to wait for.
-   *
-   * @returns A promise that resolves to the completed transfer receipt containing details about the funding operation.
-   *
-   * @example
-   * ```ts
-   * const completedTransfer = await account.waitForFundOperationReceipt({
-   *   transferId: "transfer_123",
-   * });
-   * ```
-   */
-  waitForFundOperationReceipt(
-    options: WaitForFundOperationOptions,
-  ): Promise<WaitForFundOperationResult>;
 };
 
 export type AccountActions = Actions & {

package/actions/solana/rpc.ts

@@ -0,0 +1,17 @@
+import { createSolanaRpc } from "@solana/kit";
+
+import type { Network } from "./utils.js";
+
+/**
+ * Create a Solana RPC client for the given network
+ *
+ * @param network - The network to connect to
+ *
+ * @returns The RPC client
+ */
+export function createRpcClient(network: Network) {
+  const endpoint =
+    network === "mainnet" ? "https://api.mainnet-beta.solana.com" : "https://api.devnet.solana.com";
+
+  return createSolanaRpc(endpoint);
+}