@account-kit/infra 4.0.0-alpha.6 → 4.0.0-alpha.8

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

@@ -1,13 +1,12 @@
 import { type Prettify, type SmartAccountClient, type SmartAccountClientActions, type SmartAccountClientConfig, type SmartAccountClientRpcSchema, type SmartContractAccount, type UserOperationContext } from "@aa-sdk/core";
 import { type Chain, type Transport } from "viem";
-import { type AlchemyGasManagerConfig } from "../middleware/gasManager.js";
 import type { AlchemyProviderConfig } from "../type.js";
 import type { AlchemySmartAccountClientActions } from "./decorators/smartAccount.js";
 import type { AlchemyRpcSchema } from "./types.js";
 export type AlchemySmartAccountClientConfig<transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined, account extends SmartContractAccount | undefined = SmartContractAccount | undefined, context extends UserOperationContext | undefined = UserOperationContext | undefined> = {
     account?: account;
     useSimulation?: boolean;
-    gasManagerConfig?: AlchemyGasManagerConfig;
+    policyId?: string;
 } & AlchemyProviderConfig & Pick<SmartAccountClientConfig<transport, chain, account, context>, "customMiddleware" | "feeEstimator" | "gasEstimator" | "signUserOperation">;
 export type BaseAlchemyActions<chain extends Chain | undefined = Chain | undefined, account extends SmartContractAccount | undefined = SmartContractAccount | undefined, context extends UserOperationContext | undefined = UserOperationContext | undefined> = SmartAccountClientActions<chain, account, context> & AlchemySmartAccountClientActions<account, context>;
 export type AlchemySmartAccountClient_Base<transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined, account extends SmartContractAccount | undefined = SmartContractAccount | undefined, actions extends Record<string, unknown> = Record<string, unknown>, context extends UserOperationContext | undefined = UserOperationContext | undefined> = Prettify<SmartAccountClient<transport, chain, account, actions & BaseAlchemyActions<chain, account, context>, [
@@ -15,4 +14,4 @@ export type AlchemySmartAccountClient_Base<transport extends Transport = Transpo
     ...AlchemyRpcSchema
 ], context>>;
 export type AlchemySmartAccountClient<transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined, account extends SmartContractAccount | undefined = SmartContractAccount | undefined, actions extends Record<string, unknown> = Record<string, unknown>, context extends UserOperationContext | undefined = UserOperationContext | undefined> = Prettify<AlchemySmartAccountClient_Base<transport, chain, account, actions, context>>;
-export declare function createAlchemySmartAccountClient<TTransport extends Transport = Transport, TChain extends Chain = Chain, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined, TContext extends UserOperationContext | undefined = UserOperationContext | undefined>({ account, gasManagerConfig, useSimulation, feeEstimator, customMiddleware, gasEstimator, signUserOperation, ...config_ }: AlchemySmartAccountClientConfig<TTransport, TChain, TAccount, TContext>): AlchemySmartAccountClient<TTransport, TChain, TAccount, Record<string, never>, TContext>;
+export declare function createAlchemySmartAccountClient<TTransport extends Transport = Transport, TChain extends Chain = Chain, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined, TContext extends UserOperationContext | undefined = UserOperationContext | undefined>({ account, policyId, useSimulation, feeEstimator, customMiddleware, gasEstimator, signUserOperation, ...config_ }: AlchemySmartAccountClientConfig<TTransport, TChain, TAccount, TContext>): AlchemySmartAccountClient<TTransport, TChain, TAccount, Record<string, never>, TContext>;

package/dist/esm/client/smartAccountClient.js

@@ -1,11 +1,10 @@
 import {} from "@aa-sdk/core";
 import {} from "viem";
 import { getDefaultUserOperationFeeOptions } from "../defaults.js";
-import {} from "../middleware/gasManager.js";
 import { AlchemyProviderConfigSchema } from "../schema.js";
 import { createAlchemySmartAccountClientFromRpcClient } from "./internal/smartAccountClientFromRpc.js";
 import { createAlchemyPublicRpcClient } from "./rpcClient.js";
-export function createAlchemySmartAccountClient({ account, gasManagerConfig, useSimulation, feeEstimator, customMiddleware, gasEstimator, signUserOperation, ...config_ }) {
+export function createAlchemySmartAccountClient({ account, policyId, useSimulation, feeEstimator, customMiddleware, gasEstimator, signUserOperation, ...config_ }) {
     const config = AlchemyProviderConfigSchema.parse(config_);
     const { chain, opts, ...connectionConfig } = config;
     const client = createAlchemyPublicRpcClient({
@@ -20,7 +19,7 @@ export function createAlchemySmartAccountClient({ account, gasManagerConfig, use
             ...opts,
             feeOptions,
         },
-        gasManagerConfig,
+        policyId,
         useSimulation,
         feeEstimator,
         customMiddleware,

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

@@ -1 +1 @@
-{"version":3,"file":"smartAccountClient.js","sourceRoot":"","sources":["../../../src/client/smartAccountClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAQN,MAAM,cAAc,CAAC;AACtB,OAAO,EAA8B,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAgC,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,4CAA4C,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAsH9D,MAAM,UAAU,+BAA+B,CAAC,EAC9C,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,GAAG,OAAO,EACsB;IAChC,MAAM,MAAM,GAAG,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,gBAAgB,EAAE,GAAG,MAAM,CAAC;IAEpD,MAAM,MAAM,GAAG,4BAA4B,CAAC;QAC1C,KAAK;QACL,gBAAgB;KACjB,CAAC,CAAC;IAEH,MAAM,UAAU,GACd,IAAI,EAAE,UAAU,IAAI,iCAAiC,CAAC,KAAK,CAAC,CAAC;IAE/D,OAAO,4CAA4C,CAAC;QAClD,MAAM;QACN,OAAO;QACP,IAAI,EAAE;YACJ,GAAG,IAAI;YACP,UAAU;SACX;QACD,gBAAgB;QAChB,aAAa;QACb,YAAY;QACZ,gBAAgB;QAChB,YAAY;QACZ,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {\n  type Prettify,\n  type SmartAccountClient,\n  type SmartAccountClientActions,\n  type SmartAccountClientConfig,\n  type SmartAccountClientRpcSchema,\n  type SmartContractAccount,\n  type UserOperationContext,\n} from \"@aa-sdk/core\";\nimport { type Chain, type Transport } from \"viem\";\nimport { getDefaultUserOperationFeeOptions } from \"../defaults.js\";\nimport { type AlchemyGasManagerConfig } from \"../middleware/gasManager.js\";\nimport { AlchemyProviderConfigSchema } from \"../schema.js\";\nimport type { AlchemyProviderConfig } from \"../type.js\";\nimport type { AlchemySmartAccountClientActions } from \"./decorators/smartAccount.js\";\nimport { createAlchemySmartAccountClientFromRpcClient } from \"./internal/smartAccountClientFromRpc.js\";\nimport { createAlchemyPublicRpcClient } from \"./rpcClient.js\";\nimport type { AlchemyRpcSchema } from \"./types.js\";\n\n// #region AlchemySmartAccountClientConfig\nexport type AlchemySmartAccountClientConfig<\n  transport extends Transport = Transport,\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  gasManagerConfig?: AlchemyGasManagerConfig;\n} & AlchemyProviderConfig &\n  Pick<\n    SmartAccountClientConfig<transport, chain, account, context>,\n    \"customMiddleware\" | \"feeEstimator\" | \"gasEstimator\" | \"signUserOperation\"\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  transport extends Transport = Transport,\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    transport,\n    chain,\n    account,\n    actions & BaseAlchemyActions<chain, account, context>,\n    [...SmartAccountClientRpcSchema, ...AlchemyRpcSchema],\n    context\n  >\n>;\n\nexport type AlchemySmartAccountClient<\n  transport extends Transport = Transport,\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  AlchemySmartAccountClient_Base<transport, chain, account, actions, context>\n>;\n\nexport function createAlchemySmartAccountClient<\n  TTransport extends Transport = Transport,\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  account,\n  gasManagerConfig,\n  useSimulation,\n  feeEstimator,\n  customMiddleware,\n  gasEstimator,\n  signUserOperation,\n  ...config_\n}: AlchemySmartAccountClientConfig<\n  TTransport,\n  TChain,\n  TAccount,\n  TContext\n>): AlchemySmartAccountClient<\n  TTransport,\n  TChain,\n  TAccount,\n  Record<string, never>,\n  TContext\n>;\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 } from \"@account-kit/infra\";\n * import { sepolia } from \"@account-kit/infra/chain\";\n *\n * const client = createAlchemySmartAccountClient({\n *  chain: sepolia,\n *  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  gasManagerConfig,\n  useSimulation,\n  feeEstimator,\n  customMiddleware,\n  gasEstimator,\n  signUserOperation,\n  ...config_\n}: AlchemySmartAccountClientConfig): AlchemySmartAccountClient {\n  const config = AlchemyProviderConfigSchema.parse(config_);\n  const { chain, opts, ...connectionConfig } = config;\n\n  const client = createAlchemyPublicRpcClient({\n    chain,\n    connectionConfig,\n  });\n\n  const feeOptions =\n    opts?.feeOptions ?? getDefaultUserOperationFeeOptions(chain);\n\n  return createAlchemySmartAccountClientFromRpcClient({\n    client,\n    account,\n    opts: {\n      ...opts,\n      feeOptions,\n    },\n    gasManagerConfig,\n    useSimulation,\n    feeEstimator,\n    customMiddleware,\n    gasEstimator,\n    signUserOperation,\n  });\n}\n"]}
+{"version":3,"file":"smartAccountClient.js","sourceRoot":"","sources":["../../../src/client/smartAccountClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAQN,MAAM,cAAc,CAAC;AACtB,OAAO,EAA8B,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,iCAAiC,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAG3D,OAAO,EAAE,4CAA4C,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAsH9D,MAAM,UAAU,+BAA+B,CAAC,EAC9C,OAAO,EACP,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,iBAAiB,EACjB,GAAG,OAAO,EACsB;IAChC,MAAM,MAAM,GAAG,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,gBAAgB,EAAE,GAAG,MAAM,CAAC;IAEpD,MAAM,MAAM,GAAG,4BAA4B,CAAC;QAC1C,KAAK;QACL,gBAAgB;KACjB,CAAC,CAAC;IAEH,MAAM,UAAU,GACd,IAAI,EAAE,UAAU,IAAI,iCAAiC,CAAC,KAAK,CAAC,CAAC;IAE/D,OAAO,4CAA4C,CAAC;QAClD,MAAM;QACN,OAAO;QACP,IAAI,EAAE;YACJ,GAAG,IAAI;YACP,UAAU;SACX;QACD,QAAQ;QACR,aAAa;QACb,YAAY;QACZ,gBAAgB;QAChB,YAAY;QACZ,iBAAiB;KAClB,CAAC,CAAC;AACL,CAAC","sourcesContent":["import {\n  type Prettify,\n  type SmartAccountClient,\n  type SmartAccountClientActions,\n  type SmartAccountClientConfig,\n  type SmartAccountClientRpcSchema,\n  type SmartContractAccount,\n  type UserOperationContext,\n} from \"@aa-sdk/core\";\nimport { type Chain, type Transport } from \"viem\";\nimport { getDefaultUserOperationFeeOptions } from \"../defaults.js\";\nimport { AlchemyProviderConfigSchema } from \"../schema.js\";\nimport type { AlchemyProviderConfig } from \"../type.js\";\nimport type { AlchemySmartAccountClientActions } from \"./decorators/smartAccount.js\";\nimport { createAlchemySmartAccountClientFromRpcClient } from \"./internal/smartAccountClientFromRpc.js\";\nimport { createAlchemyPublicRpcClient } from \"./rpcClient.js\";\nimport type { AlchemyRpcSchema } from \"./types.js\";\n\n// #region AlchemySmartAccountClientConfig\nexport type AlchemySmartAccountClientConfig<\n  transport extends Transport = Transport,\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} & AlchemyProviderConfig &\n  Pick<\n    SmartAccountClientConfig<transport, chain, account, context>,\n    \"customMiddleware\" | \"feeEstimator\" | \"gasEstimator\" | \"signUserOperation\"\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  transport extends Transport = Transport,\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    transport,\n    chain,\n    account,\n    actions & BaseAlchemyActions<chain, account, context>,\n    [...SmartAccountClientRpcSchema, ...AlchemyRpcSchema],\n    context\n  >\n>;\n\nexport type AlchemySmartAccountClient<\n  transport extends Transport = Transport,\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  AlchemySmartAccountClient_Base<transport, chain, account, actions, context>\n>;\n\nexport function createAlchemySmartAccountClient<\n  TTransport extends Transport = Transport,\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  account,\n  policyId,\n  useSimulation,\n  feeEstimator,\n  customMiddleware,\n  gasEstimator,\n  signUserOperation,\n  ...config_\n}: AlchemySmartAccountClientConfig<\n  TTransport,\n  TChain,\n  TAccount,\n  TContext\n>): AlchemySmartAccountClient<\n  TTransport,\n  TChain,\n  TAccount,\n  Record<string, never>,\n  TContext\n>;\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 } from \"@account-kit/infra\";\n * import { sepolia } from \"@account-kit/infra/chain\";\n *\n * const client = createAlchemySmartAccountClient({\n *  chain: sepolia,\n *  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  ...config_\n}: AlchemySmartAccountClientConfig): AlchemySmartAccountClient {\n  const config = AlchemyProviderConfigSchema.parse(config_);\n  const { chain, opts, ...connectionConfig } = config;\n\n  const client = createAlchemyPublicRpcClient({\n    chain,\n    connectionConfig,\n  });\n\n  const feeOptions =\n    opts?.feeOptions ?? getDefaultUserOperationFeeOptions(chain);\n\n  return createAlchemySmartAccountClientFromRpcClient({\n    client,\n    account,\n    opts: {\n      ...opts,\n      feeOptions,\n    },\n    policyId,\n    useSimulation,\n    feeEstimator,\n    customMiddleware,\n    gasEstimator,\n    signUserOperation,\n  });\n}\n"]}

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

@@ -1,32 +1,7 @@
 import { type BundlerClient, type UserOperationRequest } from "@aa-sdk/core";
-import type { Address, Hex, HttpTransport } from "viem";
+import type { HttpTransport } from "viem";
 import type { SimulateUserOperationAssetChangesRequest, SimulateUserOperationAssetChangesResponse } from "../actions/types";
-import type { RequestGasAndPaymasterAndDataOverrides, RequestGasAndPaymasterAndDataResponse, RequestPaymasterAndDataResponse } from "../middleware/gasManager";
 export type AlchemyRpcSchema = [
-    {
-        Method: "alchemy_requestPaymasterAndData";
-        Parameters: [
-            {
-                policyId: string;
-                entryPoint: Address;
-                userOperation: UserOperationRequest;
-            }
-        ];
-        ReturnType: RequestPaymasterAndDataResponse;
-    },
-    {
-        Method: "alchemy_requestGasAndPaymasterAndData";
-        Parameters: [
-            {
-                policyId: string;
-                entryPoint: Address;
-                userOperation: UserOperationRequest;
-                dummySignature: Hex;
-                overrides?: RequestGasAndPaymasterAndDataOverrides;
-            }
-        ];
-        ReturnType: RequestGasAndPaymasterAndDataResponse;
-    },
     {
         Method: "alchemy_simulateUserOperationAssetChanges";
         Parameters: SimulateUserOperationAssetChangesRequest;
@@ -40,28 +15,6 @@ export type AlchemyRpcSchema = [
 ];
 export type ClientWithAlchemyMethods = BundlerClient<HttpTransport> & {
     request: BundlerClient<HttpTransport>["request"] & {
-        request(args: {
-            method: "alchemy_requestPaymasterAndData";
-            params: [
-                {
-                    policyId: string;
-                    entryPoint: Address;
-                    userOperation: UserOperationRequest;
-                }
-            ];
-        }): Promise<RequestPaymasterAndDataResponse>;
-        request(args: {
-            method: "alchemy_requestGasAndPaymasterAndData";
-            params: [
-                {
-                    policyId: string;
-                    entryPoint: Address;
-                    userOperation: UserOperationRequest;
-                    dummySignature: Hex;
-                    overrides?: RequestGasAndPaymasterAndDataOverrides;
-                }
-            ];
-        }): Promise<RequestGasAndPaymasterAndDataResponse>;
         request(args: {
             method: "alchemy_simulateUserOperationAssetChanges";
             params: SimulateUserOperationAssetChangesRequest;

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,MAAM,cAAc,CAAC","sourcesContent":["import { type BundlerClient, type UserOperationRequest } from \"@aa-sdk/core\";\nimport type { Address, Hex, HttpTransport } from \"viem\";\nimport type {\n  SimulateUserOperationAssetChangesRequest,\n  SimulateUserOperationAssetChangesResponse,\n} from \"../actions/types\";\nimport type {\n  RequestGasAndPaymasterAndDataOverrides,\n  RequestGasAndPaymasterAndDataResponse,\n  RequestPaymasterAndDataResponse,\n} from \"../middleware/gasManager\";\n\nexport type AlchemyRpcSchema = [\n  {\n    Method: \"alchemy_requestPaymasterAndData\";\n    Parameters: [\n      {\n        policyId: string;\n        entryPoint: Address;\n        userOperation: UserOperationRequest;\n      }\n    ];\n    ReturnType: RequestPaymasterAndDataResponse;\n  },\n  {\n    Method: \"alchemy_requestGasAndPaymasterAndData\";\n    Parameters: [\n      {\n        policyId: string;\n        entryPoint: Address;\n        userOperation: UserOperationRequest;\n        dummySignature: Hex;\n        overrides?: RequestGasAndPaymasterAndDataOverrides;\n      }\n    ];\n    ReturnType: RequestGasAndPaymasterAndDataResponse;\n  },\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];\n\nexport type ClientWithAlchemyMethods = BundlerClient<HttpTransport> & {\n  request: BundlerClient<HttpTransport>[\"request\"] &\n    {\n      request(args: {\n        method: \"alchemy_requestPaymasterAndData\";\n        params: [\n          {\n            policyId: string;\n            entryPoint: Address;\n            userOperation: UserOperationRequest;\n          }\n        ];\n      }): Promise<RequestPaymasterAndDataResponse>;\n\n      request(args: {\n        method: \"alchemy_requestGasAndPaymasterAndData\";\n        params: [\n          {\n            policyId: string;\n            entryPoint: Address;\n            userOperation: UserOperationRequest;\n            dummySignature: Hex;\n            overrides?: RequestGasAndPaymasterAndDataOverrides;\n          }\n        ];\n      }): Promise<RequestGasAndPaymasterAndDataResponse>;\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  updateHeaders: (headers: HeadersInit) => void;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiD,MAAM,cAAc,CAAC","sourcesContent":["import { type BundlerClient, type UserOperationRequest } from \"@aa-sdk/core\";\nimport type { HttpTransport } from \"viem\";\nimport type {\n  SimulateUserOperationAssetChangesRequest,\n  SimulateUserOperationAssetChangesResponse,\n} from \"../actions/types\";\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];\n\nexport type ClientWithAlchemyMethods = BundlerClient<HttpTransport> & {\n  request: BundlerClient<HttpTransport>[\"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  updateHeaders: (headers: HeadersInit) => void;\n};\n"]}

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

@@ -1,29 +1,2 @@
-import type { Address, ClientMiddlewareConfig, ClientMiddlewareFn, EntryPointVersion, Multiplier, UserOperationRequest } from "@aa-sdk/core";
-import { type Hex } from "viem";
-import type { ClientWithAlchemyMethods } from "../client/types";
-export type RequestGasAndPaymasterAndDataOverrides<TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = Partial<{
-    maxFeePerGas: UserOperationRequest<TEntryPointVersion>["maxFeePerGas"] | Multiplier;
-    maxPriorityFeePerGas: UserOperationRequest<TEntryPointVersion>["maxPriorityFeePerGas"] | Multiplier;
-    callGasLimit: UserOperationRequest<TEntryPointVersion>["callGasLimit"] | Multiplier;
-    verificationGasLimit: UserOperationRequest<TEntryPointVersion>["verificationGasLimit"] | Multiplier;
-    preVerificationGas: UserOperationRequest<TEntryPointVersion>["preVerificationGas"] | Multiplier;
-} & TEntryPointVersion extends "0.7.0" ? {
-    paymasterVerificationGasLimit: UserOperationRequest<"0.7.0">["paymasterVerificationGasLimit"] | Multiplier;
-    paymasterPostOpGasLimit: UserOperationRequest<"0.7.0">["paymasterPostOpGasLimit"] | Multiplier;
-} : {}>;
-export type RequestPaymasterAndDataResponse<TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = TEntryPointVersion extends "0.6.0" ? {
-    paymasterAndData: UserOperationRequest<"0.6.0">["paymasterAndData"];
-} : TEntryPointVersion extends "0.7.0" ? Pick<UserOperationRequest<"0.7.0">, "paymaster" | "paymasterData"> : {};
-export type RequestGasAndPaymasterAndDataResponse<TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = Pick<UserOperationRequest, "callGasLimit" | "preVerificationGas" | "verificationGasLimit" | "maxFeePerGas" | "maxPriorityFeePerGas"> & RequestPaymasterAndDataResponse<TEntryPointVersion>;
-export interface AlchemyGasManagerConfig {
-    policyId: string;
-    gasEstimationOptions?: AlchemyGasEstimationOptions;
-    paymasterAddress?: Address;
-    dummyData?: Hex;
-}
-export interface AlchemyGasEstimationOptions {
-    disableGasEstimation: boolean;
-    fallbackGasEstimator?: ClientMiddlewareFn;
-    fallbackFeeDataGetter?: ClientMiddlewareFn;
-}
-export declare function alchemyGasManagerMiddleware<C extends ClientWithAlchemyMethods>(client: C, config: AlchemyGasManagerConfig): Pick<ClientMiddlewareConfig, "paymasterAndData" | "feeEstimator" | "gasEstimator">;
+import type { ClientMiddlewareConfig } from "@aa-sdk/core";
+export declare function alchemyGasManagerMiddleware(policyId: string): Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">;

package/dist/esm/middleware/gasManager.js

@@ -1,149 +1,7 @@
-import { bypassPaymasterAndDataEmptyHex, deepHexlify, defaultGasEstimator, filterUndefined, isBigNumberish, isMultiplier, resolveProperties, } from "@aa-sdk/core";
-import { concat, fromHex, isHex } from "viem";
-import { getAlchemyPaymasterAddress } from "../gas-manager.js";
-import { alchemyFeeEstimator } from "./feeEstimator.js";
-const dummyPaymasterAndData = (client, config) => async (uo) => {
-    const paymaster = config.paymasterAddress ?? getAlchemyPaymasterAddress(client.chain);
-    const paymasterData = config.dummyData ??
-        "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
-    return {
-        ...uo,
-        paymaster,
-        paymasterData,
-        paymasterAndData: concat([paymaster, paymasterData]),
-    };
-};
-export function alchemyGasManagerMiddleware(client, config) {
-    const gasEstimationOptions = config.gasEstimationOptions;
-    const disableGasEstimation = gasEstimationOptions?.disableGasEstimation ?? false;
-    const fallbackFeeDataGetter = gasEstimationOptions?.fallbackFeeDataGetter ?? alchemyFeeEstimator(client);
-    const fallbackGasEstimator = gasEstimationOptions?.fallbackGasEstimator ??
-        defaultGasEstimator(client);
-    return {
-        gasEstimator: disableGasEstimation
-            ? fallbackGasEstimator
-            : async (struct, { overrides, account, feeOptions }) => {
-                if (bypassPaymasterAndDataEmptyHex(overrides)) {
-                    return {
-                        ...struct,
-                        ...(await fallbackGasEstimator(struct, {
-                            overrides,
-                            account,
-                            feeOptions,
-                            client,
-                        })),
-                    };
-                }
-                return struct;
-            },
-        feeEstimator: disableGasEstimation
-            ? fallbackFeeDataGetter
-            : async (struct, { overrides, account, feeOptions }) => {
-                let maxFeePerGas = await struct.maxFeePerGas;
-                let maxPriorityFeePerGas = await struct.maxPriorityFeePerGas;
-                if (bypassPaymasterAndDataEmptyHex(overrides)) {
-                    const result = await fallbackFeeDataGetter(struct, {
-                        overrides,
-                        feeOptions,
-                        account,
-                        client,
-                    });
-                    maxFeePerGas = (await result.maxFeePerGas) ?? maxFeePerGas;
-                    maxPriorityFeePerGas =
-                        (await result.maxPriorityFeePerGas) ?? maxPriorityFeePerGas;
-                }
-                return {
-                    ...struct,
-                    maxFeePerGas,
-                    maxPriorityFeePerGas,
-                };
-            },
-        ...(disableGasEstimation
-            ? requestPaymasterAndData(client, config)
-            : requestGasAndPaymasterData(client, config)),
-    };
+import { erc7677Middleware } from "@aa-sdk/core";
+export function alchemyGasManagerMiddleware(policyId) {
+    return erc7677Middleware({
+        context: { policyId: policyId },
+    });
 }
-const overrideField = (field, overrides, feeOptions, userOperation) => {
-    let _field = field;
-    if (overrides?.[_field] != null) {
-        if (isBigNumberish(overrides[_field])) {
-            return deepHexlify(overrides[_field]);
-        }
-        else {
-            return {
-                multiplier: Number(overrides[_field].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;
-};
-function requestGasAndPaymasterData(client, config) {
-    return {
-        dummyPaymasterAndData: dummyPaymasterAndData(client, config),
-        paymasterAndData: async (struct, { overrides: overrides_, feeOptions, account }) => {
-            const userOperation = deepHexlify(await resolveProperties(struct));
-            const overrides = filterUndefined({
-                maxFeePerGas: overrideField("maxFeePerGas", overrides_, feeOptions, userOperation),
-                maxPriorityFeePerGas: overrideField("maxPriorityFeePerGas", overrides_, feeOptions, userOperation),
-                callGasLimit: overrideField("callGasLimit", overrides_, feeOptions, userOperation),
-                verificationGasLimit: overrideField("verificationGasLimit", overrides_, feeOptions, userOperation),
-                preVerificationGas: overrideField("preVerificationGas", overrides_, feeOptions, userOperation),
-            });
-            if (account.getEntryPoint().version === "0.7.0") {
-                const paymasterVerificationGasLimit = overrideField("paymasterVerificationGasLimit", overrides_, feeOptions, userOperation);
-                if (paymasterVerificationGasLimit != null) {
-                    overrides.paymasterVerificationGasLimit = paymasterVerificationGasLimit;
-                }
-                const paymasterPostOpGasLimit = overrideField("paymasterPostOpGasLimit", overrides_, feeOptions, userOperation);
-                if (paymasterPostOpGasLimit != null) {
-                    overrides.paymasterPostOpGasLimit = paymasterPostOpGasLimit;
-                }
-            }
-            const result = await client.request({
-                method: "alchemy_requestGasAndPaymasterAndData",
-                params: [
-                    {
-                        policyId: config.policyId,
-                        entryPoint: account.getEntryPoint().address,
-                        userOperation,
-                        dummySignature: userOperation.signature,
-                        overrides,
-                    },
-                ],
-            });
-            return {
-                ...struct,
-                ...result,
-            };
-        },
-    };
-}
-const requestPaymasterAndData = (client, config) => ({
-    dummyPaymasterAndData: dummyPaymasterAndData(client, config),
-    paymasterAndData: async (struct, { account }) => {
-        const result = await client.request({
-            method: "alchemy_requestPaymasterAndData",
-            params: [
-                {
-                    policyId: config.policyId,
-                    entryPoint: account.getEntryPoint().address,
-                    userOperation: deepHexlify(await resolveProperties(struct)),
-                },
-            ],
-        });
-        return {
-            ...struct,
-            ...result,
-        };
-    },
-});
 //# 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  Address,\n  ClientMiddlewareConfig,\n  ClientMiddlewareFn,\n  EntryPointVersion,\n  Multiplier,\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationRequest,\n} from \"@aa-sdk/core\";\nimport {\n  bypassPaymasterAndDataEmptyHex,\n  deepHexlify,\n  defaultGasEstimator,\n  filterUndefined,\n  isBigNumberish,\n  isMultiplier,\n  resolveProperties,\n} from \"@aa-sdk/core\";\nimport { concat, fromHex, isHex, type Hex } from \"viem\";\nimport type { ClientWithAlchemyMethods } from \"../client/types\";\nimport { getAlchemyPaymasterAddress } from \"../gas-manager.js\";\nimport { alchemyFeeEstimator } from \"./feeEstimator.js\";\n\n/**\n * overrides value for [`alchemy_requestGasAndPaymasterData`](https://docs.alchemy.com/reference/alchemy-requestgasandpaymasteranddata)\n *\n * @template {EntryPointVersion} TEntryPointVersion entry point version type\n */\nexport type RequestGasAndPaymasterAndDataOverrides<\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = Partial<\n  {\n    maxFeePerGas:\n      | UserOperationRequest<TEntryPointVersion>[\"maxFeePerGas\"]\n      | Multiplier;\n    maxPriorityFeePerGas:\n      | UserOperationRequest<TEntryPointVersion>[\"maxPriorityFeePerGas\"]\n      | Multiplier;\n    callGasLimit:\n      | UserOperationRequest<TEntryPointVersion>[\"callGasLimit\"]\n      | Multiplier;\n    verificationGasLimit:\n      | UserOperationRequest<TEntryPointVersion>[\"verificationGasLimit\"]\n      | Multiplier;\n    preVerificationGas:\n      | UserOperationRequest<TEntryPointVersion>[\"preVerificationGas\"]\n      | Multiplier;\n  } & TEntryPointVersion extends \"0.7.0\"\n    ? {\n        paymasterVerificationGasLimit:\n          | UserOperationRequest<\"0.7.0\">[\"paymasterVerificationGasLimit\"]\n          | Multiplier;\n        paymasterPostOpGasLimit:\n          | UserOperationRequest<\"0.7.0\">[\"paymasterPostOpGasLimit\"]\n          | Multiplier;\n      }\n    : {}\n>;\n\n/**\n * [`alchemy-requestpaymasteranddata`](https://docs.alchemy.com/reference/alchemy-requestpaymasteranddata)\n * response type\n *\n * @template {EntryPointVersion} TEntryPointVersion entry point version type\n */\nexport type RequestPaymasterAndDataResponse<\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion\n> = TEntryPointVersion extends \"0.6.0\"\n  ? {\n      paymasterAndData: UserOperationRequest<\"0.6.0\">[\"paymasterAndData\"];\n    }\n  : TEntryPointVersion extends \"0.7.0\"\n  ? Pick<UserOperationRequest<\"0.7.0\">, \"paymaster\" | \"paymasterData\">\n  : {};\n\n/**\n * [`alchemy_requestGasAndPaymasterData`](https://docs.alchemy.com/reference/alchemy-requestgasandpaymasteranddata)\n * response type\n *\n * @template {EntryPointVersion} TEntryPointVersion entry point version type\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  RequestPaymasterAndDataResponse<TEntryPointVersion>;\n\n/**\n * Alchemy gas manager configuration with gas policy id and optional gas estimation options\n *\n * To create a Gas Manager Policy, go to the [gas manager](https://dashboard.alchemy.com/gas-manager?a=embedded-accounts-get-started)\n * page of the Alchemy dashboard and click the “Create new policy” button.\n */\nexport interface AlchemyGasManagerConfig {\n  /**\n   * the policy id of the gas manager you want to use.\n   *\n   */\n  policyId: string;\n  /**\n   * optional option configurable for the gas estimation portion of the Alchemy gas manager\n   *\n   */\n  gasEstimationOptions?: AlchemyGasEstimationOptions;\n  /**\n   * paymaster address to use for the gas estimation.\n   * If not provided, the default paymaster address for the chain will be used.\n   *\n   */\n  paymasterAddress?: Address;\n  /**\n   * dummy paymaster data to use for the gas estimation.\n   *\n   */\n  dummyData?: Hex;\n}\n\n/**\n * Alchemy gas manager configuration option configurable for the gas estimation portion of the Alchemy gas manager\n *\n */\nexport interface AlchemyGasEstimationOptions {\n  /**\n   * disable gas estimation and fallback to the default gas estimation.\n   *\n   */\n  disableGasEstimation: boolean;\n  /**\n   * optional fallback gas estimator to use when gas estimation is disabled.\n   *\n   */\n  fallbackGasEstimator?: ClientMiddlewareFn;\n  /**\n   * optional fallback fee estimator to use when gas estimation is disabled.\n   *\n   */\n  fallbackFeeDataGetter?: ClientMiddlewareFn;\n}\n\n/**\n * Dummy paymaster and data middleware for the alchemy gas manager\n *\n * NOTE: right now, this only really works for 0.6.0 unless you pass in overrides in the config for 0.7.0\n *\n * @template {ClientWithAlchemyMethods} C\n * @param {ClientWithAlchemyMethods} client client with alchemy methods\n * @param {AlchemyGasManagerConfig} config alchemy gas manager configuration\n * @returns {() => Hex} the dummyPaymasterAndData middleware for Alchemy gas manager\n */\nconst dummyPaymasterAndData =\n  <C extends ClientWithAlchemyMethods>(\n    client: C,\n    config: AlchemyGasManagerConfig\n  ): ClientMiddlewareFn =>\n  async (uo) => {\n    const paymaster =\n      config.paymasterAddress ?? getAlchemyPaymasterAddress(client.chain);\n    const paymasterData =\n      config.dummyData ??\n      \"0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n    return {\n      ...uo,\n      paymaster,\n      paymasterData,\n      paymasterAndData: concat([paymaster, paymasterData]),\n    };\n  };\n\n/**\n * Alchemy gas manager middleware used as the paymaster middleware overrides param to the client middleware config\n *\n * @template {ClientWithAlchemyMethods} C\n * @param {ClientWithAlchemyMethods} client client with alchemy methods\n * @param {AlchemyGasManagerConfig} config alchemy gas manager configuration\n * @returns {Pick<ClientMiddlewareConfig,\"paymasterAndData\" | \"feeEstimator\" | \"gasEstimator\">} the gas estimator, fee estimator, and paymasterAndData middleware for Alchemy gas manager\n */\nexport function alchemyGasManagerMiddleware<C extends ClientWithAlchemyMethods>(\n  client: C,\n  config: AlchemyGasManagerConfig\n): Pick<\n  ClientMiddlewareConfig,\n  \"paymasterAndData\" | \"feeEstimator\" | \"gasEstimator\"\n> {\n  const gasEstimationOptions = config.gasEstimationOptions;\n  const disableGasEstimation =\n    gasEstimationOptions?.disableGasEstimation ?? false;\n  const fallbackFeeDataGetter =\n    gasEstimationOptions?.fallbackFeeDataGetter ?? alchemyFeeEstimator(client);\n  const fallbackGasEstimator =\n    gasEstimationOptions?.fallbackGasEstimator ??\n    defaultGasEstimator<C>(client);\n\n  return {\n    gasEstimator: disableGasEstimation\n      ? fallbackGasEstimator\n      : async (struct, { overrides, account, feeOptions }) => {\n          // if user is bypassing paymaster to fallback to having the account to pay the gas (one-off override),\n          // we cannot delegate gas estimation to the bundler because paymaster middleware will not be called\n          if (bypassPaymasterAndDataEmptyHex(overrides)) {\n            return {\n              ...struct,\n              ...(await fallbackGasEstimator(struct, {\n                overrides,\n                account,\n                feeOptions,\n                client,\n              })),\n            };\n          }\n\n          // essentially noop, because the gas estimation will happen in the backend\n          return struct;\n        },\n    feeEstimator: disableGasEstimation\n      ? fallbackFeeDataGetter\n      : async (struct, { overrides, account, feeOptions }) => {\n          let maxFeePerGas = await struct.maxFeePerGas;\n          let maxPriorityFeePerGas = await struct.maxPriorityFeePerGas;\n\n          // if user is bypassing paymaster to fallback to having the account to pay the gas (one-off override),\n          // we cannot delegate gas estimation to the bundler because paymaster middleware will not be called\n          if (bypassPaymasterAndDataEmptyHex(overrides)) {\n            const result = await fallbackFeeDataGetter(struct, {\n              overrides,\n              feeOptions,\n              account,\n              client,\n            });\n            maxFeePerGas = (await result.maxFeePerGas) ?? maxFeePerGas;\n            maxPriorityFeePerGas =\n              (await result.maxPriorityFeePerGas) ?? maxPriorityFeePerGas;\n          }\n\n          return {\n            ...struct,\n            maxFeePerGas,\n            maxPriorityFeePerGas,\n          };\n        },\n    ...(disableGasEstimation\n      ? requestPaymasterAndData(client, config)\n      : requestGasAndPaymasterData(client, config)),\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 | undefine} 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\n/**\n * Alchemy gas manager middleware function that returns the paymaster middleware for the client middleware config\n * that calls the [`alchemy_requestGasAndPaymasterAndData`](https://docs.alchemy.com/reference/alchemy-requestgasandpaymasteranddata)\n *\n * @template {ClientWithAlchemyMethods} C\n * @param {ClientWithAlchemyMethods} client client with alchemy methods\n * @param {AlchemyGasManagerConfig} config alchemy gas manager configuration\n * @returns {ClientMiddlewareConfig[\"paymasterAndData\"]} the paymasterAndData middleware for Alchemy gas manager\n */\nfunction requestGasAndPaymasterData<C extends ClientWithAlchemyMethods>(\n  client: C,\n  config: AlchemyGasManagerConfig\n): Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\"> {\n  return {\n    dummyPaymasterAndData: dummyPaymasterAndData(client, config),\n    paymasterAndData: async (\n      struct,\n      { overrides: overrides_, feeOptions, account }\n    ) => {\n      const userOperation: UserOperationRequest = deepHexlify(\n        await resolveProperties(struct)\n      );\n\n      const overrides: RequestGasAndPaymasterAndDataOverrides = filterUndefined(\n        {\n          maxFeePerGas: overrideField(\n            \"maxFeePerGas\",\n            overrides_ as UserOperationOverrides,\n            feeOptions,\n            userOperation\n          ),\n          maxPriorityFeePerGas: overrideField(\n            \"maxPriorityFeePerGas\",\n            overrides_ as UserOperationOverrides,\n            feeOptions,\n            userOperation\n          ),\n          callGasLimit: overrideField(\n            \"callGasLimit\",\n            overrides_ as UserOperationOverrides,\n            feeOptions,\n            userOperation\n          ),\n          verificationGasLimit: overrideField(\n            \"verificationGasLimit\",\n            overrides_ as UserOperationOverrides,\n            feeOptions,\n            userOperation\n          ),\n          preVerificationGas: overrideField(\n            \"preVerificationGas\",\n            overrides_ as UserOperationOverrides,\n            feeOptions,\n            userOperation\n          ),\n        }\n      );\n\n      if (account.getEntryPoint().version === \"0.7.0\") {\n        const paymasterVerificationGasLimit = overrideField<\"0.7.0\">(\n          \"paymasterVerificationGasLimit\",\n          overrides_ as UserOperationOverrides<\"0.7.0\">,\n          feeOptions,\n          userOperation\n        );\n        if (paymasterVerificationGasLimit != null) {\n          (\n            overrides as RequestGasAndPaymasterAndDataOverrides<\"0.7.0\">\n          ).paymasterVerificationGasLimit = paymasterVerificationGasLimit;\n        }\n\n        const paymasterPostOpGasLimit = overrideField<\"0.7.0\">(\n          \"paymasterPostOpGasLimit\",\n          overrides_ as UserOperationOverrides<\"0.7.0\">,\n          feeOptions,\n          userOperation\n        );\n        if (paymasterPostOpGasLimit != null) {\n          (\n            overrides as RequestGasAndPaymasterAndDataOverrides<\"0.7.0\">\n          ).paymasterPostOpGasLimit = paymasterPostOpGasLimit;\n        }\n      }\n\n      const result = await client.request({\n        method: \"alchemy_requestGasAndPaymasterAndData\",\n        params: [\n          {\n            policyId: config.policyId,\n            entryPoint: account.getEntryPoint().address,\n            userOperation,\n            dummySignature: userOperation.signature,\n            overrides,\n          },\n        ],\n      });\n\n      return {\n        ...struct,\n        ...result,\n      };\n    },\n  };\n}\n\n/**\n * Alchemy gas manager middleware function that returns the paymaster middleware for the client middleware config\n * that calls the [`alchemy_requestPaymasterAndData`](https://docs.alchemy.com/reference/alchemy-requestpaymasteranddata)\n * with gas estimation disabled.\n *\n * @param {ClientWithAlchemyMethods} client client with alchemy methods\n * @param {AlchemyGasManagerConfig} config alchemy gas manager configuration\n * @returns {ClientMiddlewareConfig[\"paymasterAndData\"]} the paymasterAndData middleware for Alchemy gas manager with gas estimation disabled\n */\nconst requestPaymasterAndData: <C extends ClientWithAlchemyMethods>(\n  client: C,\n  config: AlchemyGasManagerConfig\n) => Pick<\n  ClientMiddlewareConfig,\n  \"dummyPaymasterAndData\" | \"paymasterAndData\"\n> = (client, config) => ({\n  dummyPaymasterAndData: dummyPaymasterAndData(client, config),\n  paymasterAndData: async (struct, { account }) => {\n    const result = await client.request({\n      method: \"alchemy_requestPaymasterAndData\",\n      params: [\n        {\n          policyId: config.policyId,\n          entryPoint: account.getEntryPoint().address,\n          userOperation: deepHexlify(await resolveProperties(struct)),\n        },\n      ],\n    });\n\n    return {\n      ...struct,\n      ...result,\n    };\n  },\n});\n"]}
+{"version":3,"file":"gasManager.js","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAqBjD,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 *\n * import { sepolia } from \"@account-kit/infra\";\n * import { http } from \"viem\";\n *\n * const client = createSmartAccountClient({\n *      http(\"rpc-url\"),\n *      sepolia,\n *      alchemyErc7677Middleware(\"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.0.0-alpha.6";
+export declare const VERSION = "4.0.0-alpha.8";

package/dist/esm/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "4.0.0-alpha.6";
+export const VERSION = "4.0.0-alpha.8";
 //# sourceMappingURL=version.js.map

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.0.0-alpha.6\";\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.0.0-alpha.8\";\n"]}