@aa-sdk/core 4.46.0 → 4.46.1

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

@@ -26,6 +26,8 @@ export type Erc7677RpcSchema<TContext extends Record<string, any> = Record<strin
         ReturnType: {
             paymaster?: Address;
             paymasterData?: Hex;
+            paymasterVerificationGasLimit?: Hex;
+            paymasterPostOpGasLimit?: Hex;
             paymasterAndData?: Hex;
         };
     }

package/dist/esm/middleware/erc7677middleware.js

@@ -58,8 +58,9 @@ export function erc7677Middleware(params) {
             ...uo,
             paymaster,
             paymasterData,
-            paymasterPostOpGasLimit,
+            // these values are currently not override-able, so can be set here directly
             paymasterVerificationGasLimit,
+            paymasterPostOpGasLimit,
         };
     };
     const paymasterAndData = async (uo, { client, account, feeOptions, overrides }) => {
@@ -72,7 +73,7 @@ export function erc7677Middleware(params) {
         }
         const erc7677client = client;
         const entrypoint = account.getEntryPoint();
-        const { paymaster, paymasterAndData, paymasterData } = await erc7677client.request({
+        const { paymaster, paymasterAndData, paymasterData, paymasterPostOpGasLimit, paymasterVerificationGasLimit, } = await erc7677client.request({
             method: "pm_getPaymasterData",
             params: [userOp, entrypoint.address, toHex(client.chain.id), context],
         });
@@ -86,6 +87,12 @@ export function erc7677Middleware(params) {
             ...uo,
             paymaster,
             paymasterData,
+            // if these fields are returned they should override the ones set by user operation gas estimation,
+            // otherwise they shouldn't modify
+            ...(paymasterVerificationGasLimit
+                ? { paymasterVerificationGasLimit }
+                : {}),
+            ...(paymasterPostOpGasLimit ? { paymasterPostOpGasLimit } : {}),
         };
     };
     return {

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

@@ -1 +1 @@
-{"version":3,"file":"erc7677middleware.js","sourceRoot":"","sources":["../../../src/middleware/erc7677middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,GAMN,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAOzD,OAAO,EACL,WAAW,EACX,iBAAiB,GAElB,MAAM,mBAAmB,CAAC;AAoD3B;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,iBAAiB,CAK/B,MAA0C;IAI1C,MAAM,qBAAqB,GAAuB,KAAK,EACrD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAC1C,EAAE;QACF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;QAExD,iDAAiD;QACjD,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5B,MAAM,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACpC,MAAM,CAAC,YAAY,GAAG,KAAK,CAAC;QAC5B,MAAM,CAAC,oBAAoB,GAAG,KAAK,CAAC;QACpC,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAElC,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;QAE3C,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YACnC,MAAM,CAAC,6BAA6B,GAAG,KAAK,CAAC;YAC7C,MAAM,CAAC,uBAAuB,GAAG,KAAK,CAAC;QACzC,CAAC;QAED,MAAM,OAAO,GACX,CAAC,OAAO,MAAM,EAAE,OAAO,KAAK,UAAU;YACpC,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;YAC1D,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,aAAa,GAAG,MAAuB,CAAC;QAC9C,+DAA+D;QAC/D,MAAM,EACJ,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,uBAAuB,EACvB,6BAA6B,GAC9B,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC;YAC9B,MAAM,EAAE,yBAAyB;YACjC,MAAM,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC;SACtE,CAAC,CAAC;QAEH,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YACnC,OAAO;gBACL,GAAG,EAAE;gBACL,gBAAgB;aACjB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,EAAE;YACL,SAAS;YACT,aAAa;YACb,uBAAuB;YACvB,6BAA6B;SAC9B,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAuB,KAAK,EAChD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAC1C,EAAE;QACF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;QACxD,MAAM,OAAO,GACX,CAAC,OAAO,MAAM,EAAE,OAAO,KAAK,UAAU;YACpC,CAAC,CAAC,MAAM,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;YAC1D,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAE7B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,aAAa,GAAG,MAAuB,CAAC;QAE9C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3C,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAE,GAClD,MAAM,aAAa,CAAC,OAAO,CAAC;YAC1B,MAAM,EAAE,qBAAqB;YAC7B,MAAM,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC;SACtE,CAAC,CAAC;QAEL,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YACnC,OAAO;gBACL,GAAG,EAAE;gBACL,gBAAgB;aACjB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,EAAE;YACL,SAAS;YACT,aAAa;SACd,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO;QACL,qBAAqB;QACrB,gBAAgB;KACjB,CAAC;AACJ,CAAC","sourcesContent":["import {\n  toHex,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport type { ClientMiddlewareConfig } from \"../client/types\";\nimport type { EntryPointVersion } from \"../entrypoint/types\";\nimport { ChainNotFoundError } from \"../errors/client.js\";\nimport type {\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationRequest,\n  UserOperationStruct,\n} from \"../types\";\nimport {\n  deepHexlify,\n  resolveProperties,\n  type Deferrable,\n} from \"../utils/index.js\";\nimport type { ClientMiddlewareFn } from \"./types\";\n\nexport type Erc7677RpcSchema<\n  TContext extends Record<string, any> = Record<string, any>,\n> = [\n  {\n    Method: \"pm_getPaymasterStubData\";\n    Parameters: [UserOperationRequest, Address, Hex, TContext];\n    ReturnType: {\n      sponsor?: { name: string; icon?: string }; // Sponsor info\n      paymaster?: Address; // Paymaster address (entrypoint v0.7)\n      paymasterData?: Hex; // Paymaster data (entrypoint v0.7)\n      paymasterVerificationGasLimit?: Hex; // Paymaster validation gas (entrypoint v0.7)\n      paymasterPostOpGasLimit?: Hex; // Paymaster post-op gas (entrypoint v0.7)\n      paymasterAndData?: Hex; // Paymaster and data (entrypoint v0.6)\n      isFinal?: boolean; // Indicates that the caller does not need to call pm_getPaymasterData\n    };\n  },\n  {\n    Method: \"pm_getPaymasterData\";\n    Parameters: [UserOperationRequest, Address, Hex, TContext];\n    ReturnType: {\n      paymaster?: Address; // Paymaster address (entrypoint v0.7)\n      paymasterData?: Hex; // Paymaster data (entrypoint v0.7)\n      paymasterAndData?: Hex; // Paymaster and data (entrypoint v0.6)\n    };\n  },\n];\n\nexport type Erc7677Client<\n  T extends Transport = Transport,\n  TContext extends Record<string, any> = Record<string, any>,\n> = Client<T, Chain, undefined, Erc7677RpcSchema<TContext>>;\n\nexport type Erc7677MiddlewareParams<\n  TContext extends Record<string, any> | undefined =\n    | Record<string, any>\n    | undefined,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion,\n> = {\n  context?:\n    | ((\n        struct: Deferrable<UserOperationStruct<TEntryPointVersion>>,\n        args: {\n          overrides?: UserOperationOverrides<TEntryPointVersion>;\n          feeOptions?: UserOperationFeeOptions;\n        },\n      ) => Promise<TContext>)\n    | TContext;\n};\n\n/**\n * Middleware function for interacting with ERC-7677 enabled clients. It supports resolving paymaster and data fields for user operations.\n * This middleware assumes that your RPC provider supports the ERC-7677 methods (pm_getPaymasterStubData and pm_getPaymasterData).\n *\n * @example\n * ```ts\n * import { createSmartAccountClient, erc7677Middleware } from \"@aa-sdk/core\";\n * import { http } from \"viem\";\n * import { sepolia } from \"viem/chains\";\n *\n * const client = createSmartAccountClient({\n *  transport: http(\"rpc-url\"),\n *  chain: sepolia,\n *  // this assumes that your RPC provider supports the ERC-7677 methods AND takes no context\n *  ...erc7677Middleware(),\n * })\n * ```\n *\n * @param {Erc7677MiddlewareParams<TContext>} params Middleware parameters including context function or object. Context can be resolved dynamically by passing in a function which takes in the context at the time of sending a user op\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">} An object containing middleware functions `dummyPaymasterAndData` and `paymasterAndData` for processing user operations with the paymaster data\n */\nexport function erc7677Middleware<\n  TContext extends Record<string, any> | undefined =\n    | Record<string, any>\n    | undefined,\n>(\n  params?: Erc7677MiddlewareParams<TContext>,\n): Required<\n  Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">\n> {\n  const dummyPaymasterAndData: ClientMiddlewareFn = async (\n    uo,\n    { client, account, feeOptions, overrides },\n  ) => {\n    const userOp = deepHexlify(await resolveProperties(uo));\n\n    // Those values will be set after fee estimation.\n    userOp.maxFeePerGas = \"0x0\";\n    userOp.maxPriorityFeePerGas = \"0x0\";\n    userOp.callGasLimit = \"0x0\";\n    userOp.verificationGasLimit = \"0x0\";\n    userOp.preVerificationGas = \"0x0\";\n\n    const entrypoint = account.getEntryPoint();\n\n    if (entrypoint.version === \"0.7.0\") {\n      userOp.paymasterVerificationGasLimit = \"0x0\";\n      userOp.paymasterPostOpGasLimit = \"0x0\";\n    }\n\n    const context =\n      (typeof params?.context === \"function\"\n        ? await params?.context(userOp, { overrides, feeOptions })\n        : params?.context) ?? {};\n\n    if (!client.chain) {\n      throw new ChainNotFoundError();\n    }\n\n    const erc7677client = client as Erc7677Client;\n    // TODO: probably need to handle the sponsor and isFinal fields\n    const {\n      paymaster,\n      paymasterAndData,\n      paymasterData,\n      paymasterPostOpGasLimit,\n      paymasterVerificationGasLimit,\n    } = await erc7677client.request({\n      method: \"pm_getPaymasterStubData\",\n      params: [userOp, entrypoint.address, toHex(client.chain.id), context],\n    });\n\n    if (entrypoint.version === \"0.6.0\") {\n      return {\n        ...uo,\n        paymasterAndData,\n      };\n    }\n\n    return {\n      ...uo,\n      paymaster,\n      paymasterData,\n      paymasterPostOpGasLimit,\n      paymasterVerificationGasLimit,\n    };\n  };\n\n  const paymasterAndData: ClientMiddlewareFn = async (\n    uo,\n    { client, account, feeOptions, overrides },\n  ) => {\n    const userOp = deepHexlify(await resolveProperties(uo));\n    const context =\n      (typeof params?.context === \"function\"\n        ? await params?.context(userOp, { overrides, feeOptions })\n        : params?.context) ?? {};\n\n    if (!client.chain) {\n      throw new ChainNotFoundError();\n    }\n\n    const erc7677client = client as Erc7677Client;\n\n    const entrypoint = account.getEntryPoint();\n    const { paymaster, paymasterAndData, paymasterData } =\n      await erc7677client.request({\n        method: \"pm_getPaymasterData\",\n        params: [userOp, entrypoint.address, toHex(client.chain.id), context],\n      });\n\n    if (entrypoint.version === \"0.6.0\") {\n      return {\n        ...uo,\n        paymasterAndData,\n      };\n    }\n\n    return {\n      ...uo,\n      paymaster,\n      paymasterData,\n    };\n  };\n\n  return {\n    dummyPaymasterAndData,\n    paymasterAndData,\n  };\n}\n"]}
+{"version":3,"file":"erc7677middleware.js","sourceRoot":"","sources":["../../../src/middleware/erc7677middleware.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  toHex,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport type { ClientMiddlewareConfig } from \"../client/types\";\nimport type { EntryPointVersion } from \"../entrypoint/types\";\nimport { ChainNotFoundError } from \"../errors/client.js\";\nimport type {\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationRequest,\n  UserOperationStruct,\n} from \"../types\";\nimport {\n  deepHexlify,\n  resolveProperties,\n  type Deferrable,\n} from \"../utils/index.js\";\nimport type { ClientMiddlewareFn } from \"./types\";\n\nexport type Erc7677RpcSchema<\n  TContext extends Record<string, any> = Record<string, any>,\n> = [\n  {\n    Method: \"pm_getPaymasterStubData\";\n    Parameters: [UserOperationRequest, Address, Hex, TContext];\n    ReturnType: {\n      sponsor?: { name: string; icon?: string }; // Sponsor info\n      paymaster?: Address; // Paymaster address (entrypoint v0.7)\n      paymasterData?: Hex; // Paymaster data (entrypoint v0.7)\n      paymasterVerificationGasLimit?: Hex; // Paymaster validation gas (entrypoint v0.7)\n      paymasterPostOpGasLimit?: Hex; // Paymaster post-op gas (entrypoint v0.7)\n      paymasterAndData?: Hex; // Paymaster and data (entrypoint v0.6)\n      isFinal?: boolean; // Indicates that the caller does not need to call pm_getPaymasterData\n    };\n  },\n  {\n    Method: \"pm_getPaymasterData\";\n    Parameters: [UserOperationRequest, Address, Hex, TContext];\n    ReturnType: {\n      paymaster?: Address; // Paymaster address (entrypoint v0.7)\n      paymasterData?: Hex; // Paymaster data (entrypoint v0.7)\n      paymasterVerificationGasLimit?: Hex; // Paymaster validation gas (entrypoint v0.7)\n      paymasterPostOpGasLimit?: Hex; // Paymaster post-op gas (entrypoint v0.7)\n      paymasterAndData?: Hex; // Paymaster and data (entrypoint v0.6)\n    };\n  },\n];\n\nexport type Erc7677Client<\n  T extends Transport = Transport,\n  TContext extends Record<string, any> = Record<string, any>,\n> = Client<T, Chain, undefined, Erc7677RpcSchema<TContext>>;\n\nexport type Erc7677MiddlewareParams<\n  TContext extends Record<string, any> | undefined =\n    | Record<string, any>\n    | undefined,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion,\n> = {\n  context?:\n    | ((\n        struct: Deferrable<UserOperationStruct<TEntryPointVersion>>,\n        args: {\n          overrides?: UserOperationOverrides<TEntryPointVersion>;\n          feeOptions?: UserOperationFeeOptions;\n        },\n      ) => Promise<TContext>)\n    | TContext;\n};\n\n/**\n * Middleware function for interacting with ERC-7677 enabled clients. It supports resolving paymaster and data fields for user operations.\n * This middleware assumes that your RPC provider supports the ERC-7677 methods (pm_getPaymasterStubData and pm_getPaymasterData).\n *\n * @example\n * ```ts\n * import { createSmartAccountClient, erc7677Middleware } from \"@aa-sdk/core\";\n * import { http } from \"viem\";\n * import { sepolia } from \"viem/chains\";\n *\n * const client = createSmartAccountClient({\n *  transport: http(\"rpc-url\"),\n *  chain: sepolia,\n *  // this assumes that your RPC provider supports the ERC-7677 methods AND takes no context\n *  ...erc7677Middleware(),\n * })\n * ```\n *\n * @param {Erc7677MiddlewareParams<TContext>} params Middleware parameters including context function or object. Context can be resolved dynamically by passing in a function which takes in the context at the time of sending a user op\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">} An object containing middleware functions `dummyPaymasterAndData` and `paymasterAndData` for processing user operations with the paymaster data\n */\nexport function erc7677Middleware<\n  TContext extends Record<string, any> | undefined =\n    | Record<string, any>\n    | undefined,\n>(\n  params?: Erc7677MiddlewareParams<TContext>,\n): Required<\n  Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">\n> {\n  const dummyPaymasterAndData: ClientMiddlewareFn = async (\n    uo,\n    { client, account, feeOptions, overrides },\n  ) => {\n    const userOp = deepHexlify(await resolveProperties(uo));\n\n    // Those values will be set after fee estimation.\n    userOp.maxFeePerGas = \"0x0\";\n    userOp.maxPriorityFeePerGas = \"0x0\";\n    userOp.callGasLimit = \"0x0\";\n    userOp.verificationGasLimit = \"0x0\";\n    userOp.preVerificationGas = \"0x0\";\n\n    const entrypoint = account.getEntryPoint();\n\n    if (entrypoint.version === \"0.7.0\") {\n      userOp.paymasterVerificationGasLimit = \"0x0\";\n      userOp.paymasterPostOpGasLimit = \"0x0\";\n    }\n\n    const context =\n      (typeof params?.context === \"function\"\n        ? await params?.context(userOp, { overrides, feeOptions })\n        : params?.context) ?? {};\n\n    if (!client.chain) {\n      throw new ChainNotFoundError();\n    }\n\n    const erc7677client = client as Erc7677Client;\n    // TODO: probably need to handle the sponsor and isFinal fields\n    const {\n      paymaster,\n      paymasterAndData,\n      paymasterData,\n      paymasterPostOpGasLimit,\n      paymasterVerificationGasLimit,\n    } = await erc7677client.request({\n      method: \"pm_getPaymasterStubData\",\n      params: [userOp, entrypoint.address, toHex(client.chain.id), context],\n    });\n\n    if (entrypoint.version === \"0.6.0\") {\n      return {\n        ...uo,\n        paymasterAndData,\n      };\n    }\n\n    return {\n      ...uo,\n      paymaster,\n      paymasterData,\n      // these values are currently not override-able, so can be set here directly\n      paymasterVerificationGasLimit,\n      paymasterPostOpGasLimit,\n    };\n  };\n\n  const paymasterAndData: ClientMiddlewareFn = async (\n    uo,\n    { client, account, feeOptions, overrides },\n  ) => {\n    const userOp = deepHexlify(await resolveProperties(uo));\n    const context =\n      (typeof params?.context === \"function\"\n        ? await params?.context(userOp, { overrides, feeOptions })\n        : params?.context) ?? {};\n\n    if (!client.chain) {\n      throw new ChainNotFoundError();\n    }\n\n    const erc7677client = client as Erc7677Client;\n\n    const entrypoint = account.getEntryPoint();\n    const {\n      paymaster,\n      paymasterAndData,\n      paymasterData,\n      paymasterPostOpGasLimit,\n      paymasterVerificationGasLimit,\n    } = await erc7677client.request({\n      method: \"pm_getPaymasterData\",\n      params: [userOp, entrypoint.address, toHex(client.chain.id), context],\n    });\n\n    if (entrypoint.version === \"0.6.0\") {\n      return {\n        ...uo,\n        paymasterAndData,\n      };\n    }\n\n    return {\n      ...uo,\n      paymaster,\n      paymasterData,\n      // if these fields are returned they should override the ones set by user operation gas estimation,\n      // otherwise they shouldn't modify\n      ...(paymasterVerificationGasLimit\n        ? { paymasterVerificationGasLimit }\n        : {}),\n      ...(paymasterPostOpGasLimit ? { paymasterPostOpGasLimit } : {}),\n    };\n  };\n\n  return {\n    dummyPaymasterAndData,\n    paymasterAndData,\n  };\n}\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.46.0";
+export declare const VERSION = "4.46.1";

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.46.0";
+export const VERSION = "4.46.1";
 //# 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,QAAQ,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.46.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.46.1\";\n"]}

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

@@ -26,6 +26,8 @@ export type Erc7677RpcSchema<TContext extends Record<string, any> = Record<strin
         ReturnType: {
             paymaster?: Address;
             paymasterData?: Hex;
+            paymasterVerificationGasLimit?: Hex;
+            paymasterPostOpGasLimit?: Hex;
             paymasterAndData?: Hex;
         };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"erc7677middleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/erc7677middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,SAAS,EACf,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EACV,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,MAAM,gBAAgB,CAC1B,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD;IACF;QACE,MAAM,EAAE,yBAAyB,CAAC;QAClC,UAAU,EAAE,CAAC,oBAAoB,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3D,UAAU,EAAE;YACV,OAAO,CAAC,EAAE;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YAC1C,SAAS,CAAC,EAAE,OAAO,CAAC;YACpB,aAAa,CAAC,EAAE,GAAG,CAAC;YACpB,6BAA6B,CAAC,EAAE,GAAG,CAAC;YACpC,uBAAuB,CAAC,EAAE,GAAG,CAAC;YAC9B,gBAAgB,CAAC,EAAE,GAAG,CAAC;YACvB,OAAO,CAAC,EAAE,OAAO,CAAC;SACnB,CAAC;KACH;IACD;QACE,MAAM,EAAE,qBAAqB,CAAC;QAC9B,UAAU,EAAE,CAAC,oBAAoB,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3D,UAAU,EAAE;YACV,SAAS,CAAC,EAAE,OAAO,CAAC;YACpB,aAAa,CAAC,EAAE,GAAG,CAAC;YACpB,gBAAgB,CAAC,EAAE,GAAG,CAAC;SACxB,CAAC;KACH;CACF,CAAC;AAEF,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IACxD,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAE5D,MAAM,MAAM,uBAAuB,CACjC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACnB,SAAS,EACb,kBAAkB,SAAS,iBAAiB,GAAG,iBAAiB,IAC9D;IACF,OAAO,CAAC,EACJ,CAAC,CACC,MAAM,EAAE,UAAU,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC,EAC3D,IAAI,EAAE;QACJ,SAAS,CAAC,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;QACvD,UAAU,CAAC,EAAE,uBAAuB,CAAC;KACtC,KACE,OAAO,CAAC,QAAQ,CAAC,CAAC,GACvB,QAAQ,CAAC;CACd,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACnB,SAAS,EAEb,MAAM,CAAC,EAAE,uBAAuB,CAAC,QAAQ,CAAC,GACzC,QAAQ,CACT,IAAI,CAAC,sBAAsB,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,CAC3E,CAoGA"}
+{"version":3,"file":"erc7677middleware.d.ts","sourceRoot":"","sources":["../../../src/middleware/erc7677middleware.ts"],"names":[],"mappings":"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"}

package/dist/types/version.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aa-sdk/core",
   "license": "MIT",
-  "version": "4.46.0",
+  "version": "4.46.1",
   "description": "viem based SDK that enables interactions with ERC-4337 Smart Accounts. ABIs are based off the definitions generated in @account-abstraction/contracts",
   "author": "Alchemy",
   "type": "module",
@@ -62,5 +62,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "fb516cc1ba7059a257fb329fb8663c7cc90947bb"
+  "gitHead": "2ca1391276e965f6d9e2c33e5753c95125b0e947"
 }

package/src/middleware/erc7677middleware.ts

@@ -44,6 +44,8 @@ export type Erc7677RpcSchema<
     ReturnType: {
       paymaster?: Address; // Paymaster address (entrypoint v0.7)
       paymasterData?: Hex; // Paymaster data (entrypoint v0.7)
+      paymasterVerificationGasLimit?: Hex; // Paymaster validation gas (entrypoint v0.7)
+      paymasterPostOpGasLimit?: Hex; // Paymaster post-op gas (entrypoint v0.7)
       paymasterAndData?: Hex; // Paymaster and data (entrypoint v0.6)
     };
   },
@@ -154,8 +156,9 @@ export function erc7677Middleware<
       ...uo,
       paymaster,
       paymasterData,
-      paymasterPostOpGasLimit,
+      // these values are currently not override-able, so can be set here directly
       paymasterVerificationGasLimit,
+      paymasterPostOpGasLimit,
     };
   };
 
@@ -176,11 +179,16 @@ export function erc7677Middleware<
     const erc7677client = client as Erc7677Client;
 
     const entrypoint = account.getEntryPoint();
-    const { paymaster, paymasterAndData, paymasterData } =
-      await erc7677client.request({
-        method: "pm_getPaymasterData",
-        params: [userOp, entrypoint.address, toHex(client.chain.id), context],
-      });
+    const {
+      paymaster,
+      paymasterAndData,
+      paymasterData,
+      paymasterPostOpGasLimit,
+      paymasterVerificationGasLimit,
+    } = await erc7677client.request({
+      method: "pm_getPaymasterData",
+      params: [userOp, entrypoint.address, toHex(client.chain.id), context],
+    });
 
     if (entrypoint.version === "0.6.0") {
       return {
@@ -193,6 +201,12 @@ export function erc7677Middleware<
       ...uo,
       paymaster,
       paymasterData,
+      // if these fields are returned they should override the ones set by user operation gas estimation,
+      // otherwise they shouldn't modify
+      ...(paymasterVerificationGasLimit
+        ? { paymasterVerificationGasLimit }
+        : {}),
+      ...(paymasterPostOpGasLimit ? { paymasterPostOpGasLimit } : {}),
     };
   };
 

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.46.0";
+export const VERSION = "4.46.1";