@coinbase/cdp-sdk 1.27.0 → 1.29.0

package/_types/policies/schema.d.ts

@@ -67,7 +67,7 @@ export declare const EvmAddressCriterionSchema: z.ZodObject<{
     /**
      * Array of EVM addresses to compare against.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per criterion.
+     * Limited to a maximum of 300 addresses per criterion.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -147,7 +147,7 @@ export declare const EvmTypedAddressConditionSchema: z.ZodObject<{
     /**
      * Array of EVM addresses to compare against.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per condition.
+     * Limited to a maximum of 300 addresses per condition.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -270,7 +270,7 @@ export declare const SignEvmTypedDataFieldCriterionSchema: z.ZodObject<{
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per condition.
+         * Limited to a maximum of 300 addresses per condition.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -386,7 +386,7 @@ export declare const SignEvmTypedDataVerifyingContractCriterionSchema: z.ZodObje
     /**
      * Array of EVM addresses allowed or disallowed as verifying contracts.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per criterion.
+     * Limited to a maximum of 300 addresses per criterion.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -454,7 +454,7 @@ export declare const SignEvmTypedDataCriteriaSchema: z.ZodArray<z.ZodDiscriminat
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per condition.
+         * Limited to a maximum of 300 addresses per condition.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -565,7 +565,7 @@ export declare const SignEvmTypedDataCriteriaSchema: z.ZodArray<z.ZodDiscriminat
     /**
      * Array of EVM addresses allowed or disallowed as verifying contracts.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per criterion.
+     * Limited to a maximum of 300 addresses per criterion.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -1059,7 +1059,7 @@ export declare const SignEvmTransactionCriteriaSchema: z.ZodArray<z.ZodDiscrimin
     /**
      * Array of EVM addresses to compare against.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per criterion.
+     * Limited to a maximum of 300 addresses per criterion.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -1396,7 +1396,7 @@ export declare const SendEvmTransactionCriteriaSchema: z.ZodArray<z.ZodDiscrimin
     /**
      * Array of EVM addresses to compare against.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per criterion.
+     * Limited to a maximum of 300 addresses per criterion.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -1759,7 +1759,7 @@ export declare const PrepareUserOperationCriteriaSchema: z.ZodArray<z.ZodDiscrim
     /**
      * Array of EVM addresses to compare against.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per criterion.
+     * Limited to a maximum of 300 addresses per criterion.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -2095,7 +2095,7 @@ export declare const SendUserOperationCriteriaSchema: z.ZodArray<z.ZodDiscrimina
     /**
      * Array of EVM addresses to compare against.
      * Each address must be a 0x-prefixed 40-character hexadecimal string.
-     * Limited to a maximum of 100 addresses per criterion.
+     * Limited to a maximum of 300 addresses per criterion.
      */
     addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
     /**
@@ -2452,7 +2452,7 @@ export declare const SignEvmTransactionRuleSchema: z.ZodObject<{
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -2958,7 +2958,7 @@ export declare const SignEvmTypedDataRuleSchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per condition.
+             * Limited to a maximum of 300 addresses per condition.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -3069,7 +3069,7 @@ export declare const SignEvmTypedDataRuleSchema: z.ZodObject<{
         /**
          * Array of EVM addresses allowed or disallowed as verifying contracts.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -3190,7 +3190,7 @@ export declare const SendEvmTransactionRuleSchema: z.ZodObject<{
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -3691,7 +3691,7 @@ export declare const PrepareUserOperationRuleSchema: z.ZodObject<{
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -4132,7 +4132,7 @@ export declare const SendUserOperationRuleSchema: z.ZodObject<{
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -4542,7 +4542,7 @@ export declare const RuleSchema: z.ZodDiscriminatedUnion<"operation", [z.ZodObje
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -5030,7 +5030,7 @@ export declare const RuleSchema: z.ZodDiscriminatedUnion<"operation", [z.ZodObje
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per condition.
+             * Limited to a maximum of 300 addresses per condition.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -5141,7 +5141,7 @@ export declare const RuleSchema: z.ZodDiscriminatedUnion<"operation", [z.ZodObje
         /**
          * Array of EVM addresses allowed or disallowed as verifying contracts.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -5256,7 +5256,7 @@ export declare const RuleSchema: z.ZodDiscriminatedUnion<"operation", [z.ZodObje
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -5745,7 +5745,7 @@ export declare const RuleSchema: z.ZodDiscriminatedUnion<"operation", [z.ZodObje
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -6180,7 +6180,7 @@ export declare const RuleSchema: z.ZodDiscriminatedUnion<"operation", [z.ZodObje
         /**
          * Array of EVM addresses to compare against.
          * Each address must be a 0x-prefixed 40-character hexadecimal string.
-         * Limited to a maximum of 100 addresses per criterion.
+         * Limited to a maximum of 300 addresses per criterion.
          */
         addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
         /**
@@ -6618,7 +6618,7 @@ export declare const CreatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -7106,7 +7106,7 @@ export declare const CreatePolicyBodySchema: z.ZodObject<{
                 /**
                  * Array of EVM addresses to compare against.
                  * Each address must be a 0x-prefixed 40-character hexadecimal string.
-                 * Limited to a maximum of 100 addresses per condition.
+                 * Limited to a maximum of 300 addresses per condition.
                  */
                 addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
                 /**
@@ -7217,7 +7217,7 @@ export declare const CreatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses allowed or disallowed as verifying contracts.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -7332,7 +7332,7 @@ export declare const CreatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -7821,7 +7821,7 @@ export declare const CreatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -8256,7 +8256,7 @@ export declare const CreatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -9132,7 +9132,7 @@ export declare const UpdatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -9620,7 +9620,7 @@ export declare const UpdatePolicyBodySchema: z.ZodObject<{
                 /**
                  * Array of EVM addresses to compare against.
                  * Each address must be a 0x-prefixed 40-character hexadecimal string.
-                 * Limited to a maximum of 100 addresses per condition.
+                 * Limited to a maximum of 300 addresses per condition.
                  */
                 addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
                 /**
@@ -9731,7 +9731,7 @@ export declare const UpdatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses allowed or disallowed as verifying contracts.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -9846,7 +9846,7 @@ export declare const UpdatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -10335,7 +10335,7 @@ export declare const UpdatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**
@@ -10770,7 +10770,7 @@ export declare const UpdatePolicyBodySchema: z.ZodObject<{
             /**
              * Array of EVM addresses to compare against.
              * Each address must be a 0x-prefixed 40-character hexadecimal string.
-             * Limited to a maximum of 100 addresses per criterion.
+             * Limited to a maximum of 300 addresses per criterion.
              */
             addresses: z.ZodArray<z.ZodEffects<z.ZodString, `0x${string}`, string>, "many">;
             /**

package/_types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "1.27.0";
+export declare const version = "1.29.0";
 //# sourceMappingURL=version.d.ts.map

package/accounts/evm/toEvmServerAccount.ts

@@ -8,15 +8,8 @@ import {
 } from "viem";
 
 import { toNetworkScopedEvmServerAccount } from "./toNetworkScopedEvmServerAccount.js";
-import { FundOptions, fund } from "../../actions/evm/fund/fund.js";
-import { Quote } from "../../actions/evm/fund/Quote.js";
-import { QuoteFundOptions, quoteFund } from "../../actions/evm/fund/quoteFund.js";
-import { FundOperationResult } from "../../actions/evm/fund/types.js";
-import {
-  WaitForFundOperationOptions,
-  WaitForFundOperationResult,
-  waitForFundOperationReceipt,
-} from "../../actions/evm/fund/waitForFundOperationReceipt.js";
+import { EvmFundOptions, fund } from "../../actions/evm/fund/fund.js";
+import { EvmQuoteFundOptions, quoteFund } from "../../actions/evm/fund/quoteFund.js";
 import {
   listTokenBalances,
   type ListTokenBalancesResult,
@@ -32,6 +25,13 @@ import { createSwapQuote } from "../../actions/evm/swap/createSwapQuote.js";
 import { sendSwapTransaction } from "../../actions/evm/swap/sendSwapTransaction.js";
 import { accountTransferStrategy } from "../../actions/evm/transfer/accountTransferStrategy.js";
 import { transfer } from "../../actions/evm/transfer/transfer.js";
+import { EvmQuote } from "../../actions/Quote.js";
+import { FundOperationResult } from "../../actions/types.js";
+import {
+  WaitForFundOperationOptions,
+  WaitForFundOperationResult,
+  waitForFundOperationReceipt,
+} from "../../actions/waitForFundOperationReceipt.js";
 import { Analytics } from "../../analytics.js";
 
 import type { EvmServerAccount, NetworkOrRpcUrl } from "./types.js";
@@ -189,7 +189,7 @@ export function toEvmServerAccount(
         address: this.address,
       });
     },
-    async quoteFund(options: Omit<QuoteFundOptions, "address">): Promise<Quote> {
+    async quoteFund(options: Omit<EvmQuoteFundOptions, "address">): Promise<EvmQuote> {
       Analytics.trackAction({
         action: "quote_fund",
         accountType: "evm_server",
@@ -203,7 +203,7 @@ export function toEvmServerAccount(
         address: this.address,
       });
     },
-    async fund(options: Omit<FundOptions, "address">): Promise<FundOperationResult> {
+    async fund(options: Omit<EvmFundOptions, "address">): Promise<FundOperationResult> {
       Analytics.trackAction({
         action: "fund",
         accountType: "evm_server",

package/accounts/evm/toEvmSmartAccount.ts

@@ -1,14 +1,7 @@
 import { resolveNetworkToChain } from "./networkToChainResolver.js";
 import { toNetworkScopedEvmSmartAccount } from "./toNetworkScopedEvmSmartAccount.js";
-import { fund, FundOptions } from "../../actions/evm/fund/fund.js";
-import { Quote } from "../../actions/evm/fund/Quote.js";
-import { quoteFund, QuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
-import { FundOperationResult } from "../../actions/evm/fund/types.js";
-import {
-  WaitForFundOperationResult,
-  waitForFundOperationReceipt,
-  WaitForFundOperationOptions,
-} from "../../actions/evm/fund/waitForFundOperationReceipt.js";
+import { fund, EvmFundOptions } from "../../actions/evm/fund/fund.js";
+import { quoteFund, EvmQuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
 import { getUserOperation } from "../../actions/evm/getUserOperation.js";
 import {
   listTokenBalances,
@@ -35,6 +28,13 @@ import {
   WaitForUserOperationOptions,
   WaitForUserOperationReturnType,
 } from "../../actions/evm/waitForUserOperation.js";
+import { EvmQuote } from "../../actions/Quote.js";
+import { FundOperationResult } from "../../actions/types.js";
+import {
+  WaitForFundOperationResult,
+  waitForFundOperationReceipt,
+  WaitForFundOperationOptions,
+} from "../../actions/waitForFundOperationReceipt.js";
 import { Analytics } from "../../analytics.js";
 import {
   GetUserOperationOptions,
@@ -170,7 +170,7 @@ export function toEvmSmartAccount(
         address: account.address,
       });
     },
-    async quoteFund(options: Omit<QuoteFundOptions, "address">): Promise<Quote> {
+    async quoteFund(options: Omit<EvmQuoteFundOptions, "address">): Promise<EvmQuote> {
       Analytics.trackAction({
         action: "quote_fund",
         accountType: "evm_smart",
@@ -184,7 +184,7 @@ export function toEvmSmartAccount(
         address: this.address,
       });
     },
-    async fund(options: Omit<FundOptions, "address">): Promise<FundOperationResult> {
+    async fund(options: Omit<EvmFundOptions, "address">): Promise<FundOperationResult> {
       Analytics.trackAction({
         action: "fund",
         accountType: "evm_smart",

package/accounts/evm/toNetworkScopedEvmServerAccount.ts

@@ -8,9 +8,8 @@ import { transferWithViem } from "../../actions/evm/transfer/transferWithViem.js
 import { Analytics } from "../../analytics.js";
 
 import type { EvmServerAccount, NetworkScopedEvmServerAccount } from "./types.js";
-import type { FundOptions } from "../../actions/evm/fund/fund.js";
-import type { QuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
-import type { WaitForFundOperationOptions } from "../../actions/evm/fund/waitForFundOperationReceipt.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,6 +18,7 @@ import type {
 } from "../../actions/evm/sendTransaction.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 {
   ListEvmTokenBalancesNetwork,
   SendEvmTransactionBodyNetwork,
@@ -52,6 +52,12 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     account: options.account,
   });
 
+  /*
+   * Determine the actual network name from the resolved chain
+   * This handles cases where options.network is an RPC URL
+   */
+  const resolvedNetworkName = mapChainToNetwork(chain) ?? options.network;
+
   const shouldUseApiForSends =
     chain.id === base.id ||
     chain.id === baseSepolia.id ||
@@ -124,7 +130,7 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     },
   } as NetworkScopedEvmServerAccount<Network>;
 
-  if (isMethodSupportedOnNetwork("listTokenBalances", options.network)) {
+  if (isMethodSupportedOnNetwork("listTokenBalances", resolvedNetworkName)) {
     Object.assign(account, {
       listTokenBalances: async (
         listTokenBalancesOptions: Omit<ListTokenBalancesOptions, "address" | "network">,
@@ -137,7 +143,7 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     });
   }
 
-  if (isMethodSupportedOnNetwork("requestFaucet", options.network)) {
+  if (isMethodSupportedOnNetwork("requestFaucet", resolvedNetworkName)) {
     Object.assign(account, {
       requestFaucet: async (faucetOptions: Omit<RequestFaucetOptions, "address" | "network">) => {
         return options.account.requestFaucet({
@@ -148,9 +154,9 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     });
   }
 
-  if (isMethodSupportedOnNetwork("quoteFund", options.network)) {
+  if (isMethodSupportedOnNetwork("quoteFund", resolvedNetworkName)) {
     Object.assign(account, {
-      quoteFund: async (quoteFundOptions: Omit<QuoteFundOptions, "address">) => {
+      quoteFund: async (quoteFundOptions: Omit<EvmQuoteFundOptions, "address">) => {
         return options.account.quoteFund({
           ...quoteFundOptions,
         });
@@ -158,9 +164,9 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     });
   }
 
-  if (isMethodSupportedOnNetwork("fund", options.network)) {
+  if (isMethodSupportedOnNetwork("fund", resolvedNetworkName)) {
     Object.assign(account, {
-      fund: async (fundOptions: Omit<FundOptions, "address">) => {
+      fund: async (fundOptions: Omit<EvmFundOptions, "address">) => {
         return options.account.fund({
           ...fundOptions,
         });
@@ -171,7 +177,7 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     });
   }
 
-  if (isMethodSupportedOnNetwork("quoteSwap", options.network)) {
+  if (isMethodSupportedOnNetwork("quoteSwap", resolvedNetworkName)) {
     Object.assign(account, {
       quoteSwap: async (quoteSwapOptions: AccountQuoteSwapOptions) => {
         return options.account.quoteSwap(quoteSwapOptions);
@@ -179,7 +185,7 @@ export async function toNetworkScopedEvmServerAccount<Network extends string>(
     });
   }
 
-  if (isMethodSupportedOnNetwork("swap", options.network)) {
+  if (isMethodSupportedOnNetwork("swap", resolvedNetworkName)) {
     Object.assign(account, {
       swap: async (swapOptions: AccountSwapOptions) => {
         return options.account.swap(swapOptions);

package/accounts/evm/toNetworkScopedEvmSmartAccount.ts

@@ -2,7 +2,6 @@ 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 { waitForFundOperationReceipt } from "../../actions/evm/fund/waitForFundOperationReceipt.js";
 import { getUserOperation } from "../../actions/evm/getUserOperation.js";
 import { listTokenBalances } from "../../actions/evm/listTokenBalances.js";
 import { requestFaucet } from "../../actions/evm/requestFaucet.js";
@@ -12,6 +11,7 @@ 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 {
@@ -20,9 +20,8 @@ import type {
   KnownEvmNetworks,
   NetworkScopedEvmSmartAccount,
 } from "./types.js";
-import type { FundOptions } from "../../actions/evm/fund/fund.js";
-import type { QuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
-import type { WaitForFundOperationOptions } from "../../actions/evm/fund/waitForFundOperationReceipt.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";
@@ -33,6 +32,7 @@ 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,
@@ -195,7 +195,7 @@ export async function toNetworkScopedEvmSmartAccount<Network extends KnownEvmNet
 
   if (isMethodSupportedOnNetwork("quoteFund", options.network)) {
     Object.assign(account, {
-      quoteFund: async (quoteOptions: Omit<QuoteFundOptions, "address">) => {
+      quoteFund: async (quoteOptions: Omit<EvmQuoteFundOptions, "address">) => {
         Analytics.trackAction({
           action: "quote_fund",
           accountType: "evm_smart",
@@ -214,7 +214,7 @@ export async function toNetworkScopedEvmSmartAccount<Network extends KnownEvmNet
 
   if (isMethodSupportedOnNetwork("fund", options.network)) {
     Object.assign(account, {
-      fund: async (fundOptions: Omit<FundOptions, "address">) => {
+      fund: async (fundOptions: Omit<EvmFundOptions, "address">) => {
         Analytics.trackAction({
           action: "fund",
           accountType: "evm_smart",

package/accounts/evm/types.ts

@@ -7,14 +7,8 @@ import {
   QuoteSwapNetworks,
   SwapNetworks,
 } from "./networkCapabilities.js";
-import { FundOptions } from "../../actions/evm/fund/fund.js";
-import { Quote } from "../../actions/evm/fund/Quote.js";
-import { QuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
-import { FundOperationResult } from "../../actions/evm/fund/types.js";
-import {
-  WaitForFundOperationOptions,
-  WaitForFundOperationResult,
-} from "../../actions/evm/fund/waitForFundOperationReceipt.js";
+import { EvmFundOptions } from "../../actions/evm/fund/fund.js";
+import { EvmQuoteFundOptions } from "../../actions/evm/fund/quoteFund.js";
 import {
   ListTokenBalancesOptions,
   ListTokenBalancesResult,
@@ -39,6 +33,11 @@ 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 type {
@@ -46,6 +45,7 @@ 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 {
@@ -211,13 +211,17 @@ export type NetworkSpecificSmartAccountActions<Network extends string> = Prettif
     // Conditionally include quoteFund
     (Network extends QuoteFundNetworks
       ? {
-          quoteFund: (options: Omit<QuoteFundOptions, "address" | "network">) => Promise<Quote>;
+          quoteFund: (
+            options: Omit<EvmQuoteFundOptions, "address" | "network">,
+          ) => Promise<EvmQuote>;
         }
       : EmptyObject) &
     // Conditionally include fund
     (Network extends FundNetworks
       ? {
-          fund: (options: Omit<FundOptions, "address" | "network">) => Promise<FundOperationResult>;
+          fund: (
+            options: Omit<EvmFundOptions, "address" | "network">,
+          ) => Promise<FundOperationResult>;
           waitForFundOperationReceipt: (
             options: Omit<WaitForFundOperationOptions, "network">,
           ) => Promise<WaitForFundOperationResult>;
@@ -289,13 +293,13 @@ export type NetworkSpecificAccountActions<Network extends string> = Prettify<
     // Conditionally include quoteFund
     (Network extends QuoteFundNetworks
       ? {
-          quoteFund: (options: Omit<QuoteFundOptions, "address">) => Promise<Quote>;
+          quoteFund: (options: Omit<EvmQuoteFundOptions, "address">) => Promise<EvmQuote>;
         }
       : EmptyObject) &
     // Conditionally include fund
     (Network extends FundNetworks
       ? {
-          fund: (options: Omit<FundOptions, "address">) => Promise<FundOperationResult>;
+          fund: (options: Omit<EvmFundOptions, "address">) => Promise<FundOperationResult>;
           waitForFundOperationReceipt: (
             options: WaitForFundOperationOptions,
           ) => Promise<WaitForFundOperationResult>;