@account-kit/infra 4.12.1-alpha.0 → 4.13.0

package/dist/esm/actions/types.d.ts

@@ -1,5 +1,5 @@
-import type { UserOperationStruct, UserOperationRequest, UserOperationOverrides, EntryPointVersion } from "@aa-sdk/core";
-import type { Address, Hash, Hex } from "viem";
+import type { UserOperationStruct } from "@aa-sdk/core";
+import type { Address, Hash } from "viem";
 export declare enum SimulateAssetType {
     NATIVE = "NATIVE",
     ERC20 = "ERC20",
@@ -41,15 +41,3 @@ export interface SimulateAssetChange {
     name?: string;
     logo?: string;
 }
-export type RequestGasAndPaymasterAndDataRequest = [
-    {
-        policyId: string;
-        entryPoint: Address;
-        dummySignature: Hex;
-        userOperation: UserOperationRequest;
-        overrides?: UserOperationOverrides;
-    }
-];
-export type RequestGasAndPaymasterAndDataResponse<TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = Pick<UserOperationRequest, "callGasLimit" | "preVerificationGas" | "verificationGasLimit" | "maxFeePerGas" | "maxPriorityFeePerGas"> & (TEntryPointVersion extends "0.6.0" ? {
-    paymasterAndData: UserOperationRequest<"0.6.0">["paymasterAndData"];
-} : TEntryPointVersion extends "0.7.0" ? Pick<UserOperationRequest<"0.7.0">, "paymaster" | "paymasterData" | "paymasterVerificationGasLimit" | "paymasterPostOpGasLimit"> : never);

package/dist/esm/actions/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/actions/types.ts"],"names":[],"mappings":"AAQA,MAAM,CAAN,IAAY,iBAUX;AAVD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,oCAAe,CAAA;IACf,sCAAiB,CAAA;IACjB,wCAAmB,CAAA;IACnB;;;OAGG;IACH,gDAA2B,CAAA;AAC7B,CAAC,EAVW,iBAAiB,KAAjB,iBAAiB,QAU5B;AAED,MAAM,CAAN,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,2CAAqB,CAAA;AACvB,CAAC,EAHW,kBAAkB,KAAlB,kBAAkB,QAG7B","sourcesContent":["import type {\n  UserOperationStruct,\n  UserOperationRequest,\n  UserOperationOverrides,\n  EntryPointVersion,\n} from \"@aa-sdk/core\";\nimport type { Address, Hash, Hex } from \"viem\";\n\nexport enum SimulateAssetType {\n  NATIVE = \"NATIVE\",\n  ERC20 = \"ERC20\",\n  ERC721 = \"ERC721\",\n  ERC1155 = \"ERC1155\",\n  /**\n   * Special contracts that don't follow ERC 721/1155. Currently limited to\n   * CryptoKitties and CryptoPunks.\n   */\n  SPECIAL_NFT = \"SPECIAL_NFT\",\n}\n\nexport enum SimulateChangeType {\n  APPROVE = \"APPROVE\",\n  TRANSFER = \"TRANSFER\",\n}\n\nexport type SimulateUserOperationAssetChangesRequest = [\n  UserOperationStruct,\n  entryPoint: Address,\n  blockNumber?: Hash\n];\n\nexport type SimulateUserOperationAssetChangesResponse = {\n  changes: SimulateAssetChange[];\n  error?: SimulateAssetChangesError;\n};\n\nexport interface SimulateAssetChangesError extends Record<string, any> {\n  message: string;\n}\n\nexport interface SimulateAssetChange {\n  assetType: SimulateAssetType;\n  changeType: SimulateChangeType;\n  from: Address;\n  to: Address;\n  rawAmount?: string;\n  amount?: string;\n  contactAddress: Address;\n  tokenId?: string;\n  decimals: number;\n  symbol: string;\n  name?: string;\n  logo?: string;\n}\n\nexport type RequestGasAndPaymasterAndDataRequest = [\n  {\n    policyId: string;\n    entryPoint: Address;\n    dummySignature: Hex;\n    userOperation: UserOperationRequest;\n    overrides?: UserOperationOverrides;\n  }\n];\n\nexport type RequestGasAndPaymasterAndDataResponse<\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = Pick<\n  UserOperationRequest,\n  | \"callGasLimit\"\n  | \"preVerificationGas\"\n  | \"verificationGasLimit\"\n  | \"maxFeePerGas\"\n  | \"maxPriorityFeePerGas\"\n> &\n  (TEntryPointVersion extends \"0.6.0\"\n    ? {\n        paymasterAndData: UserOperationRequest<\"0.6.0\">[\"paymasterAndData\"];\n      }\n    : TEntryPointVersion extends \"0.7.0\"\n    ? Pick<\n        UserOperationRequest<\"0.7.0\">,\n        | \"paymaster\"\n        | \"paymasterData\"\n        | \"paymasterVerificationGasLimit\"\n        | \"paymasterPostOpGasLimit\"\n      >\n    : never);\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/actions/types.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,iBAUX;AAVD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,oCAAe,CAAA;IACf,sCAAiB,CAAA;IACjB,wCAAmB,CAAA;IACnB;;;OAGG;IACH,gDAA2B,CAAA;AAC7B,CAAC,EAVW,iBAAiB,KAAjB,iBAAiB,QAU5B;AAED,MAAM,CAAN,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,2CAAqB,CAAA;AACvB,CAAC,EAHW,kBAAkB,KAAlB,kBAAkB,QAG7B","sourcesContent":["import type { UserOperationStruct } from \"@aa-sdk/core\";\nimport type { Address, Hash } from \"viem\";\n\nexport enum SimulateAssetType {\n  NATIVE = \"NATIVE\",\n  ERC20 = \"ERC20\",\n  ERC721 = \"ERC721\",\n  ERC1155 = \"ERC1155\",\n  /**\n   * Special contracts that don't follow ERC 721/1155. Currently limited to\n   * CryptoKitties and CryptoPunks.\n   */\n  SPECIAL_NFT = \"SPECIAL_NFT\",\n}\n\nexport enum SimulateChangeType {\n  APPROVE = \"APPROVE\",\n  TRANSFER = \"TRANSFER\",\n}\n\nexport type SimulateUserOperationAssetChangesRequest = [\n  UserOperationStruct,\n  entryPoint: Address,\n  blockNumber?: Hash\n];\n\nexport type SimulateUserOperationAssetChangesResponse = {\n  changes: SimulateAssetChange[];\n  error?: SimulateAssetChangesError;\n};\n\nexport interface SimulateAssetChangesError extends Record<string, any> {\n  message: string;\n}\n\nexport interface SimulateAssetChange {\n  assetType: SimulateAssetType;\n  changeType: SimulateChangeType;\n  from: Address;\n  to: Address;\n  rawAmount?: string;\n  amount?: string;\n  contactAddress: Address;\n  tokenId?: string;\n  decimals: number;\n  symbol: string;\n  name?: string;\n  logo?: string;\n}\n"]}

package/dist/esm/alchemyTransport.js

@@ -11,7 +11,6 @@ const alchemyMethods = [
     "rundler_maxPriorityFeePerGas",
     "pm_getPaymasterData",
     "pm_getPaymasterStubData",
-    "alchemy_requestGasAndPaymasterAndData",
 ];
 /**
  * A type guard for the transport to determine if it is an Alchemy transport.

package/dist/esm/alchemyTransport.js.map

@@ -1 +1 @@
-{"version":3,"file":"alchemyTransport.js","sourceRoot":"","sources":["../../src/alchemyTransport.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ChainNotFoundError,\n  ConnectionConfigSchema,\n  split,\n  type ConnectionConfig,\n  type NoUndefined,\n} from \"@aa-sdk/core\";\nimport {\n  createTransport,\n  http,\n  type Chain,\n  type EIP1193RequestFn,\n  type HttpTransportConfig,\n  type PublicRpcSchema,\n  type Transport,\n  type TransportConfig,\n} from \"viem\";\nimport type { AlchemyRpcSchema } from \"./client/types.js\";\nimport { AlchemyChainSchema } from \"./schema.js\";\nimport { VERSION } from \"./version.js\";\n\ntype Never<T> = T extends object\n  ? {\n      [K in keyof T]?: never;\n    }\n  : never;\n\ntype SplitTransportConfig = {\n  alchemyConnection: ConnectionConfig;\n  nodeRpcUrl: string;\n};\n\nconst alchemyMethods = [\n  \"eth_sendUserOperation\",\n  \"eth_estimateUserOperationGas\",\n  \"eth_getUserOperationReceipt\",\n  \"eth_getUserOperationByHash\",\n  \"eth_supportedEntryPoints\",\n  \"rundler_maxPriorityFeePerGas\",\n  \"pm_getPaymasterData\",\n  \"pm_getPaymasterStubData\",\n  \"alchemy_requestGasAndPaymasterAndData\",\n];\n\nexport type AlchemyTransportConfig = (\n  | (ConnectionConfig & Never<SplitTransportConfig>)\n  | (SplitTransportConfig & Never<ConnectionConfig>)\n) & {\n  /** The max number of times to retry. */\n  retryCount?: TransportConfig[\"retryCount\"] | undefined;\n  /** The base delay (in ms) between retries. */\n  retryDelay?: TransportConfig[\"retryDelay\"] | undefined;\n  fetchOptions?: NoUndefined<HttpTransportConfig[\"fetchOptions\"]>;\n};\n\ntype AlchemyTransportBase = Transport<\n  \"alchemy\",\n  {\n    alchemyRpcUrl: string;\n    fetchOptions?: AlchemyTransportConfig[\"fetchOptions\"];\n  },\n  EIP1193RequestFn<[...PublicRpcSchema, ...AlchemyRpcSchema]>\n>;\n\nexport type AlchemyTransport = AlchemyTransportBase & {\n  updateHeaders(newHeaders: HeadersInit): void;\n  config: AlchemyTransportConfig;\n};\n\n/**\n * A type guard for the transport to determine if it is an Alchemy transport.\n * Used in cases where we would like to do switching depending on the transport, where there used\n * to be two clients for a alchemy and a non alchemy, and with this switch we don't need the two seperate clients. *\n *\n * @param {Transport} transport The transport to check\n * @param {Chain} chain Chain for the transport to run its function to return the transport config\n * @returns {boolean} `true` if the transport is an Alchemy transport, otherwise `false`\n */\nexport function isAlchemyTransport(\n  transport: Transport,\n  chain: Chain\n): transport is AlchemyTransport {\n  return transport({ chain }).config.type === \"alchemy\";\n}\n\n/**\n * Creates an Alchemy transport with the specified configuration options.\n * When sending all traffic to Alchemy, you must pass in one of rpcUrl, apiKey, or jwt.\n * If you want to send Bundler and Paymaster traffic to Alchemy and Node traffic to a different RPC, you must pass in alchemyConnection and nodeRpcUrl.\n *\n * @example\n * ### Basic Example\n * If the chain you're using is supported for both Bundler and Node RPCs, then you can do the following:\n * ```ts\n * import { alchemy } from \"@account-kit/infra\";\n *\n * const transport = alchemy({\n *  // NOTE: you can also pass in an rpcUrl or jwt here or rpcUrl and jwt\n *  apiKey: \"your-api-key\",\n * });\n * ```\n *\n * ### AA Only Chains\n * For AA-only chains, you need to specify the alchemyConnection and nodeRpcUrl since Alchemy only\n * handles the Bundler and Paymaster RPCs for these chains.\n * ```ts\n * import { alchemy } from \"@account-kit/infra\";\n *\n * const transport = alchemy({\n *  alchemyConnection: {\n *    apiKey: \"your-api-key\",\n *  },\n *  nodeRpcUrl: \"https://zora.rpc.url\",\n * });\n * ```\n *\n * @param {AlchemyTransportConfig} config The configuration object for the Alchemy transport.\n * @param {number} config.retryDelay Optional The delay between retries, in milliseconds.\n * @param {number} config.retryCount Optional The number of retry attempts.\n * @param {string} [config.alchemyConnection] Optional Alchemy connection configuration (if this is passed in, nodeRpcUrl is required).\n * @param {string} [config.fetchOptions] Optional fetch options for HTTP requests.\n * @param {string} [config.nodeRpcUrl] Optional RPC URL for node (if this is passed in, alchemyConnection is required).\n * @param {string} [config.rpcUrl] Optional RPC URL.\n * @param {string} [config.apiKey] Optional API key for Alchemy.\n * @param {string} [config.jwt] Optional JSON Web Token for authorization.\n * @returns {AlchemyTransport} The configured Alchemy transport object.\n */\nexport function alchemy(config: AlchemyTransportConfig): AlchemyTransport {\n  const { retryDelay, retryCount } = config;\n  // we create a copy here in case we create a split transport down below\n  // we don't want to add alchemy headers to 3rd party nodes\n  const fetchOptions = { ...config.fetchOptions };\n\n  const connectionConfig = ConnectionConfigSchema.parse(\n    config.alchemyConnection ?? config\n  );\n\n  const headersAsObject = convertHeadersToObject(fetchOptions.headers);\n\n  // TODO: we probably should just log these headers during telemetry logging instead of doing this mutable header stuff\n  fetchOptions.headers = {\n    ...headersAsObject,\n    \"Alchemy-AA-Sdk-Version\": VERSION,\n  };\n\n  if (connectionConfig.jwt != null) {\n    fetchOptions.headers = {\n      ...fetchOptions.headers,\n      Authorization: `Bearer ${connectionConfig.jwt}`,\n    };\n  }\n\n  const transport: AlchemyTransportBase = (opts) => {\n    const { chain: chain_ } = opts;\n    if (!chain_) {\n      throw new ChainNotFoundError();\n    }\n    const chain = AlchemyChainSchema.parse(chain_);\n\n    const rpcUrl =\n      connectionConfig.rpcUrl == null\n        ? `${chain.rpcUrls.alchemy.http[0]}/${connectionConfig.apiKey ?? \"\"}`\n        : connectionConfig.rpcUrl;\n\n    const innerTransport = (() => {\n      if (config.alchemyConnection && config.nodeRpcUrl) {\n        return split({\n          overrides: [\n            {\n              methods: alchemyMethods,\n              transport: http(rpcUrl, { fetchOptions }),\n            },\n          ],\n          fallback: http(config.nodeRpcUrl, {\n            fetchOptions: config.fetchOptions,\n          }),\n        });\n      }\n\n      return http(rpcUrl, { fetchOptions });\n    })();\n\n    return createTransport(\n      {\n        key: \"alchemy\",\n        name: \"Alchemy Transport\",\n        request: innerTransport(opts).request,\n        retryCount: retryCount ?? opts?.retryCount,\n        retryDelay,\n        type: \"alchemy\",\n      },\n      { alchemyRpcUrl: rpcUrl, fetchOptions }\n    );\n  };\n\n  return Object.assign(transport, {\n    updateHeaders(newHeaders_: HeadersInit) {\n      const newHeaders = convertHeadersToObject(newHeaders_);\n\n      fetchOptions.headers = {\n        ...fetchOptions.headers,\n        ...newHeaders,\n      };\n    },\n    config,\n  });\n}\n\nconst convertHeadersToObject = (\n  headers?: HeadersInit\n): Record<string, string> => {\n  if (!headers) {\n    return {};\n  }\n\n  if (headers instanceof Headers) {\n    const headersObject = {} as Record<string, string>;\n    headers.forEach((value, key) => {\n      headersObject[key] = value;\n    });\n    return headersObject;\n  }\n\n  if (Array.isArray(headers)) {\n    return headers.reduce((acc, header) => {\n      acc[header[0]] = header[1];\n      return acc;\n    }, {} as Record<string, string>);\n  }\n\n  return headers;\n};\n"]}
+{"version":3,"file":"alchemyTransport.js","sourceRoot":"","sources":["../../src/alchemyTransport.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ChainNotFoundError,\n  ConnectionConfigSchema,\n  split,\n  type ConnectionConfig,\n  type NoUndefined,\n} from \"@aa-sdk/core\";\nimport {\n  createTransport,\n  http,\n  type Chain,\n  type EIP1193RequestFn,\n  type HttpTransportConfig,\n  type PublicRpcSchema,\n  type Transport,\n  type TransportConfig,\n} from \"viem\";\nimport type { AlchemyRpcSchema } from \"./client/types.js\";\nimport { AlchemyChainSchema } from \"./schema.js\";\nimport { VERSION } from \"./version.js\";\n\ntype Never<T> = T extends object\n  ? {\n      [K in keyof T]?: never;\n    }\n  : never;\n\ntype SplitTransportConfig = {\n  alchemyConnection: ConnectionConfig;\n  nodeRpcUrl: string;\n};\n\nconst alchemyMethods = [\n  \"eth_sendUserOperation\",\n  \"eth_estimateUserOperationGas\",\n  \"eth_getUserOperationReceipt\",\n  \"eth_getUserOperationByHash\",\n  \"eth_supportedEntryPoints\",\n  \"rundler_maxPriorityFeePerGas\",\n  \"pm_getPaymasterData\",\n  \"pm_getPaymasterStubData\",\n];\n\nexport type AlchemyTransportConfig = (\n  | (ConnectionConfig & Never<SplitTransportConfig>)\n  | (SplitTransportConfig & Never<ConnectionConfig>)\n) & {\n  /** The max number of times to retry. */\n  retryCount?: TransportConfig[\"retryCount\"] | undefined;\n  /** The base delay (in ms) between retries. */\n  retryDelay?: TransportConfig[\"retryDelay\"] | undefined;\n  fetchOptions?: NoUndefined<HttpTransportConfig[\"fetchOptions\"]>;\n};\n\ntype AlchemyTransportBase = Transport<\n  \"alchemy\",\n  {\n    alchemyRpcUrl: string;\n    fetchOptions?: AlchemyTransportConfig[\"fetchOptions\"];\n  },\n  EIP1193RequestFn<[...PublicRpcSchema, ...AlchemyRpcSchema]>\n>;\n\nexport type AlchemyTransport = AlchemyTransportBase & {\n  updateHeaders(newHeaders: HeadersInit): void;\n  config: AlchemyTransportConfig;\n};\n\n/**\n * A type guard for the transport to determine if it is an Alchemy transport.\n * Used in cases where we would like to do switching depending on the transport, where there used\n * to be two clients for a alchemy and a non alchemy, and with this switch we don't need the two seperate clients. *\n *\n * @param {Transport} transport The transport to check\n * @param {Chain} chain Chain for the transport to run its function to return the transport config\n * @returns {boolean} `true` if the transport is an Alchemy transport, otherwise `false`\n */\nexport function isAlchemyTransport(\n  transport: Transport,\n  chain: Chain\n): transport is AlchemyTransport {\n  return transport({ chain }).config.type === \"alchemy\";\n}\n\n/**\n * Creates an Alchemy transport with the specified configuration options.\n * When sending all traffic to Alchemy, you must pass in one of rpcUrl, apiKey, or jwt.\n * If you want to send Bundler and Paymaster traffic to Alchemy and Node traffic to a different RPC, you must pass in alchemyConnection and nodeRpcUrl.\n *\n * @example\n * ### Basic Example\n * If the chain you're using is supported for both Bundler and Node RPCs, then you can do the following:\n * ```ts\n * import { alchemy } from \"@account-kit/infra\";\n *\n * const transport = alchemy({\n *  // NOTE: you can also pass in an rpcUrl or jwt here or rpcUrl and jwt\n *  apiKey: \"your-api-key\",\n * });\n * ```\n *\n * ### AA Only Chains\n * For AA-only chains, you need to specify the alchemyConnection and nodeRpcUrl since Alchemy only\n * handles the Bundler and Paymaster RPCs for these chains.\n * ```ts\n * import { alchemy } from \"@account-kit/infra\";\n *\n * const transport = alchemy({\n *  alchemyConnection: {\n *    apiKey: \"your-api-key\",\n *  },\n *  nodeRpcUrl: \"https://zora.rpc.url\",\n * });\n * ```\n *\n * @param {AlchemyTransportConfig} config The configuration object for the Alchemy transport.\n * @param {number} config.retryDelay Optional The delay between retries, in milliseconds.\n * @param {number} config.retryCount Optional The number of retry attempts.\n * @param {string} [config.alchemyConnection] Optional Alchemy connection configuration (if this is passed in, nodeRpcUrl is required).\n * @param {string} [config.fetchOptions] Optional fetch options for HTTP requests.\n * @param {string} [config.nodeRpcUrl] Optional RPC URL for node (if this is passed in, alchemyConnection is required).\n * @param {string} [config.rpcUrl] Optional RPC URL.\n * @param {string} [config.apiKey] Optional API key for Alchemy.\n * @param {string} [config.jwt] Optional JSON Web Token for authorization.\n * @returns {AlchemyTransport} The configured Alchemy transport object.\n */\nexport function alchemy(config: AlchemyTransportConfig): AlchemyTransport {\n  const { retryDelay, retryCount } = config;\n  // we create a copy here in case we create a split transport down below\n  // we don't want to add alchemy headers to 3rd party nodes\n  const fetchOptions = { ...config.fetchOptions };\n\n  const connectionConfig = ConnectionConfigSchema.parse(\n    config.alchemyConnection ?? config\n  );\n\n  const headersAsObject = convertHeadersToObject(fetchOptions.headers);\n\n  // TODO: we probably should just log these headers during telemetry logging instead of doing this mutable header stuff\n  fetchOptions.headers = {\n    ...headersAsObject,\n    \"Alchemy-AA-Sdk-Version\": VERSION,\n  };\n\n  if (connectionConfig.jwt != null) {\n    fetchOptions.headers = {\n      ...fetchOptions.headers,\n      Authorization: `Bearer ${connectionConfig.jwt}`,\n    };\n  }\n\n  const transport: AlchemyTransportBase = (opts) => {\n    const { chain: chain_ } = opts;\n    if (!chain_) {\n      throw new ChainNotFoundError();\n    }\n    const chain = AlchemyChainSchema.parse(chain_);\n\n    const rpcUrl =\n      connectionConfig.rpcUrl == null\n        ? `${chain.rpcUrls.alchemy.http[0]}/${connectionConfig.apiKey ?? \"\"}`\n        : connectionConfig.rpcUrl;\n\n    const innerTransport = (() => {\n      if (config.alchemyConnection && config.nodeRpcUrl) {\n        return split({\n          overrides: [\n            {\n              methods: alchemyMethods,\n              transport: http(rpcUrl, { fetchOptions }),\n            },\n          ],\n          fallback: http(config.nodeRpcUrl, {\n            fetchOptions: config.fetchOptions,\n          }),\n        });\n      }\n\n      return http(rpcUrl, { fetchOptions });\n    })();\n\n    return createTransport(\n      {\n        key: \"alchemy\",\n        name: \"Alchemy Transport\",\n        request: innerTransport(opts).request,\n        retryCount: retryCount ?? opts?.retryCount,\n        retryDelay,\n        type: \"alchemy\",\n      },\n      { alchemyRpcUrl: rpcUrl, fetchOptions }\n    );\n  };\n\n  return Object.assign(transport, {\n    updateHeaders(newHeaders_: HeadersInit) {\n      const newHeaders = convertHeadersToObject(newHeaders_);\n\n      fetchOptions.headers = {\n        ...fetchOptions.headers,\n        ...newHeaders,\n      };\n    },\n    config,\n  });\n}\n\nconst convertHeadersToObject = (\n  headers?: HeadersInit\n): Record<string, string> => {\n  if (!headers) {\n    return {};\n  }\n\n  if (headers instanceof Headers) {\n    const headersObject = {} as Record<string, string>;\n    headers.forEach((value, key) => {\n      headersObject[key] = value;\n    });\n    return headersObject;\n  }\n\n  if (Array.isArray(headers)) {\n    return headers.reduce((acc, header) => {\n      acc[header[0]] = header[1];\n      return acc;\n    }, {} as Record<string, string>);\n  }\n\n  return headers;\n};\n"]}

package/dist/esm/client/smartAccountClient.js

@@ -2,7 +2,7 @@ import { ChainNotFoundError, createSmartAccountClient, isSmartAccountWithSigner,
 import {} from "viem";
 import { getDefaultUserOperationFeeOptions } from "../defaults.js";
 import { alchemyFeeEstimator } from "../middleware/feeEstimator.js";
-import { alchemyGasAndPaymasterAndDataMiddleware } from "../middleware/gasManager.js";
+import { alchemyGasManagerMiddleware } from "../middleware/gasManager.js";
 import { alchemyUserOperationSimulator } from "../middleware/userOperationSimulator.js";
 import { alchemyActions, } from "./decorators/smartAccount.js";
 export function getSignerTypeHeader(account) {
@@ -30,9 +30,6 @@ export function createAlchemySmartAccountClient({ account, policyId, useSimulati
         throw new ChainNotFoundError();
     }
     const feeOptions = opts?.feeOptions ?? getDefaultUserOperationFeeOptions(chain);
-    const gasAndPaymasterAndDataMiddleware = policyId
-        ? alchemyGasAndPaymasterAndDataMiddleware(policyId)
-        : undefined;
     const scaClient = createSmartAccountClient({
         account,
         transport,
@@ -42,21 +39,18 @@ export function createAlchemySmartAccountClient({ account, policyId, useSimulati
             ...opts,
             feeOptions,
         },
-        dummyPaymasterAndData: gasAndPaymasterAndDataMiddleware?.dummyPaymasterAndData,
-        feeEstimator: feeEstimator ??
-            gasAndPaymasterAndDataMiddleware?.feeEstimator ??
-            alchemyFeeEstimator(transport),
-        gasEstimator: gasEstimator ?? gasAndPaymasterAndDataMiddleware?.gasEstimator,
         customMiddleware: async (struct, args) => {
             if (isSmartAccountWithSigner(args.account)) {
                 transport.updateHeaders(getSignerTypeHeader(args.account));
             }
             return customMiddleware ? customMiddleware(struct, args) : struct;
         },
-        paymasterAndData: gasAndPaymasterAndDataMiddleware?.paymasterAndData,
+        feeEstimator: feeEstimator ?? alchemyFeeEstimator(transport),
         userOperationSimulator: useSimulation
             ? alchemyUserOperationSimulator(transport)
             : undefined,
+        gasEstimator,
+        ...(policyId && alchemyGasManagerMiddleware(policyId)),
         signUserOperation,
     }).extend(alchemyActions);
     if (account && isSmartAccountWithSigner(account)) {

package/dist/esm/client/smartAccountClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"smartAccountClient.js","sourceRoot":"","sources":["../../../src/client/smartAccountClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,wBAAwB,GASzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAc,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,uCAAuC,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EACL,cAAc,GAEf,MAAM,8BAA8B,CAAC;AAGtC,MAAM,UAAU,mBAAmB,CAEjC,OAAiB;IACjB,OAAO,EAAE,uBAAuB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;AACrE,CAAC;AAiFD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,+BAA+B,CAAC,EAC9C,OAAO,EACP,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,KAAK,EACL,IAAI,GAC4B;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,UAAU,GACd,IAAI,EAAE,UAAU,IAAI,iCAAiC,CAAC,KAAK,CAAC,CAAC;IAE/D,MAAM,gCAAgC,GAAG,QAAQ;QAC/C,CAAC,CAAC,uCAAuC,CAAC,QAAQ,CAAC;QACnD,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,SAAS,GAAG,wBAAwB,CAAC;QACzC,OAAO;QACP,SAAS;QACT,KAAK;QACL,IAAI,EAAE,2BAA2B;QACjC,IAAI,EAAE;YACJ,GAAG,IAAI;YACP,UAAU;SACX;QACD,qBAAqB,EACnB,gCAAgC,EAAE,qBAAqB;QACzD,YAAY,EACV,YAAY;YACZ,gCAAgC,EAAE,YAAY;YAC9C,mBAAmB,CAAC,SAAS,CAAC;QAChC,YAAY,EACV,YAAY,IAAI,gCAAgC,EAAE,YAAY;QAChE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YACvC,IAAI,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3C,SAAS,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,OAAO,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACpE,CAAC;QACD,gBAAgB,EAAE,gCAAgC,EAAE,gBAAgB;QACpE,sBAAsB,EAAE,aAAa;YACnC,CAAC,CAAC,6BAA6B,CAAC,SAAS,CAAC;YAC1C,CAAC,CAAC,SAAS;QACb,iBAAiB;KAClB,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE1B,IAAI,OAAO,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,SAAS,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import {\n  ChainNotFoundError,\n  createSmartAccountClient,\n  isSmartAccountWithSigner,\n  type Prettify,\n  type SmartAccountClient,\n  type SmartAccountClientActions,\n  type SmartAccountClientConfig,\n  type SmartAccountClientRpcSchema,\n  type SmartContractAccount,\n  type SmartContractAccountWithSigner,\n  type UserOperationContext,\n} from \"@aa-sdk/core\";\nimport { type Chain } from \"viem\";\nimport type { AlchemyTransport } from \"../alchemyTransport.js\";\nimport { getDefaultUserOperationFeeOptions } from \"../defaults.js\";\nimport { alchemyFeeEstimator } from \"../middleware/feeEstimator.js\";\nimport { alchemyGasAndPaymasterAndDataMiddleware } from \"../middleware/gasManager.js\";\nimport { alchemyUserOperationSimulator } from \"../middleware/userOperationSimulator.js\";\nimport {\n  alchemyActions,\n  type AlchemySmartAccountClientActions,\n} from \"./decorators/smartAccount.js\";\nimport type { AlchemyRpcSchema } from \"./types.js\";\n\nexport function getSignerTypeHeader<\n  TAccount extends SmartContractAccountWithSigner\n>(account: TAccount) {\n  return { \"Alchemy-Aa-Sdk-Signer\": account.getSigner().signerType };\n}\n\n// #region AlchemySmartAccountClientConfig\nexport type AlchemySmartAccountClientConfig<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = {\n  account?: account;\n  useSimulation?: boolean;\n  policyId?: string;\n} & Pick<\n  SmartAccountClientConfig<AlchemyTransport, chain, account, context>,\n  | \"customMiddleware\"\n  | \"feeEstimator\"\n  | \"gasEstimator\"\n  | \"signUserOperation\"\n  | \"transport\"\n  | \"chain\"\n  | \"opts\"\n>;\n// #endregion AlchemySmartAccountClientConfig\n\nexport type BaseAlchemyActions<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = SmartAccountClientActions<chain, account, context> &\n  AlchemySmartAccountClientActions<account, context>;\n\nexport type AlchemySmartAccountClient_Base<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  actions extends Record<string, unknown> = Record<string, unknown>,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = Prettify<\n  SmartAccountClient<\n    AlchemyTransport,\n    chain,\n    account,\n    actions & BaseAlchemyActions<chain, account, context>,\n    [...SmartAccountClientRpcSchema, ...AlchemyRpcSchema],\n    context\n  >\n>;\n\nexport type AlchemySmartAccountClient<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  actions extends Record<string, unknown> = Record<string, unknown>,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = Prettify<AlchemySmartAccountClient_Base<chain, account, actions, context>>;\n\nexport function createAlchemySmartAccountClient<\n  TChain extends Chain = Chain,\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  TContext extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n>(\n  params: AlchemySmartAccountClientConfig<TChain, TAccount, TContext>\n): AlchemySmartAccountClient<TChain, TAccount, Record<string, never>, TContext>;\n\n/**\n * Creates an Alchemy smart account client using the provided configuration options, including account details, gas manager configuration, and custom middleware.\n *\n * @example\n * ```ts\n * import { createAlchemySmartAccountClient, alchemy } from \"@account-kit/infra\";\n * import { sepolia } from \"@account-kit/infra/chain\";\n *\n * const client = createAlchemySmartAccountClient({\n *  chain: sepolia,\n *  transport: alchemy({ apiKey: \"your-api-key\" }),\n * });\n * ```\n *\n * @param {AlchemySmartAccountClientConfig} config The configuration for creating the Alchemy smart account client\n * @returns {AlchemySmartAccountClient} An instance of `AlchemySmartAccountClient` configured based on the provided options\n */\nexport function createAlchemySmartAccountClient({\n  account,\n  policyId,\n  useSimulation,\n  feeEstimator,\n  customMiddleware,\n  gasEstimator,\n  signUserOperation,\n  transport,\n  chain,\n  opts,\n}: AlchemySmartAccountClientConfig): AlchemySmartAccountClient {\n  if (!chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const feeOptions =\n    opts?.feeOptions ?? getDefaultUserOperationFeeOptions(chain);\n\n  const gasAndPaymasterAndDataMiddleware = policyId\n    ? alchemyGasAndPaymasterAndDataMiddleware(policyId)\n    : undefined;\n\n  const scaClient = createSmartAccountClient({\n    account,\n    transport,\n    chain,\n    type: \"AlchemySmartAccountClient\",\n    opts: {\n      ...opts,\n      feeOptions,\n    },\n    dummyPaymasterAndData:\n      gasAndPaymasterAndDataMiddleware?.dummyPaymasterAndData,\n    feeEstimator:\n      feeEstimator ??\n      gasAndPaymasterAndDataMiddleware?.feeEstimator ??\n      alchemyFeeEstimator(transport),\n    gasEstimator:\n      gasEstimator ?? gasAndPaymasterAndDataMiddleware?.gasEstimator,\n    customMiddleware: async (struct, args) => {\n      if (isSmartAccountWithSigner(args.account)) {\n        transport.updateHeaders(getSignerTypeHeader(args.account));\n      }\n      return customMiddleware ? customMiddleware(struct, args) : struct;\n    },\n    paymasterAndData: gasAndPaymasterAndDataMiddleware?.paymasterAndData,\n    userOperationSimulator: useSimulation\n      ? alchemyUserOperationSimulator(transport)\n      : undefined,\n    signUserOperation,\n  }).extend(alchemyActions);\n\n  if (account && isSmartAccountWithSigner(account)) {\n    transport.updateHeaders(getSignerTypeHeader(account));\n  }\n\n  return scaClient;\n}\n"]}
+{"version":3,"file":"smartAccountClient.js","sourceRoot":"","sources":["../../../src/client/smartAccountClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,wBAAwB,GASzB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAc,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EACL,cAAc,GAEf,MAAM,8BAA8B,CAAC;AAGtC,MAAM,UAAU,mBAAmB,CAEjC,OAAiB;IACjB,OAAO,EAAE,uBAAuB,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;AACrE,CAAC;AAiFD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,+BAA+B,CAAC,EAC9C,OAAO,EACP,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,KAAK,EACL,IAAI,GAC4B;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,UAAU,GACd,IAAI,EAAE,UAAU,IAAI,iCAAiC,CAAC,KAAK,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,wBAAwB,CAAC;QACzC,OAAO;QACP,SAAS;QACT,KAAK;QACL,IAAI,EAAE,2BAA2B;QACjC,IAAI,EAAE;YACJ,GAAG,IAAI;YACP,UAAU;SACX;QACD,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YACvC,IAAI,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3C,SAAS,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,OAAO,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACpE,CAAC;QACD,YAAY,EAAE,YAAY,IAAI,mBAAmB,CAAC,SAAS,CAAC;QAC5D,sBAAsB,EAAE,aAAa;YACnC,CAAC,CAAC,6BAA6B,CAAC,SAAS,CAAC;YAC1C,CAAC,CAAC,SAAS;QACb,YAAY;QACZ,GAAG,CAAC,QAAQ,IAAI,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QACtD,iBAAiB;KAClB,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAE1B,IAAI,OAAO,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,SAAS,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import {\n  ChainNotFoundError,\n  createSmartAccountClient,\n  isSmartAccountWithSigner,\n  type Prettify,\n  type SmartAccountClient,\n  type SmartAccountClientActions,\n  type SmartAccountClientConfig,\n  type SmartAccountClientRpcSchema,\n  type SmartContractAccount,\n  type SmartContractAccountWithSigner,\n  type UserOperationContext,\n} from \"@aa-sdk/core\";\nimport { type Chain } from \"viem\";\nimport type { AlchemyTransport } from \"../alchemyTransport.js\";\nimport { getDefaultUserOperationFeeOptions } from \"../defaults.js\";\nimport { alchemyFeeEstimator } from \"../middleware/feeEstimator.js\";\nimport { alchemyGasManagerMiddleware } from \"../middleware/gasManager.js\";\nimport { alchemyUserOperationSimulator } from \"../middleware/userOperationSimulator.js\";\nimport {\n  alchemyActions,\n  type AlchemySmartAccountClientActions,\n} from \"./decorators/smartAccount.js\";\nimport type { AlchemyRpcSchema } from \"./types.js\";\n\nexport function getSignerTypeHeader<\n  TAccount extends SmartContractAccountWithSigner\n>(account: TAccount) {\n  return { \"Alchemy-Aa-Sdk-Signer\": account.getSigner().signerType };\n}\n\n// #region AlchemySmartAccountClientConfig\nexport type AlchemySmartAccountClientConfig<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = {\n  account?: account;\n  useSimulation?: boolean;\n  policyId?: string;\n} & Pick<\n  SmartAccountClientConfig<AlchemyTransport, chain, account, context>,\n  | \"customMiddleware\"\n  | \"feeEstimator\"\n  | \"gasEstimator\"\n  | \"signUserOperation\"\n  | \"transport\"\n  | \"chain\"\n  | \"opts\"\n>;\n// #endregion AlchemySmartAccountClientConfig\n\nexport type BaseAlchemyActions<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = SmartAccountClientActions<chain, account, context> &\n  AlchemySmartAccountClientActions<account, context>;\n\nexport type AlchemySmartAccountClient_Base<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  actions extends Record<string, unknown> = Record<string, unknown>,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = Prettify<\n  SmartAccountClient<\n    AlchemyTransport,\n    chain,\n    account,\n    actions & BaseAlchemyActions<chain, account, context>,\n    [...SmartAccountClientRpcSchema, ...AlchemyRpcSchema],\n    context\n  >\n>;\n\nexport type AlchemySmartAccountClient<\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  actions extends Record<string, unknown> = Record<string, unknown>,\n  context extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = Prettify<AlchemySmartAccountClient_Base<chain, account, actions, context>>;\n\nexport function createAlchemySmartAccountClient<\n  TChain extends Chain = Chain,\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined,\n  TContext extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n>(\n  params: AlchemySmartAccountClientConfig<TChain, TAccount, TContext>\n): AlchemySmartAccountClient<TChain, TAccount, Record<string, never>, TContext>;\n\n/**\n * Creates an Alchemy smart account client using the provided configuration options, including account details, gas manager configuration, and custom middleware.\n *\n * @example\n * ```ts\n * import { createAlchemySmartAccountClient, alchemy } from \"@account-kit/infra\";\n * import { sepolia } from \"@account-kit/infra/chain\";\n *\n * const client = createAlchemySmartAccountClient({\n *  chain: sepolia,\n *  transport: alchemy({ apiKey: \"your-api-key\" }),\n * });\n * ```\n *\n * @param {AlchemySmartAccountClientConfig} config The configuration for creating the Alchemy smart account client\n * @returns {AlchemySmartAccountClient} An instance of `AlchemySmartAccountClient` configured based on the provided options\n */\nexport function createAlchemySmartAccountClient({\n  account,\n  policyId,\n  useSimulation,\n  feeEstimator,\n  customMiddleware,\n  gasEstimator,\n  signUserOperation,\n  transport,\n  chain,\n  opts,\n}: AlchemySmartAccountClientConfig): AlchemySmartAccountClient {\n  if (!chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const feeOptions =\n    opts?.feeOptions ?? getDefaultUserOperationFeeOptions(chain);\n\n  const scaClient = createSmartAccountClient({\n    account,\n    transport,\n    chain,\n    type: \"AlchemySmartAccountClient\",\n    opts: {\n      ...opts,\n      feeOptions,\n    },\n    customMiddleware: async (struct, args) => {\n      if (isSmartAccountWithSigner(args.account)) {\n        transport.updateHeaders(getSignerTypeHeader(args.account));\n      }\n      return customMiddleware ? customMiddleware(struct, args) : struct;\n    },\n    feeEstimator: feeEstimator ?? alchemyFeeEstimator(transport),\n    userOperationSimulator: useSimulation\n      ? alchemyUserOperationSimulator(transport)\n      : undefined,\n    gasEstimator,\n    ...(policyId && alchemyGasManagerMiddleware(policyId)),\n    signUserOperation,\n  }).extend(alchemyActions);\n\n  if (account && isSmartAccountWithSigner(account)) {\n    transport.updateHeaders(getSignerTypeHeader(account));\n  }\n\n  return scaClient;\n}\n"]}

package/dist/esm/client/types.d.ts

@@ -1,5 +1,5 @@
 import { type BundlerClient, type Erc7677RpcSchema, type UserOperationRequest } from "@aa-sdk/core";
-import type { SimulateUserOperationAssetChangesRequest, SimulateUserOperationAssetChangesResponse, RequestGasAndPaymasterAndDataRequest, RequestGasAndPaymasterAndDataResponse } from "../actions/types";
+import type { SimulateUserOperationAssetChangesRequest, SimulateUserOperationAssetChangesResponse } from "../actions/types";
 import type { AlchemyTransport } from "../alchemyTransport";
 export type AlchemyRpcSchema = [
     {
@@ -14,12 +14,7 @@ export type AlchemyRpcSchema = [
     },
     ...Erc7677RpcSchema<{
         policyId: string;
-    }>,
-    {
-        Method: "alchemy_requestGasAndPaymasterAndData";
-        Parameters: RequestGasAndPaymasterAndDataRequest;
-        ReturnType: RequestGasAndPaymasterAndDataResponse;
-    }
+    }>
 ];
 export type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {
     request: BundlerClient<AlchemyTransport>["request"] & {
@@ -31,9 +26,5 @@ export type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {
             method: "rundler_maxPriorityFeePerGas";
             params: [];
         }): Promise<UserOperationRequest["maxPriorityFeePerGas"]>;
-        request(args: {
-            method: "alchemy_requestGasAndPaymasterAndData";
-            params: RequestGasAndPaymasterAndDataRequest;
-        }): Promise<RequestGasAndPaymasterAndDataResponse>;
     }["request"];
 };

package/dist/esm/client/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,MAAM,cAAc,CAAC","sourcesContent":["import {\n  type BundlerClient,\n  type Erc7677RpcSchema,\n  type UserOperationRequest,\n} from \"@aa-sdk/core\";\nimport type {\n  SimulateUserOperationAssetChangesRequest,\n  SimulateUserOperationAssetChangesResponse,\n  RequestGasAndPaymasterAndDataRequest,\n  RequestGasAndPaymasterAndDataResponse,\n} from \"../actions/types\";\nimport type { AlchemyTransport } from \"../alchemyTransport\";\n\nexport type AlchemyRpcSchema = [\n  {\n    Method: \"alchemy_simulateUserOperationAssetChanges\";\n    Parameters: SimulateUserOperationAssetChangesRequest;\n    ReturnType: SimulateUserOperationAssetChangesResponse;\n  },\n  {\n    Method: \"rundler_maxPriorityFeePerGas\";\n    Parameters: [];\n    ReturnType: UserOperationRequest[\"maxPriorityFeePerGas\"];\n  },\n  ...Erc7677RpcSchema<{ policyId: string }>,\n  {\n    Method: \"alchemy_requestGasAndPaymasterAndData\";\n    Parameters: RequestGasAndPaymasterAndDataRequest;\n    ReturnType: RequestGasAndPaymasterAndDataResponse;\n  }\n];\n\nexport type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {\n  request: BundlerClient<AlchemyTransport>[\"request\"] &\n    {\n      request(args: {\n        method: \"alchemy_simulateUserOperationAssetChanges\";\n        params: SimulateUserOperationAssetChangesRequest;\n      }): Promise<SimulateUserOperationAssetChangesResponse>;\n\n      request(args: {\n        method: \"rundler_maxPriorityFeePerGas\";\n        params: [];\n      }): Promise<UserOperationRequest[\"maxPriorityFeePerGas\"]>;\n\n      request(args: {\n        method: \"alchemy_requestGasAndPaymasterAndData\";\n        params: RequestGasAndPaymasterAndDataRequest;\n      }): Promise<RequestGasAndPaymasterAndDataResponse>;\n    }[\"request\"];\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,MAAM,cAAc,CAAC","sourcesContent":["import {\n  type BundlerClient,\n  type Erc7677RpcSchema,\n  type UserOperationRequest,\n} from \"@aa-sdk/core\";\nimport type {\n  SimulateUserOperationAssetChangesRequest,\n  SimulateUserOperationAssetChangesResponse,\n} from \"../actions/types\";\nimport type { AlchemyTransport } from \"../alchemyTransport\";\n\nexport type AlchemyRpcSchema = [\n  {\n    Method: \"alchemy_simulateUserOperationAssetChanges\";\n    Parameters: SimulateUserOperationAssetChangesRequest;\n    ReturnType: SimulateUserOperationAssetChangesResponse;\n  },\n  {\n    Method: \"rundler_maxPriorityFeePerGas\";\n    Parameters: [];\n    ReturnType: UserOperationRequest[\"maxPriorityFeePerGas\"];\n  },\n  ...Erc7677RpcSchema<{ policyId: string }>\n];\n\nexport type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {\n  request: BundlerClient<AlchemyTransport>[\"request\"] &\n    {\n      request(args: {\n        method: \"alchemy_simulateUserOperationAssetChanges\";\n        params: SimulateUserOperationAssetChangesRequest;\n      }): Promise<SimulateUserOperationAssetChangesResponse>;\n\n      request(args: {\n        method: \"rundler_maxPriorityFeePerGas\";\n        params: [];\n      }): Promise<UserOperationRequest[\"maxPriorityFeePerGas\"]>;\n    }[\"request\"];\n};\n"]}

package/dist/esm/index.d.ts

@@ -19,6 +19,6 @@ export { getDefaultUserOperationFeeOptions } from "./defaults.js";
 export { getAlchemyPaymasterAddress } from "./gas-manager.js";
 export { alchemyFeeEstimator } from "./middleware/feeEstimator.js";
 export type * from "./middleware/gasManager.js";
-export { alchemyGasManagerMiddleware, alchemyGasAndPaymasterAndDataMiddleware, } from "./middleware/gasManager.js";
+export { alchemyGasManagerMiddleware } from "./middleware/gasManager.js";
 export { alchemyUserOperationSimulator } from "./middleware/userOperationSimulator.js";
 export type * from "./schema.js";

package/dist/esm/index.js

@@ -9,6 +9,6 @@ export { createAlchemySmartAccountClient } from "./client/smartAccountClient.js"
 export { getDefaultUserOperationFeeOptions } from "./defaults.js";
 export { getAlchemyPaymasterAddress } from "./gas-manager.js";
 export { alchemyFeeEstimator } from "./middleware/feeEstimator.js";
-export { alchemyGasManagerMiddleware, alchemyGasAndPaymasterAndDataMiddleware, } from "./middleware/gasManager.js";
+export { alchemyGasManagerMiddleware } from "./middleware/gasManager.js";
 export { alchemyUserOperationSimulator } from "./middleware/userOperationSimulator.js";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAGzF,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEpE,OAAO,EACL,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,IAAI,EACJ,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,cAAc,EACd,MAAM,EACN,OAAO,EACP,QAAQ,EACR,cAAc,EACd,eAAe,EACf,OAAO,EACP,WAAW,EACX,aAAa,EACb,OAAO,EACP,KAAK,EACL,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,IAAI,EACJ,WAAW,EACX,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,cAAc,EACd,eAAe,EACf,eAAe,EACf,UAAU,EACV,UAAU,EACV,MAAM,GACP,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,OAAO,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EACL,2BAA2B,EAC3B,uCAAuC,GACxC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC","sourcesContent":["export type * from \"./actions/simulateUserOperationChanges.js\";\nexport { simulateUserOperationChanges } from \"./actions/simulateUserOperationChanges.js\";\nexport type * from \"./actions/types.js\";\nexport type * from \"./alchemyTransport.js\";\nexport { alchemy, isAlchemyTransport } from \"./alchemyTransport.js\";\nexport type * from \"./chains.js\";\nexport {\n  arbitrum,\n  arbitrumGoerli,\n  arbitrumNova,\n  arbitrumSepolia,\n  base,\n  baseGoerli,\n  baseSepolia,\n  defineAlchemyChain,\n  fraxtal,\n  fraxtalSepolia,\n  goerli,\n  mainnet,\n  optimism,\n  optimismGoerli,\n  optimismSepolia,\n  polygon,\n  polygonAmoy,\n  polygonMumbai,\n  sepolia,\n  shape,\n  shapeSepolia,\n  worldChain,\n  worldChainSepolia,\n  zora,\n  zoraSepolia,\n  beraChainBartio,\n  opbnbMainnet,\n  opbnbTestnet,\n  soneiumMinato,\n  soneiumMainnet,\n  unichainMainnet,\n  unichainSepolia,\n  inkMainnet,\n  inkSepolia,\n  mekong,\n} from \"./chains.js\";\nexport type * from \"./client/decorators/alchemyEnhancedApis.js\";\nexport { alchemyEnhancedApiActions } from \"./client/decorators/alchemyEnhancedApis.js\";\nexport type * from \"./client/decorators/smartAccount.js\";\nexport { alchemyActions } from \"./client/decorators/smartAccount.js\";\nexport { isAlchemySmartAccountClient } from \"./client/isAlchemySmartAccountClient.js\";\nexport type * from \"./client/rpcClient.js\";\nexport { createAlchemyPublicRpcClient } from \"./client/rpcClient.js\";\nexport type * from \"./client/smartAccountClient.js\";\nexport { createAlchemySmartAccountClient } from \"./client/smartAccountClient.js\";\nexport type * from \"./client/types.js\";\nexport { getDefaultUserOperationFeeOptions } from \"./defaults.js\";\nexport { getAlchemyPaymasterAddress } from \"./gas-manager.js\";\nexport { alchemyFeeEstimator } from \"./middleware/feeEstimator.js\";\nexport type * from \"./middleware/gasManager.js\";\nexport {\n  alchemyGasManagerMiddleware,\n  alchemyGasAndPaymasterAndDataMiddleware,\n} from \"./middleware/gasManager.js\";\nexport { alchemyUserOperationSimulator } from \"./middleware/userOperationSimulator.js\";\nexport type * from \"./schema.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAGzF,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEpE,OAAO,EACL,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,IAAI,EACJ,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,cAAc,EACd,MAAM,EACN,OAAO,EACP,QAAQ,EACR,cAAc,EACd,eAAe,EACf,OAAO,EACP,WAAW,EACX,aAAa,EACb,OAAO,EACP,KAAK,EACL,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,IAAI,EACJ,WAAW,EACX,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,cAAc,EACd,eAAe,EACf,eAAe,EACf,UAAU,EACV,UAAU,EACV,MAAM,GACP,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AAEvF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,OAAO,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC","sourcesContent":["export type * from \"./actions/simulateUserOperationChanges.js\";\nexport { simulateUserOperationChanges } from \"./actions/simulateUserOperationChanges.js\";\nexport type * from \"./actions/types.js\";\nexport type * from \"./alchemyTransport.js\";\nexport { alchemy, isAlchemyTransport } from \"./alchemyTransport.js\";\nexport type * from \"./chains.js\";\nexport {\n  arbitrum,\n  arbitrumGoerli,\n  arbitrumNova,\n  arbitrumSepolia,\n  base,\n  baseGoerli,\n  baseSepolia,\n  defineAlchemyChain,\n  fraxtal,\n  fraxtalSepolia,\n  goerli,\n  mainnet,\n  optimism,\n  optimismGoerli,\n  optimismSepolia,\n  polygon,\n  polygonAmoy,\n  polygonMumbai,\n  sepolia,\n  shape,\n  shapeSepolia,\n  worldChain,\n  worldChainSepolia,\n  zora,\n  zoraSepolia,\n  beraChainBartio,\n  opbnbMainnet,\n  opbnbTestnet,\n  soneiumMinato,\n  soneiumMainnet,\n  unichainMainnet,\n  unichainSepolia,\n  inkMainnet,\n  inkSepolia,\n  mekong,\n} from \"./chains.js\";\nexport type * from \"./client/decorators/alchemyEnhancedApis.js\";\nexport { alchemyEnhancedApiActions } from \"./client/decorators/alchemyEnhancedApis.js\";\nexport type * from \"./client/decorators/smartAccount.js\";\nexport { alchemyActions } from \"./client/decorators/smartAccount.js\";\nexport { isAlchemySmartAccountClient } from \"./client/isAlchemySmartAccountClient.js\";\nexport type * from \"./client/rpcClient.js\";\nexport { createAlchemyPublicRpcClient } from \"./client/rpcClient.js\";\nexport type * from \"./client/smartAccountClient.js\";\nexport { createAlchemySmartAccountClient } from \"./client/smartAccountClient.js\";\nexport type * from \"./client/types.js\";\nexport { getDefaultUserOperationFeeOptions } from \"./defaults.js\";\nexport { getAlchemyPaymasterAddress } from \"./gas-manager.js\";\nexport { alchemyFeeEstimator } from \"./middleware/feeEstimator.js\";\nexport type * from \"./middleware/gasManager.js\";\nexport { alchemyGasManagerMiddleware } from \"./middleware/gasManager.js\";\nexport { alchemyUserOperationSimulator } from \"./middleware/userOperationSimulator.js\";\nexport type * from \"./schema.js\";\n"]}

package/dist/esm/middleware/gasManager.d.ts

@@ -18,23 +18,3 @@ import type { ClientMiddlewareConfig } from "@aa-sdk/core";
  * @returns {Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`
  */
 export declare function alchemyGasManagerMiddleware(policyId: string): Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">;
-/**
- * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions using
- * the `alchemy_requestGasAndPaymasterAndData` method instead of standard ERC-7677 methods.
- *
- * @example
- *  ```ts
- * import { sepolia, alchemyGasAndPaymasterAndDataMiddleware } from "@account-kit/infra";
- * import { http } from "viem";
- *
- * const client = createSmartAccountClient({
- *  transport: http("rpc-url"),
- *  chain: sepolia,
- *  ...alchemyGasAndPaymasterAndDataMiddleware("policyId")
- * });
- * ```
- *
- * @param {string} policyId the policyId for Alchemy's gas manager
- * @returns {Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`
- */
-export declare function alchemyGasAndPaymasterAndDataMiddleware(policyId: string): Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "feeEstimator" | "gasEstimator" | "paymasterAndData">;

package/dist/esm/middleware/gasManager.js

@@ -1,6 +1,4 @@
-import { bypassPaymasterAndData, ChainNotFoundError, deepHexlify, defaultFeeEstimator, defaultGasEstimator, erc7677Middleware, filterUndefined, isBigNumberish, isMultiplier, noopMiddleware, resolveProperties, } from "@aa-sdk/core";
-import { getAlchemyPaymasterAddress } from "../gas-manager.js";
-import { fromHex, isHex } from "viem";
+import { erc7677Middleware } from "@aa-sdk/core";
 /**
  * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions.
  *
@@ -24,122 +22,4 @@ export function alchemyGasManagerMiddleware(policyId) {
         context: { policyId: policyId },
     });
 }
-/**
- * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions using
- * the `alchemy_requestGasAndPaymasterAndData` method instead of standard ERC-7677 methods.
- *
- * @example
- *  ```ts
- * import { sepolia, alchemyGasAndPaymasterAndDataMiddleware } from "@account-kit/infra";
- * import { http } from "viem";
- *
- * const client = createSmartAccountClient({
- *  transport: http("rpc-url"),
- *  chain: sepolia,
- *  ...alchemyGasAndPaymasterAndDataMiddleware("policyId")
- * });
- * ```
- *
- * @param {string} policyId the policyId for Alchemy's gas manager
- * @returns {Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`
- */
-export function alchemyGasAndPaymasterAndDataMiddleware(policyId) {
-    return {
-        dummyPaymasterAndData: async (uo, { client, account }) => {
-            if (!client.chain) {
-                throw new ChainNotFoundError();
-            }
-            const paymaster = getAlchemyPaymasterAddress(client.chain);
-            const paymasterData = await account.getDummySignature();
-            return {
-                ...uo,
-                dummyPaymasterAndData: {
-                    paymaster,
-                    paymasterData,
-                },
-            };
-        },
-        feeEstimator: (uo, args) => {
-            return bypassPaymasterAndData(args.overrides)
-                ? defaultFeeEstimator(args.client)(uo, args)
-                : noopMiddleware(uo, args);
-        },
-        gasEstimator: (uo, args) => {
-            return bypassPaymasterAndData(args.overrides)
-                ? defaultGasEstimator(args.client)(uo, args)
-                : noopMiddleware(uo, args);
-        },
-        paymasterAndData: async (uo, { account, client, feeOptions, overrides: overrides_ }) => {
-            if (!client.chain) {
-                throw new ChainNotFoundError();
-            }
-            const userOp = deepHexlify(await resolveProperties(uo));
-            const overrides = filterUndefined({
-                maxFeePerGas: overrideField("maxFeePerGas", overrides_, feeOptions, userOp),
-                maxPriorityFeePerGas: overrideField("maxPriorityFeePerGas", overrides_, feeOptions, userOp),
-                callGasLimit: overrideField("callGasLimit", overrides_, feeOptions, userOp),
-                verificationGasLimit: overrideField("verificationGasLimit", overrides_, feeOptions, userOp),
-                preVerificationGas: overrideField("preVerificationGas", overrides_, feeOptions, userOp),
-                ...(account.getEntryPoint().version === "0.7.0"
-                    ? {
-                        paymasterVerificationGasLimit: overrideField("paymasterVerificationGasLimit", overrides_, feeOptions, userOp),
-                        paymasterPostOpGasLimit: overrideField("paymasterPostOpGasLimit", overrides_, feeOptions, userOp),
-                    }
-                    : {}),
-            });
-            const result = await client.request({
-                method: "alchemy_requestGasAndPaymasterAndData",
-                params: [
-                    {
-                        policyId,
-                        entryPoint: account.getEntryPoint().address,
-                        userOperation: userOp,
-                        dummySignature: await account.getDummySignature(),
-                        overrides,
-                    },
-                ],
-            });
-            return {
-                ...uo,
-                ...result,
-            };
-        },
-    };
-}
-/**
- * Utility function to override a field in the user operation request with the overrides or fee options
- *
- * @template {EntryPointVersion} TEntryPointVersion
- * @param {keyof UserOperationFeeOptions<TEntryPointVersion>} field the field to override
- * @param {UserOperationOverrides<TEntryPointVersion> | undefined} overrides the overrides object
- * @param {UserOperationFeeOptions<TEntryPointVersion> | undefined} feeOptions the fee options object from the client
- * @param {UserOperationRequest<TEntryPointVersion>} userOperation the user operation request
- * @returns {Hex | Multiplier | undefined} the overridden field value
- */
-const overrideField = (field, overrides, feeOptions, userOperation) => {
-    let _field = field;
-    if (overrides?.[_field] != null) {
-        // one-off absolute override
-        if (isBigNumberish(overrides[_field])) {
-            return deepHexlify(overrides[_field]);
-        }
-        // one-off multiplier overrides
-        else {
-            return {
-                multiplier: Number(overrides[_field].multiplier),
-            };
-        }
-    }
-    // provider level fee options with multiplier
-    if (isMultiplier(feeOptions?.[field])) {
-        return {
-            multiplier: Number(feeOptions[field].multiplier),
-        };
-    }
-    const userOpField = userOperation[field];
-    if (isHex(userOpField) && fromHex(userOpField, "bigint") > 0n) {
-        return userOpField;
-    }
-    return undefined;
-};
 //# sourceMappingURL=gasManager.js.map

package/dist/esm/middleware/gasManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"gasManager.js","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  ClientMiddlewareConfig,\n  EntryPointVersion,\n  Multiplier,\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationRequest,\n} from \"@aa-sdk/core\";\nimport {\n  bypassPaymasterAndData,\n  ChainNotFoundError,\n  deepHexlify,\n  defaultFeeEstimator,\n  defaultGasEstimator,\n  erc7677Middleware,\n  filterUndefined,\n  isBigNumberish,\n  isMultiplier,\n  noopMiddleware,\n  resolveProperties,\n} from \"@aa-sdk/core\";\nimport { getAlchemyPaymasterAddress } from \"../gas-manager.js\";\nimport { fromHex, isHex, type Hex } from \"viem\";\nimport type { AlchemySmartAccountClient } from \"../client/smartAccountClient.js\";\n\n/**\n * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions.\n *\n * @example\n *  ```ts\n * import { sepolia, alchemyGasManagerMiddleware } from \"@account-kit/infra\";\n * import { http } from \"viem\";\n *\n * const client = createSmartAccountClient({\n *  transport: http(\"rpc-url\"),\n *  chain: sepolia,\n *  ...alchemyGasManagerMiddleware(\"policyId\")\n * });\n * ```\n *\n * @param {string} policyId the policyId for Alchemy's gas manager\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`\n */\nexport function alchemyGasManagerMiddleware(\n  policyId: string\n): Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\"> {\n  return erc7677Middleware<{ policyId: string }>({\n    context: { policyId: policyId },\n  });\n}\n\n/**\n * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions using\n * the `alchemy_requestGasAndPaymasterAndData` method instead of standard ERC-7677 methods.\n *\n * @example\n *  ```ts\n * import { sepolia, alchemyGasAndPaymasterAndDataMiddleware } from \"@account-kit/infra\";\n * import { http } from \"viem\";\n *\n * const client = createSmartAccountClient({\n *  transport: http(\"rpc-url\"),\n *  chain: sepolia,\n *  ...alchemyGasAndPaymasterAndDataMiddleware(\"policyId\")\n * });\n * ```\n *\n * @param {string} policyId the policyId for Alchemy's gas manager\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`\n */\nexport function alchemyGasAndPaymasterAndDataMiddleware(\n  policyId: string\n): Pick<\n  ClientMiddlewareConfig,\n  \"dummyPaymasterAndData\" | \"feeEstimator\" | \"gasEstimator\" | \"paymasterAndData\"\n> {\n  return {\n    dummyPaymasterAndData: async (uo, { client, account }) => {\n      if (!client.chain) {\n        throw new ChainNotFoundError();\n      }\n\n      const paymaster = getAlchemyPaymasterAddress(client.chain);\n      const paymasterData = await account.getDummySignature();\n\n      return {\n        ...uo,\n        dummyPaymasterAndData: {\n          paymaster,\n          paymasterData,\n        },\n      };\n    },\n    feeEstimator: (uo, args) => {\n      return bypassPaymasterAndData(args.overrides)\n        ? defaultFeeEstimator(args.client)(uo, args)\n        : noopMiddleware(uo, args);\n    },\n    gasEstimator: (uo, args) => {\n      return bypassPaymasterAndData(args.overrides)\n        ? defaultGasEstimator(args.client)(uo, args)\n        : noopMiddleware(uo, args);\n    },\n    paymasterAndData: async (\n      uo,\n      { account, client, feeOptions, overrides: overrides_ }\n    ) => {\n      if (!client.chain) {\n        throw new ChainNotFoundError();\n      }\n\n      const userOp = deepHexlify(await resolveProperties(uo));\n\n      const overrides: UserOperationOverrides = filterUndefined({\n        maxFeePerGas: overrideField(\n          \"maxFeePerGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp\n        ),\n        maxPriorityFeePerGas: overrideField(\n          \"maxPriorityFeePerGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp\n        ),\n        callGasLimit: overrideField(\n          \"callGasLimit\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp\n        ),\n        verificationGasLimit: overrideField(\n          \"verificationGasLimit\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp\n        ),\n        preVerificationGas: overrideField(\n          \"preVerificationGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp\n        ),\n        ...(account.getEntryPoint().version === \"0.7.0\"\n          ? {\n              paymasterVerificationGasLimit: overrideField<\"0.7.0\">(\n                \"paymasterVerificationGasLimit\",\n                overrides_ as UserOperationOverrides<\"0.7.0\">,\n                feeOptions,\n                userOp\n              ),\n              paymasterPostOpGasLimit: overrideField<\"0.7.0\">(\n                \"paymasterPostOpGasLimit\",\n                overrides_ as UserOperationOverrides<\"0.7.0\">,\n                feeOptions,\n                userOp\n              ),\n            }\n          : {}),\n      });\n\n      const result = await (client as AlchemySmartAccountClient).request({\n        method: \"alchemy_requestGasAndPaymasterAndData\",\n        params: [\n          {\n            policyId,\n            entryPoint: account.getEntryPoint().address,\n            userOperation: userOp,\n            dummySignature: await account.getDummySignature(),\n            overrides,\n          },\n        ],\n      });\n\n      return {\n        ...uo,\n        ...result,\n      };\n    },\n  };\n}\n\n/**\n * Utility function to override a field in the user operation request with the overrides or fee options\n *\n * @template {EntryPointVersion} TEntryPointVersion\n * @param {keyof UserOperationFeeOptions<TEntryPointVersion>} field the field to override\n * @param {UserOperationOverrides<TEntryPointVersion> | undefined} overrides the overrides object\n * @param {UserOperationFeeOptions<TEntryPointVersion> | undefined} feeOptions the fee options object from the client\n * @param {UserOperationRequest<TEntryPointVersion>} userOperation the user operation request\n * @returns {Hex | Multiplier | undefined} the overridden field value\n */\nconst overrideField = <\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n>(\n  field: keyof UserOperationFeeOptions<TEntryPointVersion>,\n  overrides: UserOperationOverrides<TEntryPointVersion> | undefined,\n  feeOptions: UserOperationFeeOptions<TEntryPointVersion> | undefined,\n  userOperation: UserOperationRequest<TEntryPointVersion>\n): Hex | Multiplier | undefined => {\n  let _field = field as keyof UserOperationOverrides<TEntryPointVersion>;\n\n  if (overrides?.[_field] != null) {\n    // one-off absolute override\n    if (isBigNumberish(overrides[_field])) {\n      return deepHexlify(overrides[_field]);\n    }\n    // one-off multiplier overrides\n    else {\n      return {\n        multiplier: Number((overrides[_field] as Multiplier).multiplier),\n      };\n    }\n  }\n\n  // provider level fee options with multiplier\n  if (isMultiplier(feeOptions?.[field])) {\n    return {\n      multiplier: Number((feeOptions![field] as Multiplier).multiplier),\n    };\n  }\n\n  const userOpField =\n    userOperation[field as keyof UserOperationRequest<TEntryPointVersion>];\n  if (isHex(userOpField) && fromHex(userOpField as Hex, \"bigint\") > 0n) {\n    return userOpField;\n  }\n  return undefined;\n};\n"]}
+{"version":3,"file":"gasManager.js","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,2BAA2B,CACzC,QAAgB;IAEhB,OAAO,iBAAiB,CAAuB;QAC7C,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;KAChC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { ClientMiddlewareConfig } from \"@aa-sdk/core\";\nimport { erc7677Middleware } from \"@aa-sdk/core\";\n\n/**\n * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions.\n *\n * @example\n *  ```ts\n * import { sepolia, alchemyGasManagerMiddleware } from \"@account-kit/infra\";\n * import { http } from \"viem\";\n *\n * const client = createSmartAccountClient({\n *  transport: http(\"rpc-url\"),\n *  chain: sepolia,\n *  ...alchemyGasManagerMiddleware(\"policyId\")\n * });\n * ```\n *\n * @param {string} policyId the policyId for Alchemy's gas manager\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`\n */\nexport function alchemyGasManagerMiddleware(\n  policyId: string\n): Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\"> {\n  return erc7677Middleware<{ policyId: string }>({\n    context: { policyId: policyId },\n  });\n}\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.12.1-alpha.0";
+export declare const VERSION = "4.13.0";

package/dist/esm/version.js

@@ -1,4 +1,4 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "4.12.1-alpha.0";
+export const VERSION = "4.13.0";
 //# sourceMappingURL=version.js.map

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.12.1-alpha.0\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.13.0\";\n"]}

package/dist/types/actions/types.d.ts

@@ -1,5 +1,5 @@
-import type { UserOperationStruct, UserOperationRequest, UserOperationOverrides, EntryPointVersion } from "@aa-sdk/core";
-import type { Address, Hash, Hex } from "viem";
+import type { UserOperationStruct } from "@aa-sdk/core";
+import type { Address, Hash } from "viem";
 export declare enum SimulateAssetType {
     NATIVE = "NATIVE",
     ERC20 = "ERC20",
@@ -41,16 +41,4 @@ export interface SimulateAssetChange {
     name?: string;
     logo?: string;
 }
-export type RequestGasAndPaymasterAndDataRequest = [
-    {
-        policyId: string;
-        entryPoint: Address;
-        dummySignature: Hex;
-        userOperation: UserOperationRequest;
-        overrides?: UserOperationOverrides;
-    }
-];
-export type RequestGasAndPaymasterAndDataResponse<TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = Pick<UserOperationRequest, "callGasLimit" | "preVerificationGas" | "verificationGasLimit" | "maxFeePerGas" | "maxPriorityFeePerGas"> & (TEntryPointVersion extends "0.6.0" ? {
-    paymasterAndData: UserOperationRequest<"0.6.0">["paymasterAndData"];
-} : TEntryPointVersion extends "0.7.0" ? Pick<UserOperationRequest<"0.7.0">, "paymaster" | "paymasterData" | "paymasterVerificationGasLimit" | "paymasterPostOpGasLimit"> : never);
 //# sourceMappingURL=types.d.ts.map

package/dist/types/actions/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/actions/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,oBAAoB,EACpB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAE/C,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB;;;OAGG;IACH,WAAW,gBAAgB;CAC5B;AAED,oBAAY,kBAAkB;IAC5B,OAAO,YAAY;IACnB,QAAQ,aAAa;CACtB;AAED,MAAM,MAAM,wCAAwC,GAAG;IACrD,mBAAmB;IACnB,UAAU,EAAE,OAAO;IACnB,WAAW,CAAC,EAAE,IAAI;CACnB,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,yBAAyB,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACpE,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,oCAAoC,GAAG;IACjD;QACE,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,OAAO,CAAC;QACpB,cAAc,EAAE,GAAG,CAAC;QACpB,aAAa,EAAE,oBAAoB,CAAC;QACpC,SAAS,CAAC,EAAE,sBAAsB,CAAC;KACpC;CACF,CAAC;AAEF,MAAM,MAAM,qCAAqC,CAC/C,kBAAkB,SAAS,iBAAiB,GAAG,iBAAiB,IAC9D,IAAI,CACN,oBAAoB,EAClB,cAAc,GACd,oBAAoB,GACpB,sBAAsB,GACtB,cAAc,GACd,sBAAsB,CACzB,GACC,CAAC,kBAAkB,SAAS,OAAO,GAC/B;IACE,gBAAgB,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC;CACrE,GACD,kBAAkB,SAAS,OAAO,GAClC,IAAI,CACF,oBAAoB,CAAC,OAAO,CAAC,EAC3B,WAAW,GACX,eAAe,GACf,+BAA+B,GAC/B,yBAAyB,CAC5B,GACD,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/actions/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB;;;OAGG;IACH,WAAW,gBAAgB;CAC5B;AAED,oBAAY,kBAAkB;IAC5B,OAAO,YAAY;IACnB,QAAQ,aAAa;CACtB;AAED,MAAM,MAAM,wCAAwC,GAAG;IACrD,mBAAmB;IACnB,UAAU,EAAE,OAAO;IACnB,WAAW,CAAC,EAAE,IAAI;CACnB,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,yBAAyB,CAAC;CACnC,CAAC;AAEF,MAAM,WAAW,yBAA0B,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IACpE,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}

package/dist/types/alchemyTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"alchemyTransport.d.ts","sourceRoot":"","sources":["../../src/alchemyTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,eAAe,EACrB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAI1D,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC5B;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK;CACvB,GACD,KAAK,CAAC;AAEV,KAAK,oBAAoB,GAAG;IAC1B,iBAAiB,EAAE,gBAAgB,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAcF,MAAM,MAAM,sBAAsB,GAAG,CACjC,CAAC,gBAAgB,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC,GAChD,CAAC,oBAAoB,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,CACnD,GAAG;IACF,wCAAwC;IACxC,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;IACvD,8CAA8C;IAC9C,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;IACvD,YAAY,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC;CACjE,CAAC;AAEF,KAAK,oBAAoB,GAAG,SAAS,CACnC,SAAS,EACT;IACE,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;CACvD,EACD,gBAAgB,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAC5D,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG;IACpD,aAAa,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7C,MAAM,EAAE,sBAAsB,CAAC;CAChC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,GACX,SAAS,IAAI,gBAAgB,CAE/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,sBAAsB,GAAG,gBAAgB,CA+ExE"}
+{"version":3,"file":"alchemyTransport.d.ts","sourceRoot":"","sources":["../../src/alchemyTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EACxB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,eAAe,EACrB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAI1D,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC5B;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK;CACvB,GACD,KAAK,CAAC;AAEV,KAAK,oBAAoB,GAAG;IAC1B,iBAAiB,EAAE,gBAAgB,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAaF,MAAM,MAAM,sBAAsB,GAAG,CACjC,CAAC,gBAAgB,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC,GAChD,CAAC,oBAAoB,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,CACnD,GAAG;IACF,wCAAwC;IACxC,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;IACvD,8CAA8C;IAC9C,UAAU,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC;IACvD,YAAY,CAAC,EAAE,WAAW,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,CAAC;CACjE,CAAC;AAEF,KAAK,oBAAoB,GAAG,SAAS,CACnC,SAAS,EACT;IACE,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;CACvD,EACD,gBAAgB,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAC5D,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG;IACpD,aAAa,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7C,MAAM,EAAE,sBAAsB,CAAC;CAChC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,GACX,SAAS,IAAI,gBAAgB,CAE/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,sBAAsB,GAAG,gBAAgB,CA+ExE"}

package/dist/types/client/types.d.ts

@@ -1,5 +1,5 @@
 import { type BundlerClient, type Erc7677RpcSchema, type UserOperationRequest } from "@aa-sdk/core";
-import type { SimulateUserOperationAssetChangesRequest, SimulateUserOperationAssetChangesResponse, RequestGasAndPaymasterAndDataRequest, RequestGasAndPaymasterAndDataResponse } from "../actions/types";
+import type { SimulateUserOperationAssetChangesRequest, SimulateUserOperationAssetChangesResponse } from "../actions/types";
 import type { AlchemyTransport } from "../alchemyTransport";
 export type AlchemyRpcSchema = [
     {
@@ -14,12 +14,7 @@ export type AlchemyRpcSchema = [
     },
     ...Erc7677RpcSchema<{
         policyId: string;
-    }>,
-    {
-        Method: "alchemy_requestGasAndPaymasterAndData";
-        Parameters: RequestGasAndPaymasterAndDataRequest;
-        ReturnType: RequestGasAndPaymasterAndDataResponse;
-    }
+    }>
 ];
 export type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {
     request: BundlerClient<AlchemyTransport>["request"] & {
@@ -31,10 +26,6 @@ export type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {
             method: "rundler_maxPriorityFeePerGas";
             params: [];
         }): Promise<UserOperationRequest["maxPriorityFeePerGas"]>;
-        request(args: {
-            method: "alchemy_requestGasAndPaymasterAndData";
-            params: RequestGasAndPaymasterAndDataRequest;
-        }): Promise<RequestGasAndPaymasterAndDataResponse>;
     }["request"];
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types/client/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,wCAAwC,EACxC,yCAAyC,EACzC,oCAAoC,EACpC,qCAAqC,EACtC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG;IAC7B;QACE,MAAM,EAAE,2CAA2C,CAAC;QACpD,UAAU,EAAE,wCAAwC,CAAC;QACrD,UAAU,EAAE,yCAAyC,CAAC;KACvD;IACD;QACE,MAAM,EAAE,8BAA8B,CAAC;QACvC,UAAU,EAAE,EAAE,CAAC;QACf,UAAU,EAAE,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;KAC1D;IACD,GAAG,gBAAgB,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC;QACE,MAAM,EAAE,uCAAuC,CAAC;QAChD,UAAU,EAAE,oCAAoC,CAAC;QACjD,UAAU,EAAE,qCAAqC,CAAC;KACnD;CACF,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,aAAa,CAAC,gBAAgB,CAAC,GAAG;IACvE,OAAO,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,GACjD;QACE,OAAO,CAAC,IAAI,EAAE;YACZ,MAAM,EAAE,2CAA2C,CAAC;YACpD,MAAM,EAAE,wCAAwC,CAAC;SAClD,GAAG,OAAO,CAAC,yCAAyC,CAAC,CAAC;QAEvD,OAAO,CAAC,IAAI,EAAE;YACZ,MAAM,EAAE,8BAA8B,CAAC;YACvC,MAAM,EAAE,EAAE,CAAC;SACZ,GAAG,OAAO,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAE1D,OAAO,CAAC,IAAI,EAAE;YACZ,MAAM,EAAE,uCAAuC,CAAC;YAChD,MAAM,EAAE,oCAAoC,CAAC;SAC9C,GAAG,OAAO,CAAC,qCAAqC,CAAC,CAAC;KACpD,CAAC,SAAS,CAAC,CAAC;CAChB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,wCAAwC,EACxC,yCAAyC,EAC1C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,MAAM,gBAAgB,GAAG;IAC7B;QACE,MAAM,EAAE,2CAA2C,CAAC;QACpD,UAAU,EAAE,wCAAwC,CAAC;QACrD,UAAU,EAAE,yCAAyC,CAAC;KACvD;IACD;QACE,MAAM,EAAE,8BAA8B,CAAC;QACvC,UAAU,EAAE,EAAE,CAAC;QACf,UAAU,EAAE,oBAAoB,CAAC,sBAAsB,CAAC,CAAC;KAC1D;IACD,GAAG,gBAAgB,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,aAAa,CAAC,gBAAgB,CAAC,GAAG;IACvE,OAAO,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC,SAAS,CAAC,GACjD;QACE,OAAO,CAAC,IAAI,EAAE;YACZ,MAAM,EAAE,2CAA2C,CAAC;YACpD,MAAM,EAAE,wCAAwC,CAAC;SAClD,GAAG,OAAO,CAAC,yCAAyC,CAAC,CAAC;QAEvD,OAAO,CAAC,IAAI,EAAE;YACZ,MAAM,EAAE,8BAA8B,CAAC;YACvC,MAAM,EAAE,EAAE,CAAC;SACZ,GAAG,OAAO,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC;KAC3D,CAAC,SAAS,CAAC,CAAC;CAChB,CAAC"}

package/dist/types/index.d.ts

@@ -19,7 +19,7 @@ export { getDefaultUserOperationFeeOptions } from "./defaults.js";
 export { getAlchemyPaymasterAddress } from "./gas-manager.js";
 export { alchemyFeeEstimator } from "./middleware/feeEstimator.js";
 export type * from "./middleware/gasManager.js";
-export { alchemyGasManagerMiddleware, alchemyGasAndPaymasterAndDataMiddleware, } from "./middleware/gasManager.js";
+export { alchemyGasManagerMiddleware } from "./middleware/gasManager.js";
 export { alchemyUserOperationSimulator } from "./middleware/userOperationSimulator.js";
 export type * from "./schema.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,2CAA2C,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACzF,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,uBAAuB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACpE,mBAAmB,aAAa,CAAC;AACjC,OAAO,EACL,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,IAAI,EACJ,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,cAAc,EACd,MAAM,EACN,OAAO,EACP,QAAQ,EACR,cAAc,EACd,eAAe,EACf,OAAO,EACP,WAAW,EACX,aAAa,EACb,OAAO,EACP,KAAK,EACL,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,IAAI,EACJ,WAAW,EACX,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,cAAc,EACd,eAAe,EACf,eAAe,EACf,UAAU,EACV,UAAU,EACV,MAAM,GACP,MAAM,aAAa,CAAC;AACrB,mBAAmB,4CAA4C,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,mBAAmB,qCAAqC,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,mBAAmB,uBAAuB,CAAC;AAC3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,mBAAmB,gCAAgC,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACjF,mBAAmB,mBAAmB,CAAC;AACvC,OAAO,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,mBAAmB,4BAA4B,CAAC;AAChD,OAAO,EACL,2BAA2B,EAC3B,uCAAuC,GACxC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,mBAAmB,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,mBAAmB,2CAA2C,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACzF,mBAAmB,oBAAoB,CAAC;AACxC,mBAAmB,uBAAuB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACpE,mBAAmB,aAAa,CAAC;AACjC,OAAO,EACL,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,eAAe,EACf,IAAI,EACJ,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,cAAc,EACd,MAAM,EACN,OAAO,EACP,QAAQ,EACR,cAAc,EACd,eAAe,EACf,OAAO,EACP,WAAW,EACX,aAAa,EACb,OAAO,EACP,KAAK,EACL,YAAY,EACZ,UAAU,EACV,iBAAiB,EACjB,IAAI,EACJ,WAAW,EACX,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,aAAa,EACb,cAAc,EACd,eAAe,EACf,eAAe,EACf,UAAU,EACV,UAAU,EACV,MAAM,GACP,MAAM,aAAa,CAAC;AACrB,mBAAmB,4CAA4C,CAAC;AAChE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,mBAAmB,qCAAqC,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yCAAyC,CAAC;AACtF,mBAAmB,uBAAuB,CAAC;AAC3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACrE,mBAAmB,gCAAgC,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AACjF,mBAAmB,mBAAmB,CAAC;AACvC,OAAO,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,mBAAmB,4BAA4B,CAAC;AAChD,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,mBAAmB,aAAa,CAAC"}

package/dist/types/middleware/gasManager.d.ts

@@ -18,24 +18,4 @@ import type { ClientMiddlewareConfig } from "@aa-sdk/core";
  * @returns {Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`
  */
 export declare function alchemyGasManagerMiddleware(policyId: string): Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">;
-/**
- * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions using
- * the `alchemy_requestGasAndPaymasterAndData` method instead of standard ERC-7677 methods.
- *
- * @example
- *  ```ts
- * import { sepolia, alchemyGasAndPaymasterAndDataMiddleware } from "@account-kit/infra";
- * import { http } from "viem";
- *
- * const client = createSmartAccountClient({
- *  transport: http("rpc-url"),
- *  chain: sepolia,
- *  ...alchemyGasAndPaymasterAndDataMiddleware("policyId")
- * });
- * ```
- *
- * @param {string} policyId the policyId for Alchemy's gas manager
- * @returns {Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`
- */
-export declare function alchemyGasAndPaymasterAndDataMiddleware(policyId: string): Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "feeEstimator" | "gasEstimator" | "paymasterAndData">;
 //# sourceMappingURL=gasManager.d.ts.map

package/dist/types/middleware/gasManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gasManager.d.ts","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EAMvB,MAAM,cAAc,CAAC;AAkBtB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GACf,IAAI,CAAC,sBAAsB,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,CAI5E;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uCAAuC,CACrD,QAAQ,EAAE,MAAM,GACf,IAAI,CACL,sBAAsB,EACtB,uBAAuB,GAAG,cAAc,GAAG,cAAc,GAAG,kBAAkB,CAC/E,CA0GA"}
+{"version":3,"file":"gasManager.d.ts","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAG3D;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GACf,IAAI,CAAC,sBAAsB,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,CAI5E"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "4.12.1-alpha.0";
+export declare const VERSION = "4.13.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,mBAAmB,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/infra",
-  "version": "4.12.1-alpha.0",
+  "version": "4.13.0",
   "description": "adapters for @aa-sdk/core for interacting with alchemy services",
   "author": "Alchemy",
   "license": "MIT",
@@ -45,13 +45,13 @@
     "vitest": "^2.0.4"
   },
   "dependencies": {
-    "@aa-sdk/core": "^4.12.1-alpha.0",
-    "@account-kit/logging": "^4.12.1-alpha.0",
+    "@aa-sdk/core": "^4.13.0",
+    "@account-kit/logging": "^4.13.0",
     "eventemitter3": "^5.0.1",
     "zod": "^3.22.4"
   },
   "peerDependencies": {
-    "viem": "^2.20.0"
+    "viem": "^2.22.6"
   },
   "publishConfig": {
     "access": "public",
@@ -65,7 +65,7 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "7835fad48bb913cc0b9adfb82fc98610e5cde0b1",
+  "gitHead": "6865bd7b49bc7db064bca7026914e4299febdb34",
   "optionalDependencies": {
     "alchemy-sdk": "^3.0.0"
   }

package/src/actions/types.ts

@@ -1,10 +1,5 @@
-import type {
-  UserOperationStruct,
-  UserOperationRequest,
-  UserOperationOverrides,
-  EntryPointVersion,
-} from "@aa-sdk/core";
-import type { Address, Hash, Hex } from "viem";
+import type { UserOperationStruct } from "@aa-sdk/core";
+import type { Address, Hash } from "viem";
 
 export enum SimulateAssetType {
   NATIVE = "NATIVE",
@@ -52,37 +47,3 @@ export interface SimulateAssetChange {
   name?: string;
   logo?: string;
 }
-
-export type RequestGasAndPaymasterAndDataRequest = [
-  {
-    policyId: string;
-    entryPoint: Address;
-    dummySignature: Hex;
-    userOperation: UserOperationRequest;
-    overrides?: UserOperationOverrides;
-  }
-];
-
-export type RequestGasAndPaymasterAndDataResponse<
-  TEntryPointVersion extends EntryPointVersion = EntryPointVersion
-> = Pick<
-  UserOperationRequest,
-  | "callGasLimit"
-  | "preVerificationGas"
-  | "verificationGasLimit"
-  | "maxFeePerGas"
-  | "maxPriorityFeePerGas"
-> &
-  (TEntryPointVersion extends "0.6.0"
-    ? {
-        paymasterAndData: UserOperationRequest<"0.6.0">["paymasterAndData"];
-      }
-    : TEntryPointVersion extends "0.7.0"
-    ? Pick<
-        UserOperationRequest<"0.7.0">,
-        | "paymaster"
-        | "paymasterData"
-        | "paymasterVerificationGasLimit"
-        | "paymasterPostOpGasLimit"
-      >
-    : never);

package/src/alchemyTransport.ts

@@ -39,7 +39,6 @@ const alchemyMethods = [
   "rundler_maxPriorityFeePerGas",
   "pm_getPaymasterData",
   "pm_getPaymasterStubData",
-  "alchemy_requestGasAndPaymasterAndData",
 ];
 
 export type AlchemyTransportConfig = (

package/src/client/smartAccountClient.ts

@@ -15,7 +15,7 @@ import { type Chain } from "viem";
 import type { AlchemyTransport } from "../alchemyTransport.js";
 import { getDefaultUserOperationFeeOptions } from "../defaults.js";
 import { alchemyFeeEstimator } from "../middleware/feeEstimator.js";
-import { alchemyGasAndPaymasterAndDataMiddleware } from "../middleware/gasManager.js";
+import { alchemyGasManagerMiddleware } from "../middleware/gasManager.js";
 import { alchemyUserOperationSimulator } from "../middleware/userOperationSimulator.js";
 import {
   alchemyActions,
@@ -144,10 +144,6 @@ export function createAlchemySmartAccountClient({
   const feeOptions =
     opts?.feeOptions ?? getDefaultUserOperationFeeOptions(chain);
 
-  const gasAndPaymasterAndDataMiddleware = policyId
-    ? alchemyGasAndPaymasterAndDataMiddleware(policyId)
-    : undefined;
-
   const scaClient = createSmartAccountClient({
     account,
     transport,
@@ -157,24 +153,18 @@ export function createAlchemySmartAccountClient({
       ...opts,
       feeOptions,
     },
-    dummyPaymasterAndData:
-      gasAndPaymasterAndDataMiddleware?.dummyPaymasterAndData,
-    feeEstimator:
-      feeEstimator ??
-      gasAndPaymasterAndDataMiddleware?.feeEstimator ??
-      alchemyFeeEstimator(transport),
-    gasEstimator:
-      gasEstimator ?? gasAndPaymasterAndDataMiddleware?.gasEstimator,
     customMiddleware: async (struct, args) => {
       if (isSmartAccountWithSigner(args.account)) {
         transport.updateHeaders(getSignerTypeHeader(args.account));
       }
       return customMiddleware ? customMiddleware(struct, args) : struct;
     },
-    paymasterAndData: gasAndPaymasterAndDataMiddleware?.paymasterAndData,
+    feeEstimator: feeEstimator ?? alchemyFeeEstimator(transport),
     userOperationSimulator: useSimulation
       ? alchemyUserOperationSimulator(transport)
       : undefined,
+    gasEstimator,
+    ...(policyId && alchemyGasManagerMiddleware(policyId)),
     signUserOperation,
   }).extend(alchemyActions);
 

package/src/client/types.ts

@@ -6,8 +6,6 @@ import {
 import type {
   SimulateUserOperationAssetChangesRequest,
   SimulateUserOperationAssetChangesResponse,
-  RequestGasAndPaymasterAndDataRequest,
-  RequestGasAndPaymasterAndDataResponse,
 } from "../actions/types";
 import type { AlchemyTransport } from "../alchemyTransport";
 
@@ -22,12 +20,7 @@ export type AlchemyRpcSchema = [
     Parameters: [];
     ReturnType: UserOperationRequest["maxPriorityFeePerGas"];
   },
-  ...Erc7677RpcSchema<{ policyId: string }>,
-  {
-    Method: "alchemy_requestGasAndPaymasterAndData";
-    Parameters: RequestGasAndPaymasterAndDataRequest;
-    ReturnType: RequestGasAndPaymasterAndDataResponse;
-  }
+  ...Erc7677RpcSchema<{ policyId: string }>
 ];
 
 export type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {
@@ -42,10 +35,5 @@ export type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {
         method: "rundler_maxPriorityFeePerGas";
         params: [];
       }): Promise<UserOperationRequest["maxPriorityFeePerGas"]>;
-
-      request(args: {
-        method: "alchemy_requestGasAndPaymasterAndData";
-        params: RequestGasAndPaymasterAndDataRequest;
-      }): Promise<RequestGasAndPaymasterAndDataResponse>;
     }["request"];
 };

package/src/index.ts

@@ -55,9 +55,6 @@ export { getDefaultUserOperationFeeOptions } from "./defaults.js";
 export { getAlchemyPaymasterAddress } from "./gas-manager.js";
 export { alchemyFeeEstimator } from "./middleware/feeEstimator.js";
 export type * from "./middleware/gasManager.js";
-export {
-  alchemyGasManagerMiddleware,
-  alchemyGasAndPaymasterAndDataMiddleware,
-} from "./middleware/gasManager.js";
+export { alchemyGasManagerMiddleware } from "./middleware/gasManager.js";
 export { alchemyUserOperationSimulator } from "./middleware/userOperationSimulator.js";
 export type * from "./schema.js";

package/src/middleware/gasManager.ts

@@ -1,27 +1,5 @@
-import type {
-  ClientMiddlewareConfig,
-  EntryPointVersion,
-  Multiplier,
-  UserOperationFeeOptions,
-  UserOperationOverrides,
-  UserOperationRequest,
-} from "@aa-sdk/core";
-import {
-  bypassPaymasterAndData,
-  ChainNotFoundError,
-  deepHexlify,
-  defaultFeeEstimator,
-  defaultGasEstimator,
-  erc7677Middleware,
-  filterUndefined,
-  isBigNumberish,
-  isMultiplier,
-  noopMiddleware,
-  resolveProperties,
-} from "@aa-sdk/core";
-import { getAlchemyPaymasterAddress } from "../gas-manager.js";
-import { fromHex, isHex, type Hex } from "viem";
-import type { AlchemySmartAccountClient } from "../client/smartAccountClient.js";
+import type { ClientMiddlewareConfig } from "@aa-sdk/core";
+import { erc7677Middleware } from "@aa-sdk/core";
 
 /**
  * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions.
@@ -48,183 +26,3 @@ export function alchemyGasManagerMiddleware(
     context: { policyId: policyId },
   });
 }
-
-/**
- * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring transactions using
- * the `alchemy_requestGasAndPaymasterAndData` method instead of standard ERC-7677 methods.
- *
- * @example
- *  ```ts
- * import { sepolia, alchemyGasAndPaymasterAndDataMiddleware } from "@account-kit/infra";
- * import { http } from "viem";
- *
- * const client = createSmartAccountClient({
- *  transport: http("rpc-url"),
- *  chain: sepolia,
- *  ...alchemyGasAndPaymasterAndDataMiddleware("policyId")
- * });
- * ```
- *
- * @param {string} policyId the policyId for Alchemy's gas manager
- * @returns {Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">} partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`
- */
-export function alchemyGasAndPaymasterAndDataMiddleware(
-  policyId: string
-): Pick<
-  ClientMiddlewareConfig,
-  "dummyPaymasterAndData" | "feeEstimator" | "gasEstimator" | "paymasterAndData"
-> {
-  return {
-    dummyPaymasterAndData: async (uo, { client, account }) => {
-      if (!client.chain) {
-        throw new ChainNotFoundError();
-      }
-
-      const paymaster = getAlchemyPaymasterAddress(client.chain);
-      const paymasterData = await account.getDummySignature();
-
-      return {
-        ...uo,
-        dummyPaymasterAndData: {
-          paymaster,
-          paymasterData,
-        },
-      };
-    },
-    feeEstimator: (uo, args) => {
-      return bypassPaymasterAndData(args.overrides)
-        ? defaultFeeEstimator(args.client)(uo, args)
-        : noopMiddleware(uo, args);
-    },
-    gasEstimator: (uo, args) => {
-      return bypassPaymasterAndData(args.overrides)
-        ? defaultGasEstimator(args.client)(uo, args)
-        : noopMiddleware(uo, args);
-    },
-    paymasterAndData: async (
-      uo,
-      { account, client, feeOptions, overrides: overrides_ }
-    ) => {
-      if (!client.chain) {
-        throw new ChainNotFoundError();
-      }
-
-      const userOp = deepHexlify(await resolveProperties(uo));
-
-      const overrides: UserOperationOverrides = filterUndefined({
-        maxFeePerGas: overrideField(
-          "maxFeePerGas",
-          overrides_ as UserOperationOverrides,
-          feeOptions,
-          userOp
-        ),
-        maxPriorityFeePerGas: overrideField(
-          "maxPriorityFeePerGas",
-          overrides_ as UserOperationOverrides,
-          feeOptions,
-          userOp
-        ),
-        callGasLimit: overrideField(
-          "callGasLimit",
-          overrides_ as UserOperationOverrides,
-          feeOptions,
-          userOp
-        ),
-        verificationGasLimit: overrideField(
-          "verificationGasLimit",
-          overrides_ as UserOperationOverrides,
-          feeOptions,
-          userOp
-        ),
-        preVerificationGas: overrideField(
-          "preVerificationGas",
-          overrides_ as UserOperationOverrides,
-          feeOptions,
-          userOp
-        ),
-        ...(account.getEntryPoint().version === "0.7.0"
-          ? {
-              paymasterVerificationGasLimit: overrideField<"0.7.0">(
-                "paymasterVerificationGasLimit",
-                overrides_ as UserOperationOverrides<"0.7.0">,
-                feeOptions,
-                userOp
-              ),
-              paymasterPostOpGasLimit: overrideField<"0.7.0">(
-                "paymasterPostOpGasLimit",
-                overrides_ as UserOperationOverrides<"0.7.0">,
-                feeOptions,
-                userOp
-              ),
-            }
-          : {}),
-      });
-
-      const result = await (client as AlchemySmartAccountClient).request({
-        method: "alchemy_requestGasAndPaymasterAndData",
-        params: [
-          {
-            policyId,
-            entryPoint: account.getEntryPoint().address,
-            userOperation: userOp,
-            dummySignature: await account.getDummySignature(),
-            overrides,
-          },
-        ],
-      });
-
-      return {
-        ...uo,
-        ...result,
-      };
-    },
-  };
-}
-
-/**
- * Utility function to override a field in the user operation request with the overrides or fee options
- *
- * @template {EntryPointVersion} TEntryPointVersion
- * @param {keyof UserOperationFeeOptions<TEntryPointVersion>} field the field to override
- * @param {UserOperationOverrides<TEntryPointVersion> | undefined} overrides the overrides object
- * @param {UserOperationFeeOptions<TEntryPointVersion> | undefined} feeOptions the fee options object from the client
- * @param {UserOperationRequest<TEntryPointVersion>} userOperation the user operation request
- * @returns {Hex | Multiplier | undefined} the overridden field value
- */
-const overrideField = <
-  TEntryPointVersion extends EntryPointVersion = EntryPointVersion
->(
-  field: keyof UserOperationFeeOptions<TEntryPointVersion>,
-  overrides: UserOperationOverrides<TEntryPointVersion> | undefined,
-  feeOptions: UserOperationFeeOptions<TEntryPointVersion> | undefined,
-  userOperation: UserOperationRequest<TEntryPointVersion>
-): Hex | Multiplier | undefined => {
-  let _field = field as keyof UserOperationOverrides<TEntryPointVersion>;
-
-  if (overrides?.[_field] != null) {
-    // one-off absolute override
-    if (isBigNumberish(overrides[_field])) {
-      return deepHexlify(overrides[_field]);
-    }
-    // one-off multiplier overrides
-    else {
-      return {
-        multiplier: Number((overrides[_field] as Multiplier).multiplier),
-      };
-    }
-  }
-
-  // provider level fee options with multiplier
-  if (isMultiplier(feeOptions?.[field])) {
-    return {
-      multiplier: Number((feeOptions![field] as Multiplier).multiplier),
-    };
-  }
-
-  const userOpField =
-    userOperation[field as keyof UserOperationRequest<TEntryPointVersion>];
-  if (isHex(userOpField) && fromHex(userOpField as Hex, "bigint") > 0n) {
-    return userOpField;
-  }
-  return undefined;
-};

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file is autogenerated by inject-version.ts. Any changes will be
 // overwritten on commit!
-export const VERSION = "4.12.0";
+export const VERSION = "4.13.0";