@aa-sdk/core 4.0.0-alpha.1 → 4.0.0-alpha.11

package/dist/cjs/middleware/actions.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.middlewareActions = void 0;
-const viem_1 = require("viem");
-const userop_js_1 = require("../utils/userop.js");
 const feeEstimator_js_1 = require("./defaults/feeEstimator.js");
 const gasEstimator_js_1 = require("./defaults/gasEstimator.js");
 const paymasterAndData_js_1 = require("./defaults/paymasterAndData.js");
@@ -11,24 +9,10 @@ const noopMiddleware_js_1 = require("./noopMiddleware.js");
 const middlewareActions = (overrides) => (client) => ({
     middleware: {
         customMiddleware: overrides.customMiddleware ?? noopMiddleware_js_1.noopMiddleware,
-        dummyPaymasterAndData: overrides.paymasterAndData?.dummyPaymasterAndData
-            ? async (struct, { account }) => {
-                const data = overrides.paymasterAndData.dummyPaymasterAndData();
-                const paymasterOverrides = account.getEntryPoint().version === "0.7.0"
-                    ? (0, viem_1.isHex)(data)
-                        ? (0, userop_js_1.parsePaymasterAndData)(data)
-                        : data
-                    : {
-                        paymasterAndData: (0, viem_1.isHex)(data)
-                            ? data
-                            : (0, userop_js_1.concatPaymasterAndData)(data),
-                    };
-                return { ...struct, ...paymasterOverrides };
-            }
-            : paymasterAndData_js_1.defaultPaymasterAndData,
+        dummyPaymasterAndData: overrides.dummyPaymasterAndData ?? paymasterAndData_js_1.defaultPaymasterAndData,
         feeEstimator: overrides.feeEstimator ?? (0, feeEstimator_js_1.defaultFeeEstimator)(client),
         gasEstimator: overrides.gasEstimator ?? (0, gasEstimator_js_1.defaultGasEstimator)(client),
-        paymasterAndData: overrides.paymasterAndData?.paymasterAndData ?? paymasterAndData_js_1.defaultPaymasterAndData,
+        paymasterAndData: overrides.paymasterAndData ?? paymasterAndData_js_1.defaultPaymasterAndData,
         userOperationSimulator: overrides.userOperationSimulator ?? noopMiddleware_js_1.noopMiddleware,
         signUserOperation: overrides.signUserOperation ?? userOpSigner_js_1.defaultUserOpSigner,
     },

package/dist/cjs/middleware/actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/middleware/actions.ts"],"names":[],"mappings":";;;AAAA,+BAOc;AAOd,kDAG4B;AAC5B,gEAAiE;AACjE,gEAAiE;AACjE,wEAAyE;AACzE,gEAAiE;AACjE,2DAAqD;AA+B9C,MAAM,iBAAiB,GAC5B,CAAC,SAAiC,EAAE,EAAE,CACtC,CAOE,MAAsD,EACpB,EAAE,CAAC,CAAC;IACtC,UAAU,EAAE;QACV,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,IAAI,kCAAc;QAC9D,qBAAqB,EAAE,SAAS,CAAC,gBAAgB,EAAE,qBAAqB;YACtE,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,gBAAiB,CAAC,qBAAqB,EAAE,CAAC;gBACjE,MAAM,kBAAkB,GACtB,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,KAAK,OAAO;oBACzC,CAAC,CAAC,IAAA,YAAK,EAAC,IAAI,CAAC;wBACX,CAAC,CAAC,IAAA,iCAAqB,EAAC,IAAI,CAAC;wBAC7B,CAAC,CAAC,IAAI;oBACR,CAAC,CAAC;wBACE,gBAAgB,EAAE,IAAA,YAAK,EAAC,IAAI,CAAC;4BAC3B,CAAC,CAAC,IAAI;4BACN,CAAC,CAAC,IAAA,kCAAsB,EAAC,IAAI,CAAC;qBACjC,CAAC;gBACR,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,kBAAkB,EAAE,CAAC;YAC9C,CAAC;YACH,CAAC,CAAC,6CAAuB;QAE3B,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,IAAA,qCAAmB,EAAC,MAAM,CAAC;QACnE,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,IAAA,qCAAmB,EAAC,MAAM,CAAC;QACnE,gBAAgB,EACd,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,IAAI,6CAAuB;QACzE,sBAAsB,EACpB,SAAS,CAAC,sBAAsB,IAAI,kCAAc;QACpD,iBAAiB,EAAE,SAAS,CAAC,iBAAiB,IAAI,qCAAmB;KACtE;CACF,CAAC,CAAC;AAtCQ,QAAA,iBAAiB,qBAsCzB","sourcesContent":["import {\n  isHex,\n  type Chain,\n  type Client,\n  type PublicActions,\n  type PublicRpcSchema,\n  type Transport,\n} from \"viem\";\nimport type { SmartContractAccount } from \"../account/smartContractAccount.js\";\nimport type {\n  BundlerActions,\n  BundlerRpcSchema,\n} from \"../client/decorators/bundlerClient.js\";\nimport type { ClientMiddlewareConfig } from \"../client/types.js\";\nimport {\n  concatPaymasterAndData,\n  parsePaymasterAndData,\n} from \"../utils/userop.js\";\nimport { defaultFeeEstimator } from \"./defaults/feeEstimator.js\";\nimport { defaultGasEstimator } from \"./defaults/gasEstimator.js\";\nimport { defaultPaymasterAndData } from \"./defaults/paymasterAndData.js\";\nimport { defaultUserOpSigner } from \"./defaults/userOpSigner.js\";\nimport { noopMiddleware } from \"./noopMiddleware.js\";\nimport type { ClientMiddleware } from \"./types.js\";\n\n/**\n * Middleware client type\n *\n * @template {Transport} TTransport\n * @template {Chain | undefined} TChain\n * @template {SmartContractAccount | undefined} TAccount\n */\nexport type MiddlewareClient<\n  TTransport extends Transport = Transport,\n  TChain extends Chain | undefined = Chain | undefined,\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined\n> = Client<\n  TTransport,\n  TChain,\n  TAccount,\n  [...BundlerRpcSchema, ...PublicRpcSchema],\n  PublicActions & BundlerActions\n>;\n\n/**\n * export function that takes in {@link ClientMiddlewareConfig} used during client initiation\n * and returns the middleware actions object that the smart account client extends with\n *\n * @param overrides - {@link ClientMiddlewareConfig} used during client initiation for overriding default middlewares\n * @returns middleware actions object\n */\nexport const middlewareActions =\n  (overrides: ClientMiddlewareConfig) =>\n  <\n    TTransport extends Transport = Transport,\n    TChain extends Chain | undefined = Chain | undefined,\n    TAccount extends SmartContractAccount | undefined =\n      | SmartContractAccount\n      | undefined\n  >(\n    client: MiddlewareClient<TTransport, TChain, TAccount>\n  ): { middleware: ClientMiddleware } => ({\n    middleware: {\n      customMiddleware: overrides.customMiddleware ?? noopMiddleware,\n      dummyPaymasterAndData: overrides.paymasterAndData?.dummyPaymasterAndData\n        ? async (struct, { account }) => {\n            const data = overrides.paymasterAndData!.dummyPaymasterAndData();\n            const paymasterOverrides =\n              account.getEntryPoint().version === \"0.7.0\"\n                ? isHex(data)\n                  ? parsePaymasterAndData(data)\n                  : data\n                : {\n                    paymasterAndData: isHex(data)\n                      ? data\n                      : concatPaymasterAndData(data),\n                  };\n            return { ...struct, ...paymasterOverrides };\n          }\n        : defaultPaymasterAndData,\n\n      feeEstimator: overrides.feeEstimator ?? defaultFeeEstimator(client),\n      gasEstimator: overrides.gasEstimator ?? defaultGasEstimator(client),\n      paymasterAndData:\n        overrides.paymasterAndData?.paymasterAndData ?? defaultPaymasterAndData,\n      userOperationSimulator:\n        overrides.userOperationSimulator ?? noopMiddleware,\n      signUserOperation: overrides.signUserOperation ?? defaultUserOpSigner,\n    },\n  });\n"]}
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/middleware/actions.ts"],"names":[],"mappings":";;;AAaA,gEAAiE;AACjE,gEAAiE;AACjE,wEAAyE;AACzE,gEAAiE;AACjE,2DAAqD;AA+B9C,MAAM,iBAAiB,GAC5B,CAAC,SAAiC,EAAE,EAAE,CACtC,CAOE,MAAsD,EACpB,EAAE,CAAC,CAAC;IACtC,UAAU,EAAE;QACV,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,IAAI,kCAAc;QAC9D,qBAAqB,EACnB,SAAS,CAAC,qBAAqB,IAAI,6CAAuB;QAC5D,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,IAAA,qCAAmB,EAAC,MAAM,CAAC;QACnE,YAAY,EAAE,SAAS,CAAC,YAAY,IAAI,IAAA,qCAAmB,EAAC,MAAM,CAAC;QACnE,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,IAAI,6CAAuB;QACvE,sBAAsB,EACpB,SAAS,CAAC,sBAAsB,IAAI,kCAAc;QACpD,iBAAiB,EAAE,SAAS,CAAC,iBAAiB,IAAI,qCAAmB;KACtE;CACF,CAAC,CAAC;AAtBQ,QAAA,iBAAiB,qBAsBzB","sourcesContent":["import {\n  type Chain,\n  type Client,\n  type PublicActions,\n  type PublicRpcSchema,\n  type Transport,\n} from \"viem\";\nimport type { SmartContractAccount } from \"../account/smartContractAccount.js\";\nimport type {\n  BundlerActions,\n  BundlerRpcSchema,\n} from \"../client/decorators/bundlerClient.js\";\nimport type { ClientMiddlewareConfig } from \"../client/types.js\";\nimport { defaultFeeEstimator } from \"./defaults/feeEstimator.js\";\nimport { defaultGasEstimator } from \"./defaults/gasEstimator.js\";\nimport { defaultPaymasterAndData } from \"./defaults/paymasterAndData.js\";\nimport { defaultUserOpSigner } from \"./defaults/userOpSigner.js\";\nimport { noopMiddleware } from \"./noopMiddleware.js\";\nimport type { ClientMiddleware } from \"./types.js\";\n\n/**\n * Middleware client type\n *\n * @template {Transport} TTransport\n * @template {Chain | undefined} TChain\n * @template {SmartContractAccount | undefined} TAccount\n */\nexport type MiddlewareClient<\n  TTransport extends Transport = Transport,\n  TChain extends Chain | undefined = Chain | undefined,\n  TAccount extends SmartContractAccount | undefined =\n    | SmartContractAccount\n    | undefined\n> = Client<\n  TTransport,\n  TChain,\n  TAccount,\n  [...BundlerRpcSchema, ...PublicRpcSchema],\n  PublicActions & BundlerActions\n>;\n\n/**\n * function that takes in ClientMiddlewareConfig used during client initiation\n * and returns the middleware actions object that the smart account client extends with\n *\n * @param {ClientMiddlewareConfig} overrides config used during client initiation for overriding default middlewares\n * @returns {(client: MiddlewareClient<TTransport, TChain, TAccount>) => { middleware: ClientMiddleware }} middleware actions object\n */\nexport const middlewareActions =\n  (overrides: ClientMiddlewareConfig) =>\n  <\n    TTransport extends Transport = Transport,\n    TChain extends Chain | undefined = Chain | undefined,\n    TAccount extends SmartContractAccount | undefined =\n      | SmartContractAccount\n      | undefined\n  >(\n    client: MiddlewareClient<TTransport, TChain, TAccount>\n  ): { middleware: ClientMiddleware } => ({\n    middleware: {\n      customMiddleware: overrides.customMiddleware ?? noopMiddleware,\n      dummyPaymasterAndData:\n        overrides.dummyPaymasterAndData ?? defaultPaymasterAndData,\n      feeEstimator: overrides.feeEstimator ?? defaultFeeEstimator(client),\n      gasEstimator: overrides.gasEstimator ?? defaultGasEstimator(client),\n      paymasterAndData: overrides.paymasterAndData ?? defaultPaymasterAndData,\n      userOperationSimulator:\n        overrides.userOperationSimulator ?? noopMiddleware,\n      signUserOperation: overrides.signUserOperation ?? defaultUserOpSigner,\n    },\n  });\n"]}

package/dist/cjs/middleware/defaults/gasEstimator.js

@@ -17,8 +17,10 @@ const defaultGasEstimator = (client) => async (struct, { account, overrides, fee
         const paymasterVerificationGasLimit = (0, userop_js_1.applyUserOpOverrideOrFeeOption)(estimates.paymasterVerificationGasLimit, overrides
             ?.paymasterVerificationGasLimit, feeOptions
             ?.paymasterVerificationGasLimit);
-        struct.paymasterVerificationGasLimit =
-            paymasterVerificationGasLimit;
+        const uo_v7 = struct;
+        uo_v7.paymasterVerificationGasLimit = paymasterVerificationGasLimit;
+        uo_v7.paymasterPostOpGasLimit =
+            uo_v7.paymasterPostOpGasLimit ?? (uo_v7.paymaster ? "0x0" : undefined);
     }
     return struct;
 };

package/dist/cjs/middleware/defaults/gasEstimator.js.map

@@ -1 +1 @@
-{"version":3,"file":"gasEstimator.js","sourceRoot":"","sources":["../../../../src/middleware/defaults/gasEstimator.ts"],"names":[],"mappings":";;;AAKA,mDAAsE;AACtE,qDAAuE;AAYhE,MAAM,mBAAmB,GAG9B,CAAC,MAAM,EAAE,EAAE,CACX,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,IAAA,sBAAW,EAAC,MAAM,IAAA,4BAAiB,EAAC,MAAM,CAAC,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,wBAAwB,CACrD,OAAO,EACP,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,EAC/B,SAAS,EAAE,aAAa,CACzB,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,0CAA8B,EACjD,SAAS,CAAC,YAAY,EACtB,SAAS,EAAE,YAAY,EACvB,UAAU,EAAE,YAAY,CACzB,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,0CAA8B,EACzD,SAAS,CAAC,oBAAoB,EAC9B,SAAS,EAAE,oBAAoB,EAC/B,UAAU,EAAE,oBAAoB,CACjC,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,0CAA8B,EACvD,SAAS,CAAC,kBAAkB,EAC5B,SAAS,EAAE,kBAAkB,EAC7B,UAAU,EAAE,kBAAkB,CAC/B,CAAC;IAEF,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,MAAM,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,MAAM,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAE/C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAC3C,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,6BAA6B,GAAG,IAAA,0CAA8B,EAClE,SAAS,CAAC,6BAA6B,EACtC,SAA6C;YAC5C,EAAE,6BAA6B,EAChC,UAA+C;YAC9C,EAAE,6BAA6B,CAClC,CAAC;QACD,MAAuC,CAAC,6BAA6B;YACpE,6BAA6B,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA/CS,QAAA,mBAAmB,uBA+C5B","sourcesContent":["import type {\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationStruct,\n} from \"../../types.js\";\nimport { deepHexlify, resolveProperties } from \"../../utils/index.js\";\nimport { applyUserOpOverrideOrFeeOption } from \"../../utils/userop.js\";\nimport type { MiddlewareClient } from \"../actions.js\";\nimport type { ClientMiddlewareFn } from \"../types.js\";\n\n/**\n * Description default gas estimator middleware for `SmartAccountClient`\n * You can override this middleware with your custom gas estimator middleware\n * by passing it to the client constructor\n *\n * @param client smart account client instance to apply the middleware to\n * @returns middleware execution function used to estimate gas for user operations\n */\nexport const defaultGasEstimator: <C extends MiddlewareClient>(\n  client: C\n) => ClientMiddlewareFn =\n  (client) =>\n  async (struct, { account, overrides, feeOptions }) => {\n    const request = deepHexlify(await resolveProperties(struct));\n\n    const estimates = await client.estimateUserOperationGas(\n      request,\n      account.getEntryPoint().address,\n      overrides?.stateOverride\n    );\n\n    const callGasLimit = applyUserOpOverrideOrFeeOption(\n      estimates.callGasLimit,\n      overrides?.callGasLimit,\n      feeOptions?.callGasLimit\n    );\n    const verificationGasLimit = applyUserOpOverrideOrFeeOption(\n      estimates.verificationGasLimit,\n      overrides?.verificationGasLimit,\n      feeOptions?.verificationGasLimit\n    );\n    const preVerificationGas = applyUserOpOverrideOrFeeOption(\n      estimates.preVerificationGas,\n      overrides?.preVerificationGas,\n      feeOptions?.preVerificationGas\n    );\n\n    struct.callGasLimit = callGasLimit;\n    struct.verificationGasLimit = verificationGasLimit;\n    struct.preVerificationGas = preVerificationGas;\n\n    const entryPoint = account.getEntryPoint();\n    if (entryPoint.version === \"0.7.0\") {\n      const paymasterVerificationGasLimit = applyUserOpOverrideOrFeeOption(\n        estimates.paymasterVerificationGasLimit,\n        (overrides as UserOperationOverrides<\"0.7.0\">)\n          ?.paymasterVerificationGasLimit,\n        (feeOptions as UserOperationFeeOptions<\"0.7.0\">)\n          ?.paymasterVerificationGasLimit\n      );\n      (struct as UserOperationStruct<\"0.7.0\">).paymasterVerificationGasLimit =\n        paymasterVerificationGasLimit;\n    }\n\n    return struct;\n  };\n"]}
+{"version":3,"file":"gasEstimator.js","sourceRoot":"","sources":["../../../../src/middleware/defaults/gasEstimator.ts"],"names":[],"mappings":";;;AAKA,mDAAsE;AACtE,qDAAuE;AAYhE,MAAM,mBAAmB,GAG9B,CAAC,MAAwB,EAAsB,EAAE,CACjD,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE;IACnD,MAAM,OAAO,GAAG,IAAA,sBAAW,EAAC,MAAM,IAAA,4BAAiB,EAAC,MAAM,CAAC,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,wBAAwB,CACrD,OAAO,EACP,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,EAC/B,SAAS,EAAE,aAAa,CACzB,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,0CAA8B,EACjD,SAAS,CAAC,YAAY,EACtB,SAAS,EAAE,YAAY,EACvB,UAAU,EAAE,YAAY,CACzB,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,0CAA8B,EACzD,SAAS,CAAC,oBAAoB,EAC9B,SAAS,EAAE,oBAAoB,EAC/B,UAAU,EAAE,oBAAoB,CACjC,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,0CAA8B,EACvD,SAAS,CAAC,kBAAkB,EAC5B,SAAS,EAAE,kBAAkB,EAC7B,UAAU,EAAE,kBAAkB,CAC/B,CAAC;IAEF,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,MAAM,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,MAAM,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAE/C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAC3C,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;QACnC,MAAM,6BAA6B,GAAG,IAAA,0CAA8B,EAClE,SAAS,CAAC,6BAA6B,EACtC,SAA6C;YAC5C,EAAE,6BAA6B,EAChC,UAA+C;YAC9C,EAAE,6BAA6B,CAClC,CAAC;QACF,MAAM,KAAK,GAAG,MAAsC,CAAC;QAErD,KAAK,CAAC,6BAA6B,GAAG,6BAA6B,CAAC;QAEpE,KAAK,CAAC,uBAAuB;YAC3B,KAAK,CAAC,uBAAuB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAnDS,QAAA,mBAAmB,uBAmD5B","sourcesContent":["import type {\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationStruct,\n} from \"../../types.js\";\nimport { deepHexlify, resolveProperties } from \"../../utils/index.js\";\nimport { applyUserOpOverrideOrFeeOption } from \"../../utils/userop.js\";\nimport type { MiddlewareClient } from \"../actions.js\";\nimport type { ClientMiddlewareFn } from \"../types.js\";\n\n/**\n * Description default gas estimator middleware for `SmartAccountClient`\n * You can override this middleware with your custom gas estimator middleware\n * by passing it to the client constructor\n *\n * @param {MiddlewareClient} client smart account client instance to apply the middleware to\n * @returns {ClientMiddlewareFn} middleware execution function used to estimate gas for user operations\n */\nexport const defaultGasEstimator: <C extends MiddlewareClient>(\n  client: C\n) => ClientMiddlewareFn =\n  (client: MiddlewareClient): ClientMiddlewareFn =>\n  async (struct, { account, overrides, feeOptions }) => {\n    const request = deepHexlify(await resolveProperties(struct));\n\n    const estimates = await client.estimateUserOperationGas(\n      request,\n      account.getEntryPoint().address,\n      overrides?.stateOverride\n    );\n\n    const callGasLimit = applyUserOpOverrideOrFeeOption(\n      estimates.callGasLimit,\n      overrides?.callGasLimit,\n      feeOptions?.callGasLimit\n    );\n    const verificationGasLimit = applyUserOpOverrideOrFeeOption(\n      estimates.verificationGasLimit,\n      overrides?.verificationGasLimit,\n      feeOptions?.verificationGasLimit\n    );\n    const preVerificationGas = applyUserOpOverrideOrFeeOption(\n      estimates.preVerificationGas,\n      overrides?.preVerificationGas,\n      feeOptions?.preVerificationGas\n    );\n\n    struct.callGasLimit = callGasLimit;\n    struct.verificationGasLimit = verificationGasLimit;\n    struct.preVerificationGas = preVerificationGas;\n\n    const entryPoint = account.getEntryPoint();\n    if (entryPoint.version === \"0.7.0\") {\n      const paymasterVerificationGasLimit = applyUserOpOverrideOrFeeOption(\n        estimates.paymasterVerificationGasLimit,\n        (overrides as UserOperationOverrides<\"0.7.0\">)\n          ?.paymasterVerificationGasLimit,\n        (feeOptions as UserOperationFeeOptions<\"0.7.0\">)\n          ?.paymasterVerificationGasLimit\n      );\n      const uo_v7 = struct as UserOperationStruct<\"0.7.0\">;\n\n      uo_v7.paymasterVerificationGasLimit = paymasterVerificationGasLimit;\n\n      uo_v7.paymasterPostOpGasLimit =\n        uo_v7.paymasterPostOpGasLimit ?? (uo_v7.paymaster ? \"0x0\" : undefined);\n    }\n\n    return struct;\n  };\n"]}

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

@@ -0,0 +1,40 @@
+import { type Address, type Chain, type Client, type Hex, type Transport } from "viem";
+import type { ClientMiddlewareConfig } from "../client/types";
+import type { EntryPointVersion } from "../entrypoint/types";
+import type { UserOperationFeeOptions, UserOperationOverrides, UserOperationRequest, UserOperationStruct } from "../types";
+import { type Deferrable } from "../utils/index.js";
+export type Erc7677RpcSchema = [
+    {
+        Method: "pm_getPaymasterStubData";
+        Parameters: [UserOperationRequest, Address, Hex, Record<string, any>];
+        ReturnType: {
+            sponsor?: {
+                name: string;
+                icon?: string;
+            };
+            paymaster?: Address;
+            paymasterData?: Hex;
+            paymasterVerificationGasLimit?: Hex;
+            paymasterPostOpGasLimit?: Hex;
+            paymasterAndData?: Hex;
+            isFinal?: boolean;
+        };
+    },
+    {
+        Method: "pm_getPaymasterData";
+        Parameters: [UserOperationRequest, Address, Hex, Record<string, any>];
+        ReturnType: {
+            paymaster?: Address;
+            paymasterData?: Hex;
+            paymasterAndData?: Hex;
+        };
+    }
+];
+export type Erc7677Client<T extends Transport = Transport> = Client<T, Chain, undefined, Erc7677RpcSchema>;
+export type Erc7677MiddlewareParams<TContext extends Record<string, any> | undefined = Record<string, any> | undefined, TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = {
+    context?: ((struct: Deferrable<UserOperationStruct<TEntryPointVersion>>, args: {
+        overrides?: UserOperationOverrides<TEntryPointVersion>;
+        feeOptions?: UserOperationFeeOptions;
+    }) => Promise<TContext>) | TContext;
+};
+export declare function erc7677Middleware<TContext extends Record<string, any> | undefined = Record<string, any> | undefined>(params?: Erc7677MiddlewareParams<TContext>): Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">;

package/dist/cjs/middleware/erc7677middleware.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.erc7677Middleware = void 0;
+const viem_1 = require("viem");
+const client_js_1 = require("../errors/client.js");
+const index_js_1 = require("../utils/index.js");
+function erc7677Middleware(params) {
+    const dummyPaymasterAndData = async (uo, { client, account, feeOptions, overrides }) => {
+        const userOp = (0, index_js_1.deepHexlify)(await (0, index_js_1.resolveProperties)(uo));
+        userOp.maxFeePerGas = "0x0";
+        userOp.maxPriorityFeePerGas = "0x0";
+        userOp.callGasLimit = "0x0";
+        userOp.verificationGasLimit = "0x0";
+        userOp.preVerificationGas = "0x0";
+        const entrypoint = account.getEntryPoint();
+        if (entrypoint.version === "0.7.0") {
+            userOp.paymasterVerificationGasLimit = "0x0";
+            userOp.paymasterPostOpGasLimit = "0x0";
+        }
+        const context = (typeof params?.context === "function"
+            ? await params?.context(userOp, { overrides, feeOptions })
+            : params?.context) ?? {};
+        if (!client.chain) {
+            throw new client_js_1.ChainNotFoundError();
+        }
+        const erc7677client = client;
+        const { paymaster, paymasterAndData, paymasterData, paymasterPostOpGasLimit, paymasterVerificationGasLimit, } = await erc7677client.request({
+            method: "pm_getPaymasterStubData",
+            params: [userOp, entrypoint.address, (0, viem_1.toHex)(client.chain.id), context],
+        });
+        if (entrypoint.version === "0.6.0") {
+            return {
+                ...uo,
+                paymasterAndData,
+            };
+        }
+        return {
+            ...uo,
+            paymaster,
+            paymasterData,
+            paymasterPostOpGasLimit,
+            paymasterVerificationGasLimit,
+        };
+    };
+    const paymasterAndData = async (uo, { client, account, feeOptions, overrides }) => {
+        const userOp = (0, index_js_1.deepHexlify)(await (0, index_js_1.resolveProperties)(uo));
+        const context = (typeof params?.context === "function"
+            ? await params?.context(userOp, { overrides, feeOptions })
+            : params?.context) ?? {};
+        if (!client.chain) {
+            throw new client_js_1.ChainNotFoundError();
+        }
+        const erc7677client = client;
+        const entrypoint = account.getEntryPoint();
+        const { paymaster, paymasterAndData, paymasterData } = await erc7677client.request({
+            method: "pm_getPaymasterData",
+            params: [userOp, entrypoint.address, (0, viem_1.toHex)(client.chain.id), context],
+        });
+        if (entrypoint.version === "0.6.0") {
+            return {
+                ...uo,
+                paymasterAndData,
+            };
+        }
+        return {
+            ...uo,
+            paymaster,
+            paymasterData,
+        };
+    };
+    return {
+        dummyPaymasterAndData,
+        paymasterAndData,
+    };
+}
+exports.erc7677Middleware = erc7677Middleware;
+//# sourceMappingURL=erc7677middleware.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"erc7677middleware.js","sourceRoot":"","sources":["../../../src/middleware/erc7677middleware.ts"],"names":[],"mappings":";;;AAAA,+BAOc;AAGd,mDAAyD;AAOzD,gDAI2B;AAyE3B,SAAgB,iBAAiB,CAK/B,MAA0C;IAE1C,MAAM,qBAAqB,GAAuB,KAAK,EACrD,EAAE,EACF,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,EAC1C,EAAE;QACF,MAAM,MAAM,GAAG,IAAA,sBAAW,EAAC,MAAM,IAAA,4BAAiB,EAAC,EAAE,CAAC,CAAC,CAAC;QAGxD,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,8BAAkB,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,aAAa,GAAG,MAAuB,CAAC;QAE9C,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,IAAA,YAAK,EAAC,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,IAAA,sBAAW,EAAC,MAAM,IAAA,4BAAiB,EAAC,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,8BAAkB,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,IAAA,YAAK,EAAC,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;AA1GD,8CA0GC","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  {\n    Method: \"pm_getPaymasterStubData\";\n    Parameters: [UserOperationRequest, Address, Hex, Record<string, any>];\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, Record<string, any>];\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<T extends Transport = Transport> = Client<\n  T,\n  Chain,\n  undefined,\n  Erc7677RpcSchema\n>;\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): Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\"> {\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"]}

package/dist/cjs/middleware/noopMiddleware.d.ts

@@ -1,2 +1,3 @@
+import type { UserOperationContext } from "../actions/smartAccount/types";
 import type { ClientMiddlewareFn } from "./types";
-export declare const noopMiddleware: ClientMiddlewareFn;
+export declare const noopMiddleware: ClientMiddlewareFn<UserOperationContext | undefined>;

package/dist/cjs/middleware/noopMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"noopMiddleware.js","sourceRoot":"","sources":["../../../src/middleware/noopMiddleware.ts"],"names":[],"mappings":";;;AASO,MAAM,cAAc,GAAuB,KAAK,EAAE,IAAI,EAAE,EAAE;IAC/D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB","sourcesContent":["import type { ClientMiddlewareFn } from \"./types\";\n\n/**\n * Noop middleware that does nothing and passes the arguments through\n *\n * @async\n * @param args the client middleware arguments passed to the middleware\n * @returns the arguments passed to the middleware and returned as is without modification\n */\nexport const noopMiddleware: ClientMiddlewareFn = async (args) => {\n  return args;\n};\n"]}
+{"version":3,"file":"noopMiddleware.js","sourceRoot":"","sources":["../../../src/middleware/noopMiddleware.ts"],"names":[],"mappings":";;;AASO,MAAM,cAAc,GAEvB,KAAK,EAAE,IAAI,EAAE,EAAE;IACjB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB","sourcesContent":["import type { UserOperationContext } from \"../actions/smartAccount/types\";\nimport type { ClientMiddlewareFn } from \"./types\";\n\n/**\n * Noop middleware that does nothing and passes the arguments through\n *\n * @param {Deferrable<UserOperationStruct<TEntryPointVersion>>} args the client middleware arguments passed to the middleware\n * @returns {Promise<Deferrable<UserOperationStruct<TEntryPointVersion>>>} the arguments passed to the middleware and returned as is without modification\n */\nexport const noopMiddleware: ClientMiddlewareFn<\n  UserOperationContext | undefined\n> = async (args) => {\n  return args;\n};\n"]}

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

@@ -3,13 +3,14 @@ import type { UserOperationContext } from "../actions/smartAccount/types";
 import type { UserOperationFeeOptions, UserOperationOverrides, UserOperationStruct } from "../types";
 import type { Deferrable } from "../utils";
 import type { MiddlewareClient } from "./actions";
-export type ClientMiddlewareFn<TContext extends UserOperationContext | undefined = UserOperationContext | undefined> = <TAccount extends SmartContractAccount, C extends MiddlewareClient, TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>>(struct: Deferrable<UserOperationStruct<TEntryPointVersion>>, args: {
+export type ClientMiddlewareArgs<TAccount extends SmartContractAccount, C extends MiddlewareClient, TContext extends UserOperationContext | undefined = UserOperationContext | undefined, TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>> = {
     overrides?: UserOperationOverrides<TEntryPointVersion>;
     context?: TContext;
     feeOptions?: UserOperationFeeOptions;
     account: TAccount;
     client: C;
-}) => Promise<Deferrable<UserOperationStruct<TEntryPointVersion>>>;
+};
+export type ClientMiddlewareFn<TContext extends UserOperationContext | undefined = UserOperationContext | undefined> = <TAccount extends SmartContractAccount, C extends MiddlewareClient, TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>>(struct: Deferrable<UserOperationStruct<TEntryPointVersion>>, args: ClientMiddlewareArgs<TAccount, C, TContext, TEntryPointVersion>) => Promise<Deferrable<UserOperationStruct<TEntryPointVersion>>>;
 export type ClientMiddleware<TContext extends UserOperationContext | undefined = UserOperationContext | undefined> = {
     dummyPaymasterAndData: ClientMiddlewareFn<TContext>;
     feeEstimator: ClientMiddlewareFn<TContext>;

package/dist/cjs/middleware/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/middleware/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  GetEntryPointFromAccount,\n  SmartContractAccount,\n} from \"../account/smartContractAccount\";\nimport type { UserOperationContext } from \"../actions/smartAccount/types\";\nimport type {\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationStruct,\n} from \"../types\";\nimport type { Deferrable } from \"../utils\";\nimport type { MiddlewareClient } from \"./actions\";\n\n// [!region ClientMiddlewareFn]\nexport type ClientMiddlewareFn<\n  TContext extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = <\n  TAccount extends SmartContractAccount,\n  C extends MiddlewareClient,\n  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>\n>(\n  struct: Deferrable<UserOperationStruct<TEntryPointVersion>>,\n  args: {\n    overrides?: UserOperationOverrides<TEntryPointVersion>;\n    context?: TContext;\n    feeOptions?: UserOperationFeeOptions;\n    account: TAccount;\n    client: C;\n  }\n) => Promise<Deferrable<UserOperationStruct<TEntryPointVersion>>>;\n// [!endregion ClientMiddlewareFn]\n\n// [!region ClientMiddleware]\nexport type ClientMiddleware<\n  TContext extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = {\n  dummyPaymasterAndData: ClientMiddlewareFn<TContext>;\n  feeEstimator: ClientMiddlewareFn<TContext>;\n  gasEstimator: ClientMiddlewareFn<TContext>;\n  customMiddleware: ClientMiddlewareFn<TContext>;\n  paymasterAndData: ClientMiddlewareFn<TContext>;\n  userOperationSimulator: ClientMiddlewareFn<TContext>;\n  signUserOperation: ClientMiddlewareFn<TContext>;\n};\n// [!endregion ClientMiddleware]\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/middleware/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  GetEntryPointFromAccount,\n  SmartContractAccount,\n} from \"../account/smartContractAccount\";\nimport type { UserOperationContext } from \"../actions/smartAccount/types\";\nimport type {\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationStruct,\n} from \"../types\";\nimport type { Deferrable } from \"../utils\";\nimport type { MiddlewareClient } from \"./actions\";\n\nexport type ClientMiddlewareArgs<\n  TAccount extends SmartContractAccount,\n  C extends MiddlewareClient,\n  TContext extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined,\n  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>\n> = {\n  overrides?: UserOperationOverrides<TEntryPointVersion>;\n  context?: TContext;\n  feeOptions?: UserOperationFeeOptions;\n  account: TAccount;\n  client: C;\n};\n\n// [!region ClientMiddlewareFn]\nexport type ClientMiddlewareFn<\n  TContext extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = <\n  TAccount extends SmartContractAccount,\n  C extends MiddlewareClient,\n  TEntryPointVersion extends GetEntryPointFromAccount<TAccount> = GetEntryPointFromAccount<TAccount>\n>(\n  struct: Deferrable<UserOperationStruct<TEntryPointVersion>>,\n  args: ClientMiddlewareArgs<TAccount, C, TContext, TEntryPointVersion>\n) => Promise<Deferrable<UserOperationStruct<TEntryPointVersion>>>;\n// [!endregion ClientMiddlewareFn]\n\n// [!region ClientMiddleware]\nexport type ClientMiddleware<\n  TContext extends UserOperationContext | undefined =\n    | UserOperationContext\n    | undefined\n> = {\n  dummyPaymasterAndData: ClientMiddlewareFn<TContext>;\n  feeEstimator: ClientMiddlewareFn<TContext>;\n  gasEstimator: ClientMiddlewareFn<TContext>;\n  customMiddleware: ClientMiddlewareFn<TContext>;\n  paymasterAndData: ClientMiddlewareFn<TContext>;\n  userOperationSimulator: ClientMiddlewareFn<TContext>;\n  signUserOperation: ClientMiddlewareFn<TContext>;\n};\n// [!endregion ClientMiddleware]\n"]}

package/dist/cjs/signer/local-account.d.ts

@@ -32,31 +32,31 @@ export declare class LocalAccountSigner<T extends HDAccount | PrivateKeyAccount
         [x: `bytes9[${string}]`]: undefined;
         [x: `bytes10[${string}]`]: undefined;
         [x: `bytes25[${string}]`]: undefined;
+        [x: `bytes31[${string}]`]: undefined;
+        [x: `bytes30[${string}]`]: undefined;
+        [x: `bytes29[${string}]`]: undefined;
+        [x: `bytes28[${string}]`]: undefined;
+        [x: `bytes27[${string}]`]: undefined;
+        [x: `bytes26[${string}]`]: undefined;
+        [x: `bytes24[${string}]`]: undefined;
+        [x: `bytes23[${string}]`]: undefined;
+        [x: `bytes22[${string}]`]: undefined;
+        [x: `bytes21[${string}]`]: undefined;
+        [x: `bytes20[${string}]`]: undefined;
+        [x: `bytes19[${string}]`]: undefined;
         [x: `bytes18[${string}]`]: undefined;
-        [x: `bytes12[${string}]`]: undefined;
-        [x: `bytes13[${string}]`]: undefined;
-        [x: `bytes14[${string}]`]: undefined;
-        [x: `bytes15[${string}]`]: undefined;
-        [x: `bytes16[${string}]`]: undefined;
         [x: `bytes17[${string}]`]: undefined;
-        [x: `bytes19[${string}]`]: undefined;
-        [x: `bytes20[${string}]`]: undefined;
-        [x: `bytes21[${string}]`]: undefined;
-        [x: `bytes22[${string}]`]: undefined;
-        [x: `bytes23[${string}]`]: undefined;
-        [x: `bytes24[${string}]`]: undefined;
-        [x: `bytes26[${string}]`]: undefined;
-        [x: `bytes27[${string}]`]: undefined;
-        [x: `bytes28[${string}]`]: undefined;
-        [x: `bytes29[${string}]`]: undefined;
-        [x: `bytes30[${string}]`]: undefined;
-        [x: `bytes31[${string}]`]: undefined;
+        [x: `bytes16[${string}]`]: undefined;
+        [x: `bytes15[${string}]`]: undefined;
+        [x: `bytes14[${string}]`]: undefined;
+        [x: `bytes13[${string}]`]: undefined;
+        [x: `bytes12[${string}]`]: undefined;
         [x: `int[${string}]`]: undefined;
         [x: `int8[${string}]`]: undefined;
-        [x: `int16[${string}]`]: undefined;
-        [x: `int24[${string}]`]: undefined;
-        [x: `int32[${string}]`]: undefined;
         [x: `int40[${string}]`]: undefined;
+        [x: `int32[${string}]`]: undefined;
+        [x: `int24[${string}]`]: undefined;
+        [x: `int16[${string}]`]: undefined;
         [x: `int48[${string}]`]: undefined;
         [x: `int56[${string}]`]: undefined;
         [x: `int64[${string}]`]: undefined;
@@ -85,9 +85,9 @@ export declare class LocalAccountSigner<T extends HDAccount | PrivateKeyAccount
         [x: `int248[${string}]`]: undefined;
         [x: `int256[${string}]`]: undefined;
         [x: `uint[${string}]`]: undefined;
-        [x: `uint16[${string}]`]: undefined;
-        [x: `uint24[${string}]`]: undefined;
         [x: `uint40[${string}]`]: undefined;
+        [x: `uint24[${string}]`]: undefined;
+        [x: `uint16[${string}]`]: undefined;
         [x: `uint56[${string}]`]: undefined;
         [x: `uint72[${string}]`]: undefined;
         [x: `uint80[${string}]`]: undefined;
@@ -134,30 +134,30 @@ export declare class LocalAccountSigner<T extends HDAccount | PrivateKeyAccount
         bytes9?: undefined;
         bytes10?: undefined;
         bytes25?: undefined;
+        bytes31?: undefined;
+        bytes30?: undefined;
+        bytes29?: undefined;
+        bytes28?: undefined;
+        bytes27?: undefined;
+        bytes26?: undefined;
+        bytes24?: undefined;
+        bytes23?: undefined;
+        bytes22?: undefined;
+        bytes21?: undefined;
+        bytes20?: undefined;
+        bytes19?: undefined;
         bytes18?: undefined;
-        bytes12?: undefined;
-        bytes13?: undefined;
-        bytes14?: undefined;
-        bytes15?: undefined;
-        bytes16?: undefined;
         bytes17?: undefined;
-        bytes19?: undefined;
-        bytes20?: undefined;
-        bytes21?: undefined;
-        bytes22?: undefined;
-        bytes23?: undefined;
-        bytes24?: undefined;
-        bytes26?: undefined;
-        bytes27?: undefined;
-        bytes28?: undefined;
-        bytes29?: undefined;
-        bytes30?: undefined;
-        bytes31?: undefined;
+        bytes16?: undefined;
+        bytes15?: undefined;
+        bytes14?: undefined;
+        bytes13?: undefined;
+        bytes12?: undefined;
         int8?: undefined;
-        int16?: undefined;
-        int24?: undefined;
-        int32?: undefined;
         int40?: undefined;
+        int32?: undefined;
+        int24?: undefined;
+        int16?: undefined;
         int48?: undefined;
         int56?: undefined;
         int64?: undefined;
@@ -185,9 +185,9 @@ export declare class LocalAccountSigner<T extends HDAccount | PrivateKeyAccount
         int240?: undefined;
         int248?: undefined;
         int256?: undefined;
-        uint16?: undefined;
-        uint24?: undefined;
         uint40?: undefined;
+        uint24?: undefined;
+        uint16?: undefined;
         uint56?: undefined;
         uint72?: undefined;
         uint80?: undefined;

package/dist/cjs/signer/local-account.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-account.js","sourceRoot":"","sources":["../../../src/signer/local-account.ts"],"names":[],"mappings":";;;AAUA,4CAAuE;AAMvE,MAAa,kBAAkB;IAO7B,YAAY,KAAQ;QAHpB;;;;;WAAS;QACT;;;;;WAAmB;QAOV;;;;mBAAoE,CAC3E,OAAO,EACP,EAAE;gBACF,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7C,CAAC;WAAC;QAEO;;;;mBAAgB,KAAK,EAI5B,MAAqD,EACvC,EAAE;gBAChB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC;WAAC;QAEO;;;;mBAA2C,KAAK,IAAI,EAAE;gBAC7D,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;YAC5B,CAAC;WAAC;QArBA,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC;IAC/B,CAAC;IAqBD,MAAM,CAAC,uBAAuB,CAC5B,GAAW,EACX,IAAgB;QAEhB,MAAM,MAAM,GAAG,IAAA,4BAAiB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC5C,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,yBAAyB,CAC9B,GAAQ;QAER,MAAM,MAAM,GAAG,IAAA,8BAAmB,EAAC,GAAG,CAAC,CAAC;QACxC,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;CACF;AA7CD,gDA6CC","sourcesContent":["import {\n  type HDAccount,\n  type HDOptions,\n  type Hex,\n  type LocalAccount,\n  type PrivateKeyAccount,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n} from \"viem\";\nimport { mnemonicToAccount, privateKeyToAccount } from \"viem/accounts\";\nimport type { SmartAccountSigner } from \"./types.js\";\n\n/**\n * Represents a local account signer and provides methods to sign messages and transactions, as well as static methods to create the signer from mnemonic or private key.\n */\nexport class LocalAccountSigner<\n  T extends HDAccount | PrivateKeyAccount | LocalAccount\n> implements SmartAccountSigner<T>\n{\n  inner: T;\n  signerType: string;\n\n  constructor(inner: T) {\n    this.inner = inner;\n    this.signerType = inner.type; //  type: \"local\"\n  }\n\n  readonly signMessage: (message: SignableMessage) => Promise<`0x${string}`> = (\n    message\n  ) => {\n    return this.inner.signMessage({ message });\n  };\n\n  readonly signTypedData = async <\n    const TTypedData extends TypedData | { [key: string]: unknown },\n    TPrimaryType extends string = string\n  >(\n    params: TypedDataDefinition<TTypedData, TPrimaryType>\n  ): Promise<Hex> => {\n    return this.inner.signTypedData(params);\n  };\n\n  readonly getAddress: () => Promise<`0x${string}`> = async () => {\n    return this.inner.address;\n  };\n\n  static mnemonicToAccountSigner(\n    key: string,\n    opts?: HDOptions\n  ): LocalAccountSigner<HDAccount> {\n    const signer = mnemonicToAccount(key, opts);\n    return new LocalAccountSigner(signer);\n  }\n\n  static privateKeyToAccountSigner(\n    key: Hex\n  ): LocalAccountSigner<PrivateKeyAccount> {\n    const signer = privateKeyToAccount(key);\n    return new LocalAccountSigner(signer);\n  }\n}\n"]}
+{"version":3,"file":"local-account.js","sourceRoot":"","sources":["../../../src/signer/local-account.ts"],"names":[],"mappings":";;;AAUA,4CAAuE;AAMvE,MAAa,kBAAkB;IAsB7B,YAAY,KAAQ;QAlBpB;;;;;WAAS;QACT;;;;;WAAmB;QAqCV;;;;mBAAoE,CAC3E,OAAO,EACP,EAAE;gBACF,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7C,CAAC;WAAC;QAsBO;;;;mBAAgB,KAAK,EAI5B,MAAqD,EACvC,EAAE;gBAChB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAC1C,CAAC;WAAC;QAgBO;;;;mBAAa,KAAK,IAA4B,EAAE;gBACvD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;YAC5B,CAAC;WAAC;QAtEA,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC;IAC/B,CAAC;IAqFD,MAAM,CAAC,uBAAuB,CAC5B,GAAW,EACX,IAAgB;QAEhB,MAAM,MAAM,GAAG,IAAA,4BAAiB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC5C,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAeG,MAAM,CAAC,yBAAyB,CAClC,GAAQ;QAER,MAAM,MAAM,GAAG,IAAA,8BAAmB,EAAC,GAAG,CAAC,CAAC;QACxC,OAAO,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;CACF;AAzID,gDAyIC","sourcesContent":["import {\n  type HDAccount,\n  type HDOptions,\n  type Hex,\n  type LocalAccount,\n  type PrivateKeyAccount,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n} from \"viem\";\nimport { mnemonicToAccount, privateKeyToAccount } from \"viem/accounts\";\nimport type { SmartAccountSigner } from \"./types.js\";\n\n/**\n * Represents a local account signer and provides methods to sign messages and transactions, as well as static methods to create the signer from mnemonic or private key.\n */\nexport class LocalAccountSigner<\n  T extends HDAccount | PrivateKeyAccount | LocalAccount\n> implements SmartAccountSigner<T>\n{\n  inner: T;\n  signerType: string;\n\n  /**\n   * A function to initialize an object with an inner parameter and derive a signerType from it.\n   *\n   * @example\n   * ```ts\n   * import { LocalAccountSigner } from \"@aa-sdk/core\";\n   * import { privateKeyToAccount, generatePrivateKey } from \"viem\";\n   *\n   * const signer = new LocalAccountSigner(\n   *  privateKeyToAccount(generatePrivateKey()),\n   * );\n   * ```\n   *\n   * @param {T} inner The inner parameter containing the necessary data\n   */\n  constructor(inner: T) {\n    this.inner = inner;\n    this.signerType = inner.type; //  type: \"local\"\n  }\n\n  /**\n   * Signs the provided message using the inner signMessage function.\n   *\n   * @example\n   * ```ts\n   * import { LocalAccountSigner } from \"@aa-sdk/core\";\n   * import { generatePrivateKey } from \"viem\";\n   *\n   * const signer = LocalAccountSigner.mnemonicToAccountSigner(generatePrivateKey());\n   * const signature = await signer.signMessage(\"Hello, world!\");\n   * ```\n   *\n   * @param {string} message The message to be signed\n   * @returns {Promise<any>} A promise that resolves to the signed message\n   */\n  readonly signMessage: (message: SignableMessage) => Promise<`0x${string}`> = (\n    message\n  ) => {\n    return this.inner.signMessage({ message });\n  };\n\n  /**\n   * Signs typed data using the given parameters.\n   *\n   * @example\n   * ```ts\n   * import { LocalAccountSigner } from \"@aa-sdk/core\";\n   * import { generatePrivateKey } from \"viem\";\n   *\n   * const signer = LocalAccountSigner.mnemonicToAccountSigner(generatePrivateKey());\n   * const signature = await signer.signTypedData({\n   *  domain: {},\n   *  types: {},\n   *  primaryType: \"\",\n   *  message: {},\n   * });\n   * ```\n   *\n   * @param {TypedDataDefinition<TTypedData, TPrimaryType>} params The parameters defining the typed data and primary type\n   * @returns {Promise<Hex>} A promise that resolves to the signed data in hexadecimal format\n   */\n  readonly signTypedData = async <\n    const TTypedData extends TypedData | { [key: string]: unknown },\n    TPrimaryType extends string = string\n  >(\n    params: TypedDataDefinition<TTypedData, TPrimaryType>\n  ): Promise<Hex> => {\n    return this.inner.signTypedData(params);\n  };\n\n  /**\n   * Returns the address of the inner object in a specific hexadecimal format.\n   *\n   * @example\n   * ```ts\n   * import { LocalAccountSigner } from \"@aa-sdk/core\";\n   * import { generatePrivateKey } from \"viem\";\n   *\n   * const signer = LocalAccountSigner.mnemonicToAccountSigner(generatePrivateKey());\n   * const address = await signer.getAddress();\n   * ```\n   *\n   * @returns {Promise<Hex>} A promise that resolves to the address in the format `0x{string}`\n   */\n  readonly getAddress = async (): Promise<`0x${string}`> => {\n    return this.inner.address;\n  };\n\n  /**\n   * Creates a LocalAccountSigner using the provided mnemonic key and optional HD options.\n   *\n   * @example\n   * ```ts\n   * import { LocalAccountSigner } from \"@aa-sdk/core\";\n   * import { generateMnemonic } from \"viem\";\n   *\n   * const signer = LocalAccountSigner.mnemonicToAccountSigner(generateMnemonic());\n   * ```\n   *\n   * @param {string} key The mnemonic key to derive the account from.\n   * @param {HDOptions} [opts] Optional HD options for deriving the account.\n   * @returns {LocalAccountSigner<HDAccount>} A LocalAccountSigner object for the derived account.\n   */\n  static mnemonicToAccountSigner(\n    key: string,\n    opts?: HDOptions\n  ): LocalAccountSigner<HDAccount> {\n    const signer = mnemonicToAccount(key, opts);\n    return new LocalAccountSigner(signer);\n  }\n\n  /**\n   * Creates a `LocalAccountSigner` instance using the provided private key.\n   *\n   * @example\n   * ```ts\n   * import { LocalAccountSigner } from \"@aa-sdk/core\";\n   * import { generatePrivateKey } from \"viem\";\n   *\n   * const signer = LocalAccountSigner.mnemonicToAccountSigner(generatePrivateKey());\n   * ```\n   *\n   * @param {Hex} key The private key in hexadecimal format\n   * @returns {LocalAccountSigner<PrivateKeyAccount>} An instance of `LocalAccountSigner` initialized with the provided private key\n   */ static privateKeyToAccountSigner(\n    key: Hex\n  ): LocalAccountSigner<PrivateKeyAccount> {\n    const signer = privateKeyToAccount(key);\n    return new LocalAccountSigner(signer);\n  }\n}\n"]}

package/dist/cjs/signer/wallet-client.d.ts

@@ -33,31 +33,31 @@ export declare class WalletClientSigner implements SmartAccountSigner<WalletClie
         [x: `bytes9[${string}]`]: undefined;
         [x: `bytes10[${string}]`]: undefined;
         [x: `bytes25[${string}]`]: undefined;
+        [x: `bytes31[${string}]`]: undefined;
+        [x: `bytes30[${string}]`]: undefined;
+        [x: `bytes29[${string}]`]: undefined;
+        [x: `bytes28[${string}]`]: undefined;
+        [x: `bytes27[${string}]`]: undefined;
+        [x: `bytes26[${string}]`]: undefined;
+        [x: `bytes24[${string}]`]: undefined;
+        [x: `bytes23[${string}]`]: undefined;
+        [x: `bytes22[${string}]`]: undefined;
+        [x: `bytes21[${string}]`]: undefined;
+        [x: `bytes20[${string}]`]: undefined;
+        [x: `bytes19[${string}]`]: undefined;
         [x: `bytes18[${string}]`]: undefined;
-        [x: `bytes12[${string}]`]: undefined;
-        [x: `bytes13[${string}]`]: undefined;
-        [x: `bytes14[${string}]`]: undefined;
-        [x: `bytes15[${string}]`]: undefined;
-        [x: `bytes16[${string}]`]: undefined;
         [x: `bytes17[${string}]`]: undefined;
-        [x: `bytes19[${string}]`]: undefined;
-        [x: `bytes20[${string}]`]: undefined;
-        [x: `bytes21[${string}]`]: undefined;
-        [x: `bytes22[${string}]`]: undefined;
-        [x: `bytes23[${string}]`]: undefined;
-        [x: `bytes24[${string}]`]: undefined;
-        [x: `bytes26[${string}]`]: undefined;
-        [x: `bytes27[${string}]`]: undefined;
-        [x: `bytes28[${string}]`]: undefined;
-        [x: `bytes29[${string}]`]: undefined;
-        [x: `bytes30[${string}]`]: undefined;
-        [x: `bytes31[${string}]`]: undefined;
+        [x: `bytes16[${string}]`]: undefined;
+        [x: `bytes15[${string}]`]: undefined;
+        [x: `bytes14[${string}]`]: undefined;
+        [x: `bytes13[${string}]`]: undefined;
+        [x: `bytes12[${string}]`]: undefined;
         [x: `int[${string}]`]: undefined;
         [x: `int8[${string}]`]: undefined;
-        [x: `int16[${string}]`]: undefined;
-        [x: `int24[${string}]`]: undefined;
-        [x: `int32[${string}]`]: undefined;
         [x: `int40[${string}]`]: undefined;
+        [x: `int32[${string}]`]: undefined;
+        [x: `int24[${string}]`]: undefined;
+        [x: `int16[${string}]`]: undefined;
         [x: `int48[${string}]`]: undefined;
         [x: `int56[${string}]`]: undefined;
         [x: `int64[${string}]`]: undefined;
@@ -86,9 +86,9 @@ export declare class WalletClientSigner implements SmartAccountSigner<WalletClie
         [x: `int248[${string}]`]: undefined;
         [x: `int256[${string}]`]: undefined;
         [x: `uint[${string}]`]: undefined;
-        [x: `uint16[${string}]`]: undefined;
-        [x: `uint24[${string}]`]: undefined;
         [x: `uint40[${string}]`]: undefined;
+        [x: `uint24[${string}]`]: undefined;
+        [x: `uint16[${string}]`]: undefined;
         [x: `uint56[${string}]`]: undefined;
         [x: `uint72[${string}]`]: undefined;
         [x: `uint80[${string}]`]: undefined;
@@ -135,30 +135,30 @@ export declare class WalletClientSigner implements SmartAccountSigner<WalletClie
         bytes9?: undefined;
         bytes10?: undefined;
         bytes25?: undefined;
+        bytes31?: undefined;
+        bytes30?: undefined;
+        bytes29?: undefined;
+        bytes28?: undefined;
+        bytes27?: undefined;
+        bytes26?: undefined;
+        bytes24?: undefined;
+        bytes23?: undefined;
+        bytes22?: undefined;
+        bytes21?: undefined;
+        bytes20?: undefined;
+        bytes19?: undefined;
         bytes18?: undefined;
-        bytes12?: undefined;
-        bytes13?: undefined;
-        bytes14?: undefined;
-        bytes15?: undefined;
-        bytes16?: undefined;
         bytes17?: undefined;
-        bytes19?: undefined;
-        bytes20?: undefined;
-        bytes21?: undefined;
-        bytes22?: undefined;
-        bytes23?: undefined;
-        bytes24?: undefined;
-        bytes26?: undefined;
-        bytes27?: undefined;
-        bytes28?: undefined;
-        bytes29?: undefined;
-        bytes30?: undefined;
-        bytes31?: undefined;
+        bytes16?: undefined;
+        bytes15?: undefined;
+        bytes14?: undefined;
+        bytes13?: undefined;
+        bytes12?: undefined;
         int8?: undefined;
-        int16?: undefined;
-        int24?: undefined;
-        int32?: undefined;
         int40?: undefined;
+        int32?: undefined;
+        int24?: undefined;
+        int16?: undefined;
         int48?: undefined;
         int56?: undefined;
         int64?: undefined;
@@ -186,9 +186,9 @@ export declare class WalletClientSigner implements SmartAccountSigner<WalletClie
         int240?: undefined;
         int248?: undefined;
         int256?: undefined;
-        uint16?: undefined;
-        uint24?: undefined;
         uint40?: undefined;
+        uint24?: undefined;
+        uint16?: undefined;
         uint56?: undefined;
         uint72?: undefined;
         uint80?: undefined;

package/dist/cjs/signer/wallet-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-client.js","sourceRoot":"","sources":["../../../src/signer/wallet-client.ts"],"names":[],"mappings":";;;AAAA,+BAOc;AACd,mDAA6D;AAM7D,MAAa,kBAAkB;IAI7B,YAAY,MAAoB,EAAE,UAAkB;QAHpD;;;;;WAAmB;QACnB;;;;;WAAoB;QAUpB;;;;mBAA2C,KAAK,IAAI,EAAE;gBACpD,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBAChD,OAAO,IAAA,iBAAU,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;WAAC;QAEO;;;;mBACP,KAAK,EAAE,OAAO,EAAE,EAAE;gBAChB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEhE,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACtD,CAAC;WAAC;QAEJ;;;;mBAAgB,KAAK,EAInB,SAAwD,EAC1C,EAAE;gBAChB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEhE,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;oBAC9B,OAAO;oBACP,GAAG,SAAS;iBACb,CAAC,CAAC;YACL,CAAC;WAAC;QA/BA,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;QACpB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,kCAAsB,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CA2BF;AArCD,gDAqCC","sourcesContent":["import {\n  getAddress,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type WalletClient,\n} from \"viem\";\nimport { InvalidSignerTypeError } from \"../errors/signer.js\";\nimport type { SmartAccountSigner } from \"./types\";\n\n/**\n * Represents a wallet client signer for smart accounts, providing methods to get the address, sign messages, and sign typed data.\n */\nexport class WalletClientSigner implements SmartAccountSigner<WalletClient> {\n  signerType: string;\n  inner: WalletClient;\n\n  constructor(client: WalletClient, signerType: string) {\n    this.inner = client;\n    if (!signerType) {\n      throw new InvalidSignerTypeError(signerType);\n    }\n    this.signerType = signerType;\n  }\n\n  getAddress: () => Promise<`0x${string}`> = async () => {\n    let addresses = await this.inner.getAddresses();\n    return getAddress(addresses[0]);\n  };\n\n  readonly signMessage: (message: SignableMessage) => Promise<`0x${string}`> =\n    async (message) => {\n      const account = this.inner.account ?? (await this.getAddress());\n\n      return this.inner.signMessage({ message, account });\n    };\n\n  signTypedData = async <\n    const TTypedData extends TypedData | { [key: string]: unknown },\n    TPrimaryType extends string = string\n  >(\n    typedData: TypedDataDefinition<TTypedData, TPrimaryType>\n  ): Promise<Hex> => {\n    const account = this.inner.account ?? (await this.getAddress());\n\n    return this.inner.signTypedData({\n      account,\n      ...typedData,\n    });\n  };\n}\n"]}
+{"version":3,"file":"wallet-client.js","sourceRoot":"","sources":["../../../src/signer/wallet-client.ts"],"names":[],"mappings":";;;AAAA,+BAOc;AACd,mDAA6D;AAM7D,MAAa,kBAAkB;IAyB7B,YAAY,MAAoB,EAAE,UAAkB;QAxBpD;;;;;WAAmB;QACnB;;;;;WAAoB;QAmDpB;;;;mBAA2C,KAAK,IAAI,EAAE;gBACpD,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBAChD,OAAO,IAAA,iBAAU,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;WAAC;QAuBO;;;;mBACP,KAAK,EAAE,OAAO,EAAE,EAAE;gBAChB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEhE,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACtD,CAAC;WAAC;QA6BJ;;;;mBAAgB,KAAK,EAInB,SAAwD,EAC1C,EAAE;gBAChB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEhE,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;oBAC9B,OAAO;oBACP,GAAG,SAAS;iBACb,CAAC,CAAC;YACL,CAAC;WAAC;QAnGA,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;QACpB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,kCAAsB,CAAC,UAAU,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CA+FF;AA9HD,gDA8HC","sourcesContent":["import {\n  getAddress,\n  type Hex,\n  type SignableMessage,\n  type TypedData,\n  type TypedDataDefinition,\n  type WalletClient,\n} from \"viem\";\nimport { InvalidSignerTypeError } from \"../errors/signer.js\";\nimport type { SmartAccountSigner } from \"./types\";\n\n/**\n * Represents a wallet client signer for smart accounts, providing methods to get the address, sign messages, and sign typed data.\n */\nexport class WalletClientSigner implements SmartAccountSigner<WalletClient> {\n  signerType: string;\n  inner: WalletClient;\n\n  /**\n   * Initializes a signer with a given wallet client and signer type.\n   *\n   * @example\n   * ```ts\n   * import { WalletClientSigner } from \"@aa-sdk/core\";\n   * import { createWalletClient, custom } from 'viem'\n   * import { mainnet } from 'viem/chains'\n   *\n   * const client = createWalletClient({\n   *   chain: mainnet,\n   *   transport: custom(window.ethereum!)\n   * });\n   *\n   * const signer = new WalletClientSigner(client, 'wallet');\n   * ```\n   *\n   * @param {WalletClient} client The wallet client to interact with\n   * @param {string} signerType The type of signer; must be a valid signer type, otherwise an error will be thrown\n   * @throws {InvalidSignerTypeError} If the signer type is invalid\n   */\n  constructor(client: WalletClient, signerType: string) {\n    this.inner = client;\n    if (!signerType) {\n      throw new InvalidSignerTypeError(signerType);\n    }\n    this.signerType = signerType;\n  }\n\n  /**\n   * Asynchronously retrieves addresses from the inner object and returns the first address after applying the `getAddress` function.\n   *\n   * @example\n   * ```ts\n   * import { WalletClientSigner } from \"@aa-sdk/core\";\n   * import { createWalletClient, custom } from 'viem'\n   * import { mainnet } from 'viem/chains'\n   *\n   * const client = createWalletClient({\n   *   chain: mainnet,\n   *   transport: custom(window.ethereum!)\n   * });\n   *\n   * const signer = new WalletClientSigner(client, 'wallet');\n   * console.log(await signer.getAddress());\n   * ```\n   *\n   * @returns {Promise<string>} A promise that resolves to the first address after being processed by the `getAddress` function.\n   */\n  getAddress: () => Promise<`0x${string}`> = async () => {\n    let addresses = await this.inner.getAddresses();\n    return getAddress(addresses[0]);\n  };\n\n  /**\n   * Signs a message using the account's signing method.\n   *\n   * @example\n   * ```ts\n   * import { WalletClientSigner } from \"@aa-sdk/core\";\n   * import { createWalletClient, custom } from 'viem'\n   * import { mainnet } from 'viem/chains'\n   *\n   * const client = createWalletClient({\n   *   chain: mainnet,\n   *   transport: custom(window.ethereum!)\n   * });\n   *\n   * const signer = new WalletClientSigner(client, 'wallet');\n   * console.log(await signer.signMessage(\"hello\"));\n   * ```\n   *\n   * @param {string} message the message string that needs to be signed\n   * @returns {Promise<string>} a promise that resolves to the signed message\n   */\n  readonly signMessage: (message: SignableMessage) => Promise<`0x${string}`> =\n    async (message) => {\n      const account = this.inner.account ?? (await this.getAddress());\n\n      return this.inner.signMessage({ message, account });\n    };\n\n  /**\n   * Signs the provided typed data using the account's private key.\n   *\n   * @example\n   * ```ts\n   * import { WalletClientSigner } from \"@aa-sdk/core\";\n   * import { createWalletClient, custom } from 'viem'\n   * import { mainnet } from 'viem/chains'\n   *\n   * const client = createWalletClient({\n   *   chain: mainnet,\n   *   transport: custom(window.ethereum!)\n   * });\n   *\n   * const signer = new WalletClientSigner(client, 'wallet');\n   * console.log(await signer.signTypedData({\n   *  types: {\n   *    \"Message\": [{ name: \"content\", type: \"string\" }]\n   *  },\n   *  primaryType: \"Message\",\n   *  message: { content: \"Hello\" },\n   * }));\n   * ```\n   *\n   * @param {TypedDataDefinition<TTypedData, TPrimaryType>} typedData The typed data to be signed\n   * @returns {Promise<Hex>} A promise that resolves to a hex string representing the signed data\n   */\n  signTypedData = async <\n    const TTypedData extends TypedData | { [key: string]: unknown },\n    TPrimaryType extends string = string\n  >(\n    typedData: TypedDataDefinition<TTypedData, TPrimaryType>\n  ): Promise<Hex> => {\n    const account = this.inner.account ?? (await this.getAddress());\n\n    return this.inner.signTypedData({\n      account,\n      ...typedData,\n    });\n  };\n}\n"]}

package/dist/cjs/transport/split.js.map

@@ -1 +1 @@
-{"version":3,"file":"split.js","sourceRoot":"","sources":["../../../src/transport/split.ts"],"names":[],"mappings":";;;AAAA,+BAAoE;AA0C7D,MAAM,KAAK,GAAG,CAAC,MAA4B,EAAmB,EAAE;IACrE,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC9D,MAAM,IAAI,KAAK,CACb,uDAAuD,CACxD,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,IAAI,GAAG,EAAqB,CAAC,CAAC;IAEjC,OAAO,CAAC,IAAI,EAAE,EAAE,CACd,IAAA,aAAM,EAAC;QACL,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;gBAC9B,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;YAED,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;KACF,CAAC,CAAC,IAAI,CAAC,CAAC;AACb,CAAC,CAAC;AA1BW,QAAA,KAAK,SA0BhB","sourcesContent":["import { custom, type CustomTransport, type Transport } from \"viem\";\n\nexport interface SplitTransportParams {\n  overrides: {\n    methods: string[];\n    transport: Transport;\n  }[];\n  fallback: Transport;\n}\n\n/**\n * The Split Transport allows you to split RPC traffic for specific methods across\n * different RPC providers. This is done by specifying the methods you want handled\n * specially as overrides and providing a fallback transport for all other methods.\n *\n * @example\n * ```ts\n * import { createPublicClient, http } from \"viem\";\n * import { split } from \"@aa-sdk/core\";\n *\n * const bundlerMethods = [\n *  \"eth_sendUserOperation\",\n *  \"eth_estimateUserOperationGas\",\n *  \"eth_getUserOperationReceipt\",\n *  \"eth_getUserOperationByHash\",\n *  \"eth_supportedEntryPoints\"\n * ];\n *\n * const clientWithSplit = createPublicClient({\n *  transport: split({\n *      overrides: [{\n *          methods: bundlerMethods,\n *          transport: http(BUNDLER_RPC_URL)\n *      }]\n *      fallback: http(OTHER_RPC_URL)\n *  }),\n * });\n * ```\n *\n * @param params {@link SplitTransportParams} split transport configuration containing the methods overrides and fallback transport\n * @returns a {@link CustomTransport} that splits traffic\n */\nexport const split = (params: SplitTransportParams): CustomTransport => {\n  const overrideMap = params.overrides.reduce((accum, curr) => {\n    curr.methods.forEach((method) => {\n      if (accum.has(method) && accum.get(method) !== curr.transport) {\n        throw new Error(\n          \"A method cannot be handled by more than one transport\"\n        );\n      }\n\n      accum.set(method, curr.transport);\n    });\n\n    return accum;\n  }, new Map<string, Transport>());\n\n  return (opts) =>\n    custom({\n      request: async (args) => {\n        const transportOverride = overrideMap.get(args.method);\n        if (transportOverride != null) {\n          return transportOverride(opts).request(args);\n        }\n\n        return params.fallback(opts).request(args);\n      },\n    })(opts);\n};\n"]}
+{"version":3,"file":"split.js","sourceRoot":"","sources":["../../../src/transport/split.ts"],"names":[],"mappings":";;;AAAA,+BAAoE;AA0C7D,MAAM,KAAK,GAAG,CAAC,MAA4B,EAAmB,EAAE;IACrE,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC9D,MAAM,IAAI,KAAK,CACb,uDAAuD,CACxD,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,IAAI,GAAG,EAAqB,CAAC,CAAC;IAEjC,OAAO,CAAC,IAAI,EAAE,EAAE,CACd,IAAA,aAAM,EAAC;QACL,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;gBAC9B,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;YAED,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;KACF,CAAC,CAAC,IAAI,CAAC,CAAC;AACb,CAAC,CAAC;AA1BW,QAAA,KAAK,SA0BhB","sourcesContent":["import { custom, type CustomTransport, type Transport } from \"viem\";\n\nexport interface SplitTransportParams {\n  overrides: {\n    methods: string[];\n    transport: Transport;\n  }[];\n  fallback: Transport;\n}\n\n/**\n * The Split Transport allows you to split RPC traffic for specific methods across\n * different RPC providers. This is done by specifying the methods you want handled\n * specially as overrides and providing a fallback transport for all other methods.\n *\n * @example\n * ```ts\n * import { createPublicClient, http } from \"viem\";\n * import { split } from \"@aa-sdk/core\";\n *\n * const bundlerMethods = [\n *  \"eth_sendUserOperation\",\n *  \"eth_estimateUserOperationGas\",\n *  \"eth_getUserOperationReceipt\",\n *  \"eth_getUserOperationByHash\",\n *  \"eth_supportedEntryPoints\"\n * ];\n *\n * const clientWithSplit = createPublicClient({\n *  transport: split({\n *      overrides: [{\n *          methods: bundlerMethods,\n *          transport: http(BUNDLER_RPC_URL)\n *      }],\n *      fallback: http(OTHER_RPC_URL)\n *  }),\n * });\n * ```\n *\n * @param {SplitTransportParams} params split transport configuration containing the methods overrides and fallback transport\n * @returns {CustomTransport} a viem Transport that splits traffic\n */\nexport const split = (params: SplitTransportParams): CustomTransport => {\n  const overrideMap = params.overrides.reduce((accum, curr) => {\n    curr.methods.forEach((method) => {\n      if (accum.has(method) && accum.get(method) !== curr.transport) {\n        throw new Error(\n          \"A method cannot be handled by more than one transport\"\n        );\n      }\n\n      accum.set(method, curr.transport);\n    });\n\n    return accum;\n  }, new Map<string, Transport>());\n\n  return (opts) =>\n    custom({\n      request: async (args) => {\n        const transportOverride = overrideMap.get(args.method);\n        if (transportOverride != null) {\n          return transportOverride(opts).request(args);\n        }\n\n        return params.fallback(opts).request(args);\n      },\n    })(opts);\n};\n"]}