@account-kit/infra 4.43.1 → 4.45.0

package/dist/esm/gas-manager.d.ts

@@ -1,8 +1,14 @@
-import type { Address, Chain, Hex } from "viem";
+import { type Address, type Chain, type Hex } from "viem";
+import type { EntryPointVersion } from "@aa-sdk/core";
+export declare const AlchemyPaymasterAddressV06Unify = "0x0000000000ce04e2359130e7d0204A5249958921";
+export declare const AlchemyPaymasterAddressV07Unify = "0x00000000000667F27D4DB42334ec11a25db7EBb4";
+export declare const AlchemyPaymasterAddressV4 = "0xEaf0Cde110a5d503f2dD69B3a49E031e29b3F9D2";
 export declare const AlchemyPaymasterAddressV3 = "0x4f84a207A80c39E9e8BaE717c1F25bA7AD1fB08F";
 export declare const AlchemyPaymasterAddressV2 = "0x4Fd9098af9ddcB41DA48A1d78F91F1398965addc";
 export declare const ArbSepoliaPaymasterAddress = "0x0804Afe6EEFb73ce7F93CD0d5e7079a5a8068592";
 export declare const AlchemyPaymasterAddressV1 = "0xc03aac639bb21233e0139381970328db8bceeb67";
+export declare const AlchemyPaymasterAddressV07V2 = "0x2cc0c7981D846b9F2a16276556f6e8cb52BfB633";
+export declare const AlchemyPaymasterAddressV07V1 = "0xEF725Aa22d43Ea69FB22bE2EBe6ECa205a6BCf5B";
 /**
  * Retrieves the Alchemy paymaster address for the given chain. Returns different addresses based on the chain ID.
  *
@@ -10,15 +16,14 @@ export declare const AlchemyPaymasterAddressV1 = "0xc03aac639bb21233e01393819703
  * ```ts
  * import { sepolia, getAlchemyPaymasterAddress } from "@account-kit/infra";
  *
- * const paymasterAddress = getAlchemyPaymasterAddress(sepolia);
+ * const paymasterAddress = getAlchemyPaymasterAddress(sepolia, "0.6.0");
  * ```
  *
  * @param {Chain} chain The chain for which the paymaster address is required
+ * @param {EntryPointVersion} version The version of the entry point
  * @returns {Address} The Alchemy paymaster address corresponding to the specified chain
- *
- * @deprecated This chain list in this function is no longer maintained since the ERC-7677 middleware is typically used to resolve the paymaster address
  */
-export declare const getAlchemyPaymasterAddress: (chain: Chain) => Address;
+export declare const getAlchemyPaymasterAddress: (chain: Chain, version: EntryPointVersion) => Address;
 export declare const PermitTypes: {
     readonly EIP712Domain: readonly [{
         readonly name: "name";
@@ -50,7 +55,9 @@ export declare const PermitTypes: {
         readonly type: "uint256";
     }];
 };
-export declare const EIP712NoncesAbi: readonly ["function nonces(address owner) external view returns (uint)", "function decimals() public view returns (uint8)", "function balanceOf(address owner) external view returns (uint256)", "function allowance(address owner, address spender) external view returns (uint256)"];
+export declare const ERC20Abis: readonly ["function decimals() public view returns (uint8)", "function balanceOf(address owner) external view returns (uint256)", "function allowance(address owner, address spender) external view returns (uint256)", "function approve(address spender, uint256 amount) external returns (bool)"];
+export declare const EIP7597Abis: readonly ["function nonces(address owner) external view returns (uint)"];
+export declare const approveTokenCallData: (paymasterAddress: Address, allowance: BigInt) => `0x${string}`;
 export type PermitMessage = {
     owner: Hex;
     spender: Hex;

package/dist/esm/gas-manager.js

@@ -1,8 +1,14 @@
-import { arbitrum, arbitrumSepolia, base, baseSepolia, fraxtal, fraxtalSepolia, mainnet, optimism, optimismSepolia, polygon, polygonAmoy, polygonMumbai, sepolia, zora, zoraSepolia, } from "./chains.js";
+import { encodeFunctionData } from "viem";
+import { arbitrum, arbitrumSepolia, base, baseSepolia, fraxtal, fraxtalSepolia, mainnet, optimism, optimismSepolia, polygon, polygonAmoy, unichainSepolia, worldChainSepolia, sepolia, zora, zoraSepolia, shapeSepolia, optimismGoerli, arbitrumGoerli, arbitrumNova, baseGoerli, beraChainBartio, celoAlfajores, celoMainnet, gensynTestnet, goerli, inkMainnet, inkSepolia, monadTestnet, opbnbMainnet, opbnbTestnet, openlootSepolia, polygonMumbai, riseTestnet, shape, soneiumMainnet, soneiumMinato, storyAeneid, storyMainnet, teaSepolia, unichainMainnet, worldChain, } from "./chains.js";
+export const AlchemyPaymasterAddressV06Unify = "0x0000000000ce04e2359130e7d0204A5249958921";
+export const AlchemyPaymasterAddressV07Unify = "0x00000000000667F27D4DB42334ec11a25db7EBb4";
+export const AlchemyPaymasterAddressV4 = "0xEaf0Cde110a5d503f2dD69B3a49E031e29b3F9D2";
 export const AlchemyPaymasterAddressV3 = "0x4f84a207A80c39E9e8BaE717c1F25bA7AD1fB08F";
 export const AlchemyPaymasterAddressV2 = "0x4Fd9098af9ddcB41DA48A1d78F91F1398965addc";
 export const ArbSepoliaPaymasterAddress = "0x0804Afe6EEFb73ce7F93CD0d5e7079a5a8068592";
 export const AlchemyPaymasterAddressV1 = "0xc03aac639bb21233e0139381970328db8bceeb67";
+export const AlchemyPaymasterAddressV07V2 = "0x2cc0c7981D846b9F2a16276556f6e8cb52BfB633";
+export const AlchemyPaymasterAddressV07V1 = "0xEF725Aa22d43Ea69FB22bE2EBe6ECa205a6BCf5B";
 /**
  * Retrieves the Alchemy paymaster address for the given chain. Returns different addresses based on the chain ID.
  *
@@ -10,37 +16,118 @@ export const AlchemyPaymasterAddressV1 = "0xc03aac639bb21233e0139381970328db8bce
  * ```ts
  * import { sepolia, getAlchemyPaymasterAddress } from "@account-kit/infra";
  *
- * const paymasterAddress = getAlchemyPaymasterAddress(sepolia);
+ * const paymasterAddress = getAlchemyPaymasterAddress(sepolia, "0.6.0");
  * ```
  *
  * @param {Chain} chain The chain for which the paymaster address is required
+ * @param {EntryPointVersion} version The version of the entry point
  * @returns {Address} The Alchemy paymaster address corresponding to the specified chain
- *
- * @deprecated This chain list in this function is no longer maintained since the ERC-7677 middleware is typically used to resolve the paymaster address
  */
-export const getAlchemyPaymasterAddress = (chain) => {
-    switch (chain.id) {
-        case polygonAmoy.id:
-        case optimismSepolia.id:
-        case baseSepolia.id:
-        case zora.id:
-        case zoraSepolia.id:
-        case fraxtal.id:
-        case fraxtalSepolia.id:
-            return AlchemyPaymasterAddressV3;
-        case mainnet.id:
-        case arbitrum.id:
-        case optimism.id:
-        case polygon.id:
-        case base.id:
-            return AlchemyPaymasterAddressV2;
-        case arbitrumSepolia.id:
-            return ArbSepoliaPaymasterAddress;
-        case sepolia.id:
-        case polygonMumbai.id:
-            return AlchemyPaymasterAddressV1;
+export const getAlchemyPaymasterAddress = (chain, version) => {
+    switch (version) {
+        case "0.6.0":
+            switch (chain.id) {
+                case fraxtalSepolia.id:
+                case worldChainSepolia.id:
+                case shapeSepolia.id:
+                case unichainSepolia.id:
+                case opbnbTestnet.id:
+                case inkSepolia.id:
+                case monadTestnet.id:
+                case openlootSepolia.id:
+                case gensynTestnet.id:
+                case riseTestnet.id:
+                case storyAeneid.id:
+                case teaSepolia.id:
+                case arbitrumGoerli.id:
+                case goerli.id:
+                case optimismGoerli.id:
+                case baseGoerli.id:
+                case polygonMumbai.id:
+                case worldChain.id:
+                case shape.id:
+                case unichainMainnet.id:
+                case soneiumMinato.id:
+                case soneiumMainnet.id:
+                case opbnbMainnet.id:
+                case beraChainBartio.id:
+                case inkMainnet.id:
+                case arbitrumNova.id:
+                case storyMainnet.id:
+                case celoAlfajores.id:
+                case celoMainnet.id:
+                    return AlchemyPaymasterAddressV4;
+                case polygonAmoy.id:
+                case optimismSepolia.id:
+                case baseSepolia.id:
+                case zora.id:
+                case zoraSepolia.id:
+                case fraxtal.id:
+                    return AlchemyPaymasterAddressV3;
+                case mainnet.id:
+                case arbitrum.id:
+                case optimism.id:
+                case polygon.id:
+                case base.id:
+                    return AlchemyPaymasterAddressV2;
+                case arbitrumSepolia.id:
+                    return ArbSepoliaPaymasterAddress;
+                case sepolia.id:
+                    return AlchemyPaymasterAddressV1;
+                default:
+                    return AlchemyPaymasterAddressV06Unify;
+            }
+        case "0.7.0":
+            switch (chain.id) {
+                case arbitrumNova.id:
+                case celoAlfajores.id:
+                case celoMainnet.id:
+                case gensynTestnet.id:
+                case inkMainnet.id:
+                case inkSepolia.id:
+                case monadTestnet.id:
+                case opbnbMainnet.id:
+                case opbnbTestnet.id:
+                case openlootSepolia.id:
+                case riseTestnet.id:
+                case shape.id:
+                case shapeSepolia.id:
+                case soneiumMainnet.id:
+                case soneiumMinato.id:
+                case storyAeneid.id:
+                case storyMainnet.id:
+                case teaSepolia.id:
+                case unichainMainnet.id:
+                case unichainSepolia.id:
+                case worldChain.id:
+                case worldChainSepolia.id:
+                    return AlchemyPaymasterAddressV07V1;
+                case arbitrum.id:
+                case arbitrumGoerli.id:
+                case arbitrumSepolia.id:
+                case base.id:
+                case baseGoerli.id:
+                case baseSepolia.id:
+                case beraChainBartio.id:
+                case fraxtal.id:
+                case fraxtalSepolia.id:
+                case goerli.id:
+                case mainnet.id:
+                case optimism.id:
+                case optimismGoerli.id:
+                case optimismSepolia.id:
+                case polygon.id:
+                case polygonAmoy.id:
+                case polygonMumbai.id:
+                case sepolia.id:
+                case zora.id:
+                case zoraSepolia.id:
+                    return AlchemyPaymasterAddressV07V2;
+                default:
+                    return AlchemyPaymasterAddressV07Unify;
+            }
         default:
-            throw new Error(`Unsupported chain: ${chain}`);
+            throw new Error(`Unsupported EntryPointVersion: ${version}`);
     }
 };
 export const PermitTypes = {
@@ -58,10 +145,20 @@ export const PermitTypes = {
         { name: "deadline", type: "uint256" },
     ],
 };
-export const EIP712NoncesAbi = [
-    "function nonces(address owner) external view returns (uint)",
+export const ERC20Abis = [
     "function decimals() public view returns (uint8)",
     "function balanceOf(address owner) external view returns (uint256)",
     "function allowance(address owner, address spender) external view returns (uint256)",
+    "function approve(address spender, uint256 amount) external returns (bool)",
 ];
+export const EIP7597Abis = [
+    "function nonces(address owner) external view returns (uint)",
+];
+export const approveTokenCallData = (paymasterAddress, allowance) => {
+    return encodeFunctionData({
+        abi: ERC20Abis,
+        functionName: "approve",
+        args: [paymasterAddress, allowance],
+    });
+};
 //# sourceMappingURL=gas-manager.js.map

package/dist/esm/gas-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"gas-manager.js","sourceRoot":"","sources":["../../src/gas-manager.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,WAAW,EACX,OAAO,EACP,cAAc,EACd,OAAO,EACP,QAAQ,EACR,eAAe,EACf,OAAO,EACP,WAAW,EACX,aAAa,EACb,OAAO,EACP,IAAI,EACJ,WAAW,GACZ,MAAM,aAAa,CAAC;AAErB,MAAM,CAAC,MAAM,yBAAyB,GACpC,4CAA4C,CAAC;AAC/C,MAAM,CAAC,MAAM,yBAAyB,GACpC,4CAA4C,CAAC;AAC/C,MAAM,CAAC,MAAM,0BAA0B,GACrC,4CAA4C,CAAC;AAC/C,MAAM,CAAC,MAAM,yBAAyB,GACpC,4CAA4C,CAAC;AAE/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,KAAY,EAAW,EAAE;IAClE,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;QACjB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,eAAe,CAAC,EAAE,CAAC;QACxB,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,IAAI,CAAC,EAAE,CAAC;QACb,KAAK,WAAW,CAAC,EAAE,CAAC;QACpB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,cAAc,CAAC,EAAE;YACpB,OAAO,yBAAyB,CAAC;QACnC,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,EAAE;YACV,OAAO,yBAAyB,CAAC;QACnC,KAAK,eAAe,CAAC,EAAE;YACrB,OAAO,0BAA0B,CAAC;QACpC,KAAK,OAAO,CAAC,EAAE,CAAC;QAChB,KAAK,aAAa,CAAC,EAAE;YACnB,OAAO,yBAAyB,CAAC;QACnC;YACE,MAAM,IAAI,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,YAAY,EAAE;QACZ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;QAChC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;QACnC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QACpC,EAAE,IAAI,EAAE,mBAAmB,EAAE,IAAI,EAAE,SAAS,EAAE;KAC/C;IACD,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;QACpC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;KACtC;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,6DAA6D;IAC7D,iDAAiD;IACjD,mEAAmE;IACnE,oFAAoF;CAC5E,CAAC","sourcesContent":["import type { Address, Chain, Hex } from \"viem\";\nimport {\n  arbitrum,\n  arbitrumSepolia,\n  base,\n  baseSepolia,\n  fraxtal,\n  fraxtalSepolia,\n  mainnet,\n  optimism,\n  optimismSepolia,\n  polygon,\n  polygonAmoy,\n  polygonMumbai,\n  sepolia,\n  zora,\n  zoraSepolia,\n} from \"./chains.js\";\n\nexport const AlchemyPaymasterAddressV3 =\n  \"0x4f84a207A80c39E9e8BaE717c1F25bA7AD1fB08F\";\nexport const AlchemyPaymasterAddressV2 =\n  \"0x4Fd9098af9ddcB41DA48A1d78F91F1398965addc\";\nexport const ArbSepoliaPaymasterAddress =\n  \"0x0804Afe6EEFb73ce7F93CD0d5e7079a5a8068592\";\nexport const AlchemyPaymasterAddressV1 =\n  \"0xc03aac639bb21233e0139381970328db8bceeb67\";\n\n/**\n * Retrieves the Alchemy paymaster address for the given chain. Returns different addresses based on the chain ID.\n *\n * @example\n * ```ts\n * import { sepolia, getAlchemyPaymasterAddress } from \"@account-kit/infra\";\n *\n * const paymasterAddress = getAlchemyPaymasterAddress(sepolia);\n * ```\n *\n * @param {Chain} chain The chain for which the paymaster address is required\n * @returns {Address} The Alchemy paymaster address corresponding to the specified chain\n *\n * @deprecated This chain list in this function is no longer maintained since the ERC-7677 middleware is typically used to resolve the paymaster address\n */\nexport const getAlchemyPaymasterAddress = (chain: Chain): Address => {\n  switch (chain.id) {\n    case polygonAmoy.id:\n    case optimismSepolia.id:\n    case baseSepolia.id:\n    case zora.id:\n    case zoraSepolia.id:\n    case fraxtal.id:\n    case fraxtalSepolia.id:\n      return AlchemyPaymasterAddressV3;\n    case mainnet.id:\n    case arbitrum.id:\n    case optimism.id:\n    case polygon.id:\n    case base.id:\n      return AlchemyPaymasterAddressV2;\n    case arbitrumSepolia.id:\n      return ArbSepoliaPaymasterAddress;\n    case sepolia.id:\n    case polygonMumbai.id:\n      return AlchemyPaymasterAddressV1;\n    default:\n      throw new Error(`Unsupported chain: ${chain}`);\n  }\n};\n\nexport const PermitTypes = {\n  EIP712Domain: [\n    { name: \"name\", type: \"string\" },\n    { name: \"version\", type: \"string\" },\n    { name: \"chainId\", type: \"uint256\" },\n    { name: \"verifyingContract\", type: \"address\" },\n  ],\n  Permit: [\n    { name: \"owner\", type: \"address\" },\n    { name: \"spender\", type: \"address\" },\n    { name: \"value\", type: \"uint256\" },\n    { name: \"nonce\", type: \"uint256\" },\n    { name: \"deadline\", type: \"uint256\" },\n  ],\n} as const;\n\nexport const EIP712NoncesAbi = [\n  \"function nonces(address owner) external view returns (uint)\",\n  \"function decimals() public view returns (uint8)\",\n  \"function balanceOf(address owner) external view returns (uint256)\",\n  \"function allowance(address owner, address spender) external view returns (uint256)\",\n] as const;\n\nexport type PermitMessage = {\n  owner: Hex;\n  spender: Hex;\n  value: bigint;\n  nonce: bigint;\n  deadline: bigint;\n};\n\nexport type PermitDomain = {\n  name: string;\n  version: string;\n  chainId: bigint;\n  verifyingContract: Hex;\n};\n"]}
+{"version":3,"file":"gas-manager.js","sourceRoot":"","sources":["../../src/gas-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import { encodeFunctionData, type Address, type Chain, type Hex } from \"viem\";\nimport {\n  arbitrum,\n  arbitrumSepolia,\n  base,\n  baseSepolia,\n  fraxtal,\n  fraxtalSepolia,\n  mainnet,\n  optimism,\n  optimismSepolia,\n  polygon,\n  polygonAmoy,\n  unichainSepolia,\n  worldChainSepolia,\n  sepolia,\n  zora,\n  zoraSepolia,\n  shapeSepolia,\n  optimismGoerli,\n  arbitrumGoerli,\n  arbitrumNova,\n  baseGoerli,\n  beraChainBartio,\n  celoAlfajores,\n  celoMainnet,\n  gensynTestnet,\n  goerli,\n  inkMainnet,\n  inkSepolia,\n  monadTestnet,\n  opbnbMainnet,\n  opbnbTestnet,\n  openlootSepolia,\n  polygonMumbai,\n  riseTestnet,\n  shape,\n  soneiumMainnet,\n  soneiumMinato,\n  storyAeneid,\n  storyMainnet,\n  teaSepolia,\n  unichainMainnet,\n  worldChain,\n} from \"./chains.js\";\nimport type { EntryPointVersion } from \"@aa-sdk/core\";\nexport const AlchemyPaymasterAddressV06Unify =\n  \"0x0000000000ce04e2359130e7d0204A5249958921\";\nexport const AlchemyPaymasterAddressV07Unify =\n  \"0x00000000000667F27D4DB42334ec11a25db7EBb4\";\n\nexport const AlchemyPaymasterAddressV4 =\n  \"0xEaf0Cde110a5d503f2dD69B3a49E031e29b3F9D2\";\nexport const AlchemyPaymasterAddressV3 =\n  \"0x4f84a207A80c39E9e8BaE717c1F25bA7AD1fB08F\";\nexport const AlchemyPaymasterAddressV2 =\n  \"0x4Fd9098af9ddcB41DA48A1d78F91F1398965addc\";\nexport const ArbSepoliaPaymasterAddress =\n  \"0x0804Afe6EEFb73ce7F93CD0d5e7079a5a8068592\";\nexport const AlchemyPaymasterAddressV1 =\n  \"0xc03aac639bb21233e0139381970328db8bceeb67\";\n\nexport const AlchemyPaymasterAddressV07V2 =\n  \"0x2cc0c7981D846b9F2a16276556f6e8cb52BfB633\";\nexport const AlchemyPaymasterAddressV07V1 =\n  \"0xEF725Aa22d43Ea69FB22bE2EBe6ECa205a6BCf5B\";\n\n/**\n * Retrieves the Alchemy paymaster address for the given chain. Returns different addresses based on the chain ID.\n *\n * @example\n * ```ts\n * import { sepolia, getAlchemyPaymasterAddress } from \"@account-kit/infra\";\n *\n * const paymasterAddress = getAlchemyPaymasterAddress(sepolia, \"0.6.0\");\n * ```\n *\n * @param {Chain} chain The chain for which the paymaster address is required\n * @param {EntryPointVersion} version The version of the entry point\n * @returns {Address} The Alchemy paymaster address corresponding to the specified chain\n */\nexport const getAlchemyPaymasterAddress = (\n  chain: Chain,\n  version: EntryPointVersion,\n): Address => {\n  switch (version) {\n    case \"0.6.0\":\n      switch (chain.id) {\n        case fraxtalSepolia.id:\n        case worldChainSepolia.id:\n        case shapeSepolia.id:\n        case unichainSepolia.id:\n        case opbnbTestnet.id:\n        case inkSepolia.id:\n        case monadTestnet.id:\n        case openlootSepolia.id:\n        case gensynTestnet.id:\n        case riseTestnet.id:\n        case storyAeneid.id:\n        case teaSepolia.id:\n        case arbitrumGoerli.id:\n        case goerli.id:\n        case optimismGoerli.id:\n        case baseGoerli.id:\n        case polygonMumbai.id:\n        case worldChain.id:\n        case shape.id:\n        case unichainMainnet.id:\n        case soneiumMinato.id:\n        case soneiumMainnet.id:\n        case opbnbMainnet.id:\n        case beraChainBartio.id:\n        case inkMainnet.id:\n        case arbitrumNova.id:\n        case storyMainnet.id:\n        case celoAlfajores.id:\n        case celoMainnet.id:\n          return AlchemyPaymasterAddressV4;\n        case polygonAmoy.id:\n        case optimismSepolia.id:\n        case baseSepolia.id:\n        case zora.id:\n        case zoraSepolia.id:\n        case fraxtal.id:\n          return AlchemyPaymasterAddressV3;\n        case mainnet.id:\n        case arbitrum.id:\n        case optimism.id:\n        case polygon.id:\n        case base.id:\n          return AlchemyPaymasterAddressV2;\n        case arbitrumSepolia.id:\n          return ArbSepoliaPaymasterAddress;\n        case sepolia.id:\n          return AlchemyPaymasterAddressV1;\n        default:\n          return AlchemyPaymasterAddressV06Unify;\n      }\n    case \"0.7.0\":\n      switch (chain.id) {\n        case arbitrumNova.id:\n        case celoAlfajores.id:\n        case celoMainnet.id:\n        case gensynTestnet.id:\n        case inkMainnet.id:\n        case inkSepolia.id:\n        case monadTestnet.id:\n        case opbnbMainnet.id:\n        case opbnbTestnet.id:\n        case openlootSepolia.id:\n        case riseTestnet.id:\n        case shape.id:\n        case shapeSepolia.id:\n        case soneiumMainnet.id:\n        case soneiumMinato.id:\n        case storyAeneid.id:\n        case storyMainnet.id:\n        case teaSepolia.id:\n        case unichainMainnet.id:\n        case unichainSepolia.id:\n        case worldChain.id:\n        case worldChainSepolia.id:\n          return AlchemyPaymasterAddressV07V1;\n        case arbitrum.id:\n        case arbitrumGoerli.id:\n        case arbitrumSepolia.id:\n        case base.id:\n        case baseGoerli.id:\n        case baseSepolia.id:\n        case beraChainBartio.id:\n        case fraxtal.id:\n        case fraxtalSepolia.id:\n        case goerli.id:\n        case mainnet.id:\n        case optimism.id:\n        case optimismGoerli.id:\n        case optimismSepolia.id:\n        case polygon.id:\n        case polygonAmoy.id:\n        case polygonMumbai.id:\n        case sepolia.id:\n        case zora.id:\n        case zoraSepolia.id:\n          return AlchemyPaymasterAddressV07V2;\n        default:\n          return AlchemyPaymasterAddressV07Unify;\n      }\n    default:\n      throw new Error(`Unsupported EntryPointVersion: ${version}`);\n  }\n};\n\nexport const PermitTypes = {\n  EIP712Domain: [\n    { name: \"name\", type: \"string\" },\n    { name: \"version\", type: \"string\" },\n    { name: \"chainId\", type: \"uint256\" },\n    { name: \"verifyingContract\", type: \"address\" },\n  ],\n  Permit: [\n    { name: \"owner\", type: \"address\" },\n    { name: \"spender\", type: \"address\" },\n    { name: \"value\", type: \"uint256\" },\n    { name: \"nonce\", type: \"uint256\" },\n    { name: \"deadline\", type: \"uint256\" },\n  ],\n} as const;\n\nexport const ERC20Abis = [\n  \"function decimals() public view returns (uint8)\",\n  \"function balanceOf(address owner) external view returns (uint256)\",\n  \"function allowance(address owner, address spender) external view returns (uint256)\",\n  \"function approve(address spender, uint256 amount) external returns (bool)\",\n] as const;\n\nexport const EIP7597Abis = [\n  \"function nonces(address owner) external view returns (uint)\",\n] as const;\n\nexport const approveTokenCallData = (\n  paymasterAddress: Address,\n  allowance: BigInt,\n) => {\n  return encodeFunctionData({\n    abi: ERC20Abis,\n    functionName: \"approve\",\n    args: [paymasterAddress, allowance],\n  });\n};\n\nexport type PermitMessage = {\n  owner: Hex;\n  spender: Hex;\n  value: bigint;\n  nonce: bigint;\n  deadline: bigint;\n};\n\nexport type PermitDomain = {\n  name: string;\n  version: string;\n  chainId: bigint;\n  verifyingContract: Hex;\n};\n"]}

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

@@ -31,6 +31,7 @@ interface AlchemyGasAndPaymasterAndDataMiddlewareParams {
 export type PolicyToken = {
     address: Address;
     maxTokenAmount: bigint;
+    paymasterAddress?: Address;
     approvalMode?: "NONE" | "PERMIT";
     erc20Name?: string;
     version?: string;

package/dist/esm/middleware/gasManager.js

@@ -1,7 +1,7 @@
 import { bypassPaymasterAndData, ChainNotFoundError, clientHeaderTrack, deepHexlify, defaultGasEstimator, erc7677Middleware, filterUndefined, isBigNumberish, isMultiplier, noopMiddleware, resolveProperties, } from "@aa-sdk/core";
-import { fromHex, isHex, toHex, encodeAbiParameters, encodeFunctionData, parseAbi, sliceHex, } from "viem";
+import { fromHex, isHex, encodeAbiParameters, encodeFunctionData, parseAbi, } from "viem";
 import { alchemyFeeEstimator } from "./feeEstimator.js";
-import { PermitTypes, EIP712NoncesAbi } from "../gas-manager.js";
+import { PermitTypes, EIP7597Abis, ERC20Abis, getAlchemyPaymasterAddress, } from "../gas-manager.js";
 /**
  * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring
  * transactions. Adheres to the ERC-7677 standardized communication protocol.
@@ -23,32 +23,31 @@ import { PermitTypes, EIP712NoncesAbi } from "../gas-manager.js";
  * @returns {Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">} Partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`
  */
 export function alchemyGasManagerMiddleware(policyId, policyToken) {
-    const buildContext = async (uo, args) => {
+    const buildContext = async (args) => {
         const context = { policyId };
         const { account, client } = args;
         if (!client.chain) {
             throw new ChainNotFoundError();
         }
         if (policyToken !== undefined) {
-            const userOp = await deepHexlify(await resolveProperties(uo));
             context.erc20Context = {
                 tokenAddress: policyToken.address,
                 maxTokenAmount: policyToken.maxTokenAmount,
             };
             if (policyToken.approvalMode === "PERMIT") {
-                context.erc20Context.permit = await generateSignedPermit(userOp, client, account, policyId, policyToken);
+                context.erc20Context.permit = await generateSignedPermit(client, account, policyToken);
             }
         }
         return context;
     };
     return {
         dummyPaymasterAndData: async (uo, args) => {
-            const context = await buildContext(uo, args);
+            const context = await buildContext(args);
             const baseMiddleware = erc7677Middleware({ context });
             return baseMiddleware.dummyPaymasterAndData(uo, args);
         },
         paymasterAndData: async (uo, args) => {
-            const context = await buildContext(uo, args);
+            const context = await buildContext(args);
             const baseMiddleware = erc7677Middleware({ context });
             return baseMiddleware.paymasterAndData(uo, args);
         },
@@ -138,7 +137,7 @@ export function alchemyGasAndPaymasterAndDataMiddleware(params) {
                     maxTokenAmount: policyToken.maxTokenAmount,
                 };
                 if (policyToken.approvalMode === "PERMIT") {
-                    erc20Context.permit = await generateSignedPermit(userOp, client, account, policyId, policyToken);
+                    erc20Context.permit = await generateSignedPermit(client, account, policyToken);
                 }
             }
             const result = await client.request({
@@ -204,19 +203,18 @@ const overrideField = (field, overrides, feeOptions, userOperation) => {
 /**
  * Utility function to generate a signed Permit for erc20 transaction
  *
- * @param {UserOperationRequest<TEntryPointVersion>} userOp - The user operation request
  * @param {MiddlewareClient} client - The Alchemy smart account client
  * @param {TAccount} account - The smart account instance
- * @param {string | string[]} policyId - The policy ID or array of policy IDs
  * @param {PolicyToken} policyToken - The policy token configuration
  * @param {Address} policyToken.address - ERC20 contract addressya
  * @param {bigint} [policyToken.maxTokenAmount] - Optional ERC20 token limit
+ * @param {Address} [policyToken.paymasterAddress] - Optional Paymaster Address
  * @param {"NONE" | "PERMIT"} [policyToken.approvalMode] - ERC20 approve mode
  * @param {string} [policyToken.erc20Name] - EIP2612 specified ERC20 contract name
  * @param {string} [policyToken.version] - EIP2612 specified ERC20 contract version
  * @returns {Promise<Hex>} Returns a Promise containing the signed EIP2612 permit
  */
-const generateSignedPermit = async (userOp, client, account, policyId, policyToken) => {
+const generateSignedPermit = async (client, account, policyToken) => {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
@@ -226,7 +224,7 @@ const generateSignedPermit = async (userOp, client, account, policyId, policyTok
     let decimalsFuture = client.call({
         to: policyToken.address,
         data: encodeFunctionData({
-            abi: parseAbi(EIP712NoncesAbi),
+            abi: parseAbi(ERC20Abis),
             functionName: "decimals",
             args: [],
         }),
@@ -234,26 +232,14 @@ const generateSignedPermit = async (userOp, client, account, policyId, policyTok
     let nonceFuture = client.call({
         to: policyToken.address,
         data: encodeFunctionData({
-            abi: parseAbi(EIP712NoncesAbi),
+            abi: parseAbi(EIP7597Abis),
             functionName: "nonces",
             args: [account.address],
         }),
     });
-    let paymasterDataFuture = client.request({
-        method: "pm_getPaymasterStubData",
-        params: [
-            userOp,
-            account.getEntryPoint().address,
-            toHex(client.chain.id),
-            {
-                policyId: Array.isArray(policyId) ? policyId[0] : policyId,
-            },
-        ],
-    });
-    const [decimalsResponse, nonceResponse, paymasterData] = await Promise.all([
+    const [decimalsResponse, nonceResponse] = await Promise.all([
         decimalsFuture,
         nonceFuture,
-        paymasterDataFuture,
     ]);
     if (!decimalsResponse.data) {
         throw new Error("No decimals returned from erc20 contract call");
@@ -264,11 +250,8 @@ const generateSignedPermit = async (userOp, client, account, policyId, policyTok
     const decimals = 10n ** (decimalsResponse.data ? BigInt(decimalsResponse.data) : 18n);
     const maxAmountToken = policyToken.maxTokenAmount * decimals;
     const nonce = BigInt(nonceResponse.data);
-    const paymasterAddress = paymasterData.paymaster
-        ? paymasterData.paymaster
-        : paymasterData.paymasterAndData
-            ? sliceHex(paymasterData.paymasterAndData, 0, 20)
-            : undefined;
+    const paymasterAddress = policyToken.paymasterAddress ??
+        getAlchemyPaymasterAddress(client.chain, account.getEntryPoint().version);
     if (paymasterAddress === undefined || paymasterAddress === "0x") {
         throw new Error("no paymaster contract address available");
     }

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

@@ -1 +1 @@
-{"version":3,"file":"gasManager.js","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Address,\n  ClientMiddlewareConfig,\n  ClientMiddlewareFn,\n  EntryPointVersion,\n  Erc7677Client,\n  Multiplier,\n  SmartContractAccount,\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationRequest,\n} from \"@aa-sdk/core\";\nimport {\n  bypassPaymasterAndData,\n  ChainNotFoundError,\n  clientHeaderTrack,\n  deepHexlify,\n  defaultGasEstimator,\n  erc7677Middleware,\n  filterUndefined,\n  isBigNumberish,\n  isMultiplier,\n  noopMiddleware,\n  resolveProperties,\n} from \"@aa-sdk/core\";\nimport {\n  fromHex,\n  isHex,\n  toHex,\n  type Hex,\n  encodeAbiParameters,\n  encodeFunctionData,\n  parseAbi,\n  sliceHex,\n} from \"viem\";\nimport type { AlchemySmartAccountClient } from \"../client/smartAccountClient.js\";\nimport type { AlchemyTransport } from \"../alchemyTransport.js\";\nimport { alchemyFeeEstimator } from \"./feeEstimator.js\";\nimport type { RequestGasAndPaymasterAndDataRequest } from \"../actions/types.js\";\nimport { PermitTypes, EIP712NoncesAbi } from \"../gas-manager.js\";\nimport type { PermitMessage, PermitDomain } from \"../gas-manager.js\";\nimport type { MiddlewareClient } from \"../../../../aa-sdk/core/dist/types/middleware/actions.js\";\n\ntype Context = {\n  policyId: string | string[];\n  erc20Context?: {\n    tokenAddress: Address;\n    maxTokenAmount?: BigInt;\n    permit?: Hex;\n  };\n};\n/**\n * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring\n * transactions. Adheres to the ERC-7677 standardized communication protocol.\n *\n * @example\n *  ```ts\n * import { sepolia, alchemyGasManagerMiddleware } from \"@account-kit/infra\";\n * import { http } from \"viem\";\n *\n * const client = createSmartAccountClient({\n *  transport: http(\"rpc-url\"),\n *  chain: sepolia,\n *  ...alchemyGasManagerMiddleware(\"policyId\")\n * });\n * ```\n *\n * @param {string | string[]} policyId - The policyId (or list of policyIds) for Alchemy's gas manager\n * @param {PolicyToken | undefined} policyToken - The policy token configuration\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">} Partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`\n */\nexport function alchemyGasManagerMiddleware(\n  policyId: string | string[],\n  policyToken?: PolicyToken,\n): Required<\n  Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">\n> {\n  const buildContext = async (\n    uo: Parameters<ClientMiddlewareFn>[0],\n    args: Parameters<ClientMiddlewareFn>[1],\n  ): Promise<Context> => {\n    const context: Context = { policyId };\n\n    const { account, client } = args;\n    if (!client.chain) {\n      throw new ChainNotFoundError();\n    }\n\n    if (policyToken !== undefined) {\n      const userOp = await deepHexlify(await resolveProperties(uo));\n      context.erc20Context = {\n        tokenAddress: policyToken.address,\n        maxTokenAmount: policyToken.maxTokenAmount,\n      };\n\n      if (policyToken.approvalMode === \"PERMIT\") {\n        context.erc20Context.permit = await generateSignedPermit(\n          userOp,\n          client as AlchemySmartAccountClient,\n          account,\n          policyId,\n          policyToken,\n        );\n      }\n    }\n\n    return context;\n  };\n  return {\n    dummyPaymasterAndData: async (uo, args) => {\n      const context = await buildContext(uo, args);\n      const baseMiddleware = erc7677Middleware({ context });\n      return baseMiddleware.dummyPaymasterAndData(uo, args);\n    },\n\n    paymasterAndData: async (uo, args) => {\n      const context = await buildContext(uo, args);\n      const baseMiddleware = erc7677Middleware({ context });\n      return baseMiddleware.paymasterAndData(uo, args);\n    },\n  };\n}\n\ninterface AlchemyGasAndPaymasterAndDataMiddlewareParams {\n  policyId: string | string[];\n  policyToken?: PolicyToken;\n  transport: AlchemyTransport;\n  gasEstimatorOverride?: ClientMiddlewareFn;\n  feeEstimatorOverride?: ClientMiddlewareFn;\n}\n\nexport type PolicyToken = {\n  address: Address;\n  maxTokenAmount: bigint;\n  approvalMode?: \"NONE\" | \"PERMIT\";\n  erc20Name?: string;\n  version?: string;\n};\n\n/**\n * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring\n * transactions. Uses Alchemy's custom `alchemy_requestGasAndPaymasterAndData`\n * method instead of conforming to the standard ERC-7677 interface. Note that\n * if you use `createAlchemySmartAccountClient`, this middleware is already\n * used by default and you do not need to manually include it.\n *\n * @example\n *  ```ts twoslash\n * import { sepolia, alchemy, alchemyGasAndPaymasterAndDataMiddleware } from \"@account-kit/infra\";\n * import { createSmartAccountClient } from \"@aa-sdk/core\";\n *\n * const client = createSmartAccountClient({\n *  transport: alchemy({ apiKey: \"your-api-key\" }),\n *  chain: sepolia,\n *  ...alchemyGasAndPaymasterAndDataMiddleware({\n *    policyId: \"policyId\",\n *    transport: alchemy({ apiKey: \"your-api-key\" }),\n *  })\n * });\n * ```\n *\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams} params configuration params\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.policyId} params.policyId the policyId for Alchemy's gas manager\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.transport} params.transport fallback transport to use for fee estimation when not using the paymaster\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.gasEstimatorOverride} params.gasEstimatorOverride custom gas estimator middleware\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.feeEstimatorOverride} params.feeEstimatorOverride custom fee estimator middleware\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"feeEstimator\" | \"gasEstimator\" | \"paymasterAndData\">} partial client middleware configuration containing `dummyPaymasterAndData`, `feeEstimator`, `gasEstimator`, and `paymasterAndData`\n */\nexport function alchemyGasAndPaymasterAndDataMiddleware(\n  params: AlchemyGasAndPaymasterAndDataMiddlewareParams,\n): Pick<\n  ClientMiddlewareConfig,\n  \"dummyPaymasterAndData\" | \"feeEstimator\" | \"gasEstimator\" | \"paymasterAndData\"\n> {\n  const {\n    policyId,\n    policyToken,\n    transport,\n    gasEstimatorOverride,\n    feeEstimatorOverride,\n  } = params;\n  return {\n    dummyPaymasterAndData: async (uo, args) => {\n      if (\n        // No reason to generate dummy data if we are bypassing the paymaster.\n        bypassPaymasterAndData(args.overrides) ||\n        // When using alchemy_requestGasAndPaymasterAndData, there is generally no reason to generate dummy\n        // data. However, if the gas/feeEstimator is overriden, then this option should be enabled.\n        !(gasEstimatorOverride || feeEstimatorOverride)\n      ) {\n        return noopMiddleware(uo, args);\n      }\n\n      // Fall back to the default 7677 dummyPaymasterAndData middleware.\n      return alchemyGasManagerMiddleware(\n        policyId,\n        policyToken,\n      ).dummyPaymasterAndData(uo, args);\n    },\n    feeEstimator: (uo, args) => {\n      return feeEstimatorOverride\n        ? feeEstimatorOverride(uo, args)\n        : bypassPaymasterAndData(args.overrides)\n          ? alchemyFeeEstimator(transport)(uo, args)\n          : noopMiddleware(uo, args);\n    },\n    gasEstimator: (uo, args) => {\n      return gasEstimatorOverride\n        ? gasEstimatorOverride(uo, args)\n        : bypassPaymasterAndData(args.overrides)\n          ? defaultGasEstimator(args.client)(uo, args)\n          : noopMiddleware(uo, args);\n    },\n    paymasterAndData: async (\n      uo,\n      { account, client: client_, feeOptions, overrides: overrides_ },\n    ) => {\n      const client = clientHeaderTrack(client_, \"alchemyFeeEstimator\");\n      if (!client.chain) {\n        throw new ChainNotFoundError();\n      }\n\n      const userOp = deepHexlify(await resolveProperties(uo));\n\n      const overrides: UserOperationOverrides = filterUndefined({\n        maxFeePerGas: overrideField(\n          \"maxFeePerGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        maxPriorityFeePerGas: overrideField(\n          \"maxPriorityFeePerGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        callGasLimit: overrideField(\n          \"callGasLimit\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        verificationGasLimit: overrideField(\n          \"verificationGasLimit\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        preVerificationGas: overrideField(\n          \"preVerificationGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        ...(account.getEntryPoint().version === \"0.7.0\"\n          ? {\n              paymasterVerificationGasLimit: overrideField<\"0.7.0\">(\n                \"paymasterVerificationGasLimit\",\n                overrides_ as UserOperationOverrides<\"0.7.0\">,\n                feeOptions,\n                userOp,\n              ),\n              paymasterPostOpGasLimit: overrideField<\"0.7.0\">(\n                \"paymasterPostOpGasLimit\",\n                overrides_ as UserOperationOverrides<\"0.7.0\">,\n                feeOptions,\n                userOp,\n              ),\n            }\n          : {}),\n      });\n\n      let erc20Context: RequestGasAndPaymasterAndDataRequest[0][\"erc20Context\"] =\n        undefined;\n      if (policyToken !== undefined) {\n        erc20Context = {\n          tokenAddress: policyToken.address,\n          maxTokenAmount: policyToken.maxTokenAmount,\n        };\n        if (policyToken.approvalMode === \"PERMIT\") {\n          erc20Context.permit = await generateSignedPermit(\n            userOp,\n            client,\n            account,\n            policyId,\n            policyToken,\n          );\n        }\n      }\n\n      const result = await (client as AlchemySmartAccountClient).request({\n        method: \"alchemy_requestGasAndPaymasterAndData\",\n        params: [\n          {\n            policyId,\n            entryPoint: account.getEntryPoint().address,\n            userOperation: userOp,\n            dummySignature: await account.getDummySignature(),\n            overrides,\n            ...(erc20Context\n              ? {\n                  erc20Context,\n                }\n              : {}),\n          },\n        ],\n      });\n\n      return {\n        ...uo,\n        ...result,\n      };\n    },\n  };\n}\n\n/**\n * Utility function to override a field in the user operation request with the overrides or fee options\n *\n * @template {EntryPointVersion} TEntryPointVersion\n * @param {keyof UserOperationFeeOptions<TEntryPointVersion>} field the field to override\n * @param {UserOperationOverrides<TEntryPointVersion> | undefined} overrides the overrides object\n * @param {UserOperationFeeOptions<TEntryPointVersion> | undefined} feeOptions the fee options object from the client\n * @param {UserOperationRequest<TEntryPointVersion>} userOperation the user operation request\n * @returns {Hex | Multiplier | undefined} the overridden field value\n */\nconst overrideField = <\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion,\n>(\n  field: keyof UserOperationFeeOptions<TEntryPointVersion>,\n  overrides: UserOperationOverrides<TEntryPointVersion> | undefined,\n  feeOptions: UserOperationFeeOptions<TEntryPointVersion> | undefined,\n  userOperation: UserOperationRequest<TEntryPointVersion>,\n): Hex | Multiplier | undefined => {\n  let _field = field as keyof UserOperationOverrides<TEntryPointVersion>;\n\n  if (overrides?.[_field] != null) {\n    // one-off absolute override\n    if (isBigNumberish(overrides[_field])) {\n      return deepHexlify(overrides[_field]);\n    }\n    // one-off multiplier overrides\n    else {\n      return {\n        multiplier: Number((overrides[_field] as Multiplier).multiplier),\n      };\n    }\n  }\n\n  // provider level fee options with multiplier\n  if (isMultiplier(feeOptions?.[field])) {\n    return {\n      multiplier: Number((feeOptions![field] as Multiplier).multiplier),\n    };\n  }\n\n  const userOpField =\n    userOperation[field as keyof UserOperationRequest<TEntryPointVersion>];\n  if (isHex(userOpField) && fromHex(userOpField as Hex, \"bigint\") > 0n) {\n    return userOpField;\n  }\n  return undefined;\n};\n\n/**\n * Utility function to generate a signed Permit for erc20 transaction\n *\n * @param {UserOperationRequest<TEntryPointVersion>} userOp - The user operation request\n * @param {MiddlewareClient} client - The Alchemy smart account client\n * @param {TAccount} account - The smart account instance\n * @param {string | string[]} policyId - The policy ID or array of policy IDs\n * @param {PolicyToken} policyToken - The policy token configuration\n * @param {Address} policyToken.address - ERC20 contract addressya\n * @param {bigint} [policyToken.maxTokenAmount] - Optional ERC20 token limit\n * @param {\"NONE\" | \"PERMIT\"} [policyToken.approvalMode] - ERC20 approve mode\n * @param {string} [policyToken.erc20Name] - EIP2612 specified ERC20 contract name\n * @param {string} [policyToken.version] - EIP2612 specified ERC20 contract version\n * @returns {Promise<Hex>} Returns a Promise containing the signed EIP2612 permit\n */\nconst generateSignedPermit = async <\n  TAccount extends SmartContractAccount,\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion,\n>(\n  userOp: UserOperationRequest<TEntryPointVersion>,\n  client: MiddlewareClient,\n  account: TAccount,\n  policyId: string | string[],\n  policyToken: {\n    address: Address;\n    maxTokenAmount: bigint;\n    approvalMode?: \"NONE\" | \"PERMIT\";\n    erc20Name?: string;\n    version?: string;\n  },\n): Promise<Hex> => {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n  if (!policyToken.erc20Name || !policyToken.version) {\n    throw new Error(\"erc20Name or version is missing\");\n  }\n\n  let decimalsFuture = client.call({\n    to: policyToken.address,\n    data: encodeFunctionData({\n      abi: parseAbi(EIP712NoncesAbi),\n      functionName: \"decimals\",\n      args: [],\n    }),\n  });\n\n  let nonceFuture = client.call({\n    to: policyToken.address,\n    data: encodeFunctionData({\n      abi: parseAbi(EIP712NoncesAbi),\n      functionName: \"nonces\",\n      args: [account.address],\n    }),\n  });\n\n  let paymasterDataFuture = (client as Erc7677Client).request({\n    method: \"pm_getPaymasterStubData\",\n    params: [\n      userOp,\n      account.getEntryPoint().address,\n      toHex(client.chain.id),\n      {\n        policyId: Array.isArray(policyId) ? policyId[0] : policyId,\n      },\n    ],\n  });\n\n  const [decimalsResponse, nonceResponse, paymasterData] = await Promise.all([\n    decimalsFuture,\n    nonceFuture,\n    paymasterDataFuture,\n  ]);\n  if (!decimalsResponse.data) {\n    throw new Error(\"No decimals returned from erc20 contract call\");\n  }\n  if (!nonceResponse.data) {\n    throw new Error(\"No nonces returned from erc20 contract call\");\n  }\n\n  const decimals =\n    10n ** (decimalsResponse.data ? BigInt(decimalsResponse.data) : 18n);\n  const maxAmountToken = policyToken.maxTokenAmount * decimals;\n  const nonce = BigInt(nonceResponse.data);\n\n  const paymasterAddress = paymasterData.paymaster\n    ? paymasterData.paymaster\n    : paymasterData.paymasterAndData\n      ? sliceHex(paymasterData.paymasterAndData, 0, 20)\n      : undefined;\n\n  if (paymasterAddress === undefined || paymasterAddress === \"0x\") {\n    throw new Error(\"no paymaster contract address available\");\n  }\n\n  const deadline = BigInt(Math.floor(Date.now() / 1000) + 60 * 10);\n\n  const typedPermitData = {\n    types: PermitTypes,\n    primaryType: \"Permit\" as const,\n    domain: {\n      name: policyToken.erc20Name ?? \"\",\n      version: policyToken.version ?? \"\",\n      chainId: BigInt(client.chain.id),\n      verifyingContract: policyToken.address,\n    } satisfies PermitDomain,\n    message: {\n      owner: account.address,\n      spender: paymasterAddress,\n      value: maxAmountToken,\n      nonce: nonce,\n      deadline,\n    } satisfies PermitMessage,\n  } as const;\n\n  const signedPermit = await account.signTypedData(typedPermitData);\n  return encodeAbiParameters(\n    [{ type: \"uint256\" }, { type: \"uint256\" }, { type: \"bytes\" }],\n    [maxAmountToken, deadline, signedPermit],\n  );\n};\n"]}
+{"version":3,"file":"gasManager.js","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  Address,\n  ClientMiddlewareConfig,\n  ClientMiddlewareFn,\n  EntryPointVersion,\n  Multiplier,\n  SmartContractAccount,\n  UserOperationFeeOptions,\n  UserOperationOverrides,\n  UserOperationRequest,\n} from \"@aa-sdk/core\";\nimport {\n  bypassPaymasterAndData,\n  ChainNotFoundError,\n  clientHeaderTrack,\n  deepHexlify,\n  defaultGasEstimator,\n  erc7677Middleware,\n  filterUndefined,\n  isBigNumberish,\n  isMultiplier,\n  noopMiddleware,\n  resolveProperties,\n} from \"@aa-sdk/core\";\nimport {\n  fromHex,\n  isHex,\n  type Hex,\n  encodeAbiParameters,\n  encodeFunctionData,\n  parseAbi,\n} from \"viem\";\nimport type { AlchemySmartAccountClient } from \"../client/smartAccountClient.js\";\nimport type { AlchemyTransport } from \"../alchemyTransport.js\";\nimport { alchemyFeeEstimator } from \"./feeEstimator.js\";\nimport type { RequestGasAndPaymasterAndDataRequest } from \"../actions/types.js\";\nimport {\n  PermitTypes,\n  EIP7597Abis,\n  ERC20Abis,\n  getAlchemyPaymasterAddress,\n} from \"../gas-manager.js\";\nimport type { PermitMessage, PermitDomain } from \"../gas-manager.js\";\nimport type { MiddlewareClient } from \"../../../../aa-sdk/core/dist/types/middleware/actions.js\";\n\ntype Context = {\n  policyId: string | string[];\n  erc20Context?: {\n    tokenAddress: Address;\n    maxTokenAmount?: BigInt;\n    permit?: Hex;\n  };\n};\n/**\n * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring\n * transactions. Adheres to the ERC-7677 standardized communication protocol.\n *\n * @example\n *  ```ts\n * import { sepolia, alchemyGasManagerMiddleware } from \"@account-kit/infra\";\n * import { http } from \"viem\";\n *\n * const client = createSmartAccountClient({\n *  transport: http(\"rpc-url\"),\n *  chain: sepolia,\n *  ...alchemyGasManagerMiddleware(\"policyId\")\n * });\n * ```\n *\n * @param {string | string[]} policyId - The policyId (or list of policyIds) for Alchemy's gas manager\n * @param {PolicyToken | undefined} policyToken - The policy token configuration\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">} Partial client middleware configuration containing `dummyPaymasterAndData` and `paymasterAndData`\n */\nexport function alchemyGasManagerMiddleware(\n  policyId: string | string[],\n  policyToken?: PolicyToken,\n): Required<\n  Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"paymasterAndData\">\n> {\n  const buildContext = async (\n    args: Parameters<ClientMiddlewareFn>[1],\n  ): Promise<Context> => {\n    const context: Context = { policyId };\n\n    const { account, client } = args;\n    if (!client.chain) {\n      throw new ChainNotFoundError();\n    }\n\n    if (policyToken !== undefined) {\n      context.erc20Context = {\n        tokenAddress: policyToken.address,\n        maxTokenAmount: policyToken.maxTokenAmount,\n      };\n\n      if (policyToken.approvalMode === \"PERMIT\") {\n        context.erc20Context.permit = await generateSignedPermit(\n          client as AlchemySmartAccountClient,\n          account,\n          policyToken,\n        );\n      }\n    }\n\n    return context;\n  };\n  return {\n    dummyPaymasterAndData: async (uo, args) => {\n      const context = await buildContext(args);\n      const baseMiddleware = erc7677Middleware({ context });\n      return baseMiddleware.dummyPaymasterAndData(uo, args);\n    },\n\n    paymasterAndData: async (uo, args) => {\n      const context = await buildContext(args);\n      const baseMiddleware = erc7677Middleware({ context });\n      return baseMiddleware.paymasterAndData(uo, args);\n    },\n  };\n}\n\ninterface AlchemyGasAndPaymasterAndDataMiddlewareParams {\n  policyId: string | string[];\n  policyToken?: PolicyToken;\n  transport: AlchemyTransport;\n  gasEstimatorOverride?: ClientMiddlewareFn;\n  feeEstimatorOverride?: ClientMiddlewareFn;\n}\n\nexport type PolicyToken = {\n  address: Address;\n  maxTokenAmount: bigint;\n  paymasterAddress?: Address;\n  approvalMode?: \"NONE\" | \"PERMIT\";\n  erc20Name?: string;\n  version?: string;\n};\n\n/**\n * Paymaster middleware factory that uses Alchemy's Gas Manager for sponsoring\n * transactions. Uses Alchemy's custom `alchemy_requestGasAndPaymasterAndData`\n * method instead of conforming to the standard ERC-7677 interface. Note that\n * if you use `createAlchemySmartAccountClient`, this middleware is already\n * used by default and you do not need to manually include it.\n *\n * @example\n *  ```ts twoslash\n * import { sepolia, alchemy, alchemyGasAndPaymasterAndDataMiddleware } from \"@account-kit/infra\";\n * import { createSmartAccountClient } from \"@aa-sdk/core\";\n *\n * const client = createSmartAccountClient({\n *  transport: alchemy({ apiKey: \"your-api-key\" }),\n *  chain: sepolia,\n *  ...alchemyGasAndPaymasterAndDataMiddleware({\n *    policyId: \"policyId\",\n *    transport: alchemy({ apiKey: \"your-api-key\" }),\n *  })\n * });\n * ```\n *\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams} params configuration params\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.policyId} params.policyId the policyId for Alchemy's gas manager\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.transport} params.transport fallback transport to use for fee estimation when not using the paymaster\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.gasEstimatorOverride} params.gasEstimatorOverride custom gas estimator middleware\n * @param {AlchemyGasAndPaymasterAndDataMiddlewareParams.feeEstimatorOverride} params.feeEstimatorOverride custom fee estimator middleware\n * @returns {Pick<ClientMiddlewareConfig, \"dummyPaymasterAndData\" | \"feeEstimator\" | \"gasEstimator\" | \"paymasterAndData\">} partial client middleware configuration containing `dummyPaymasterAndData`, `feeEstimator`, `gasEstimator`, and `paymasterAndData`\n */\nexport function alchemyGasAndPaymasterAndDataMiddleware(\n  params: AlchemyGasAndPaymasterAndDataMiddlewareParams,\n): Pick<\n  ClientMiddlewareConfig,\n  \"dummyPaymasterAndData\" | \"feeEstimator\" | \"gasEstimator\" | \"paymasterAndData\"\n> {\n  const {\n    policyId,\n    policyToken,\n    transport,\n    gasEstimatorOverride,\n    feeEstimatorOverride,\n  } = params;\n  return {\n    dummyPaymasterAndData: async (uo, args) => {\n      if (\n        // No reason to generate dummy data if we are bypassing the paymaster.\n        bypassPaymasterAndData(args.overrides) ||\n        // When using alchemy_requestGasAndPaymasterAndData, there is generally no reason to generate dummy\n        // data. However, if the gas/feeEstimator is overriden, then this option should be enabled.\n        !(gasEstimatorOverride || feeEstimatorOverride)\n      ) {\n        return noopMiddleware(uo, args);\n      }\n\n      // Fall back to the default 7677 dummyPaymasterAndData middleware.\n      return alchemyGasManagerMiddleware(\n        policyId,\n        policyToken,\n      ).dummyPaymasterAndData(uo, args);\n    },\n    feeEstimator: (uo, args) => {\n      return feeEstimatorOverride\n        ? feeEstimatorOverride(uo, args)\n        : bypassPaymasterAndData(args.overrides)\n          ? alchemyFeeEstimator(transport)(uo, args)\n          : noopMiddleware(uo, args);\n    },\n    gasEstimator: (uo, args) => {\n      return gasEstimatorOverride\n        ? gasEstimatorOverride(uo, args)\n        : bypassPaymasterAndData(args.overrides)\n          ? defaultGasEstimator(args.client)(uo, args)\n          : noopMiddleware(uo, args);\n    },\n    paymasterAndData: async (\n      uo,\n      { account, client: client_, feeOptions, overrides: overrides_ },\n    ) => {\n      const client = clientHeaderTrack(client_, \"alchemyFeeEstimator\");\n      if (!client.chain) {\n        throw new ChainNotFoundError();\n      }\n\n      const userOp = deepHexlify(await resolveProperties(uo));\n\n      const overrides: UserOperationOverrides = filterUndefined({\n        maxFeePerGas: overrideField(\n          \"maxFeePerGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        maxPriorityFeePerGas: overrideField(\n          \"maxPriorityFeePerGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        callGasLimit: overrideField(\n          \"callGasLimit\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        verificationGasLimit: overrideField(\n          \"verificationGasLimit\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        preVerificationGas: overrideField(\n          \"preVerificationGas\",\n          overrides_ as UserOperationOverrides,\n          feeOptions,\n          userOp,\n        ),\n        ...(account.getEntryPoint().version === \"0.7.0\"\n          ? {\n              paymasterVerificationGasLimit: overrideField<\"0.7.0\">(\n                \"paymasterVerificationGasLimit\",\n                overrides_ as UserOperationOverrides<\"0.7.0\">,\n                feeOptions,\n                userOp,\n              ),\n              paymasterPostOpGasLimit: overrideField<\"0.7.0\">(\n                \"paymasterPostOpGasLimit\",\n                overrides_ as UserOperationOverrides<\"0.7.0\">,\n                feeOptions,\n                userOp,\n              ),\n            }\n          : {}),\n      });\n\n      let erc20Context: RequestGasAndPaymasterAndDataRequest[0][\"erc20Context\"] =\n        undefined;\n      if (policyToken !== undefined) {\n        erc20Context = {\n          tokenAddress: policyToken.address,\n          maxTokenAmount: policyToken.maxTokenAmount,\n        };\n        if (policyToken.approvalMode === \"PERMIT\") {\n          erc20Context.permit = await generateSignedPermit(\n            client,\n            account,\n            policyToken,\n          );\n        }\n      }\n\n      const result = await (client as AlchemySmartAccountClient).request({\n        method: \"alchemy_requestGasAndPaymasterAndData\",\n        params: [\n          {\n            policyId,\n            entryPoint: account.getEntryPoint().address,\n            userOperation: userOp,\n            dummySignature: await account.getDummySignature(),\n            overrides,\n            ...(erc20Context\n              ? {\n                  erc20Context,\n                }\n              : {}),\n          },\n        ],\n      });\n\n      return {\n        ...uo,\n        ...result,\n      };\n    },\n  };\n}\n\n/**\n * Utility function to override a field in the user operation request with the overrides or fee options\n *\n * @template {EntryPointVersion} TEntryPointVersion\n * @param {keyof UserOperationFeeOptions<TEntryPointVersion>} field the field to override\n * @param {UserOperationOverrides<TEntryPointVersion> | undefined} overrides the overrides object\n * @param {UserOperationFeeOptions<TEntryPointVersion> | undefined} feeOptions the fee options object from the client\n * @param {UserOperationRequest<TEntryPointVersion>} userOperation the user operation request\n * @returns {Hex | Multiplier | undefined} the overridden field value\n */\nconst overrideField = <\n  TEntryPointVersion extends EntryPointVersion = EntryPointVersion,\n>(\n  field: keyof UserOperationFeeOptions<TEntryPointVersion>,\n  overrides: UserOperationOverrides<TEntryPointVersion> | undefined,\n  feeOptions: UserOperationFeeOptions<TEntryPointVersion> | undefined,\n  userOperation: UserOperationRequest<TEntryPointVersion>,\n): Hex | Multiplier | undefined => {\n  let _field = field as keyof UserOperationOverrides<TEntryPointVersion>;\n\n  if (overrides?.[_field] != null) {\n    // one-off absolute override\n    if (isBigNumberish(overrides[_field])) {\n      return deepHexlify(overrides[_field]);\n    }\n    // one-off multiplier overrides\n    else {\n      return {\n        multiplier: Number((overrides[_field] as Multiplier).multiplier),\n      };\n    }\n  }\n\n  // provider level fee options with multiplier\n  if (isMultiplier(feeOptions?.[field])) {\n    return {\n      multiplier: Number((feeOptions![field] as Multiplier).multiplier),\n    };\n  }\n\n  const userOpField =\n    userOperation[field as keyof UserOperationRequest<TEntryPointVersion>];\n  if (isHex(userOpField) && fromHex(userOpField as Hex, \"bigint\") > 0n) {\n    return userOpField;\n  }\n  return undefined;\n};\n\n/**\n * Utility function to generate a signed Permit for erc20 transaction\n *\n * @param {MiddlewareClient} client - The Alchemy smart account client\n * @param {TAccount} account - The smart account instance\n * @param {PolicyToken} policyToken - The policy token configuration\n * @param {Address} policyToken.address - ERC20 contract addressya\n * @param {bigint} [policyToken.maxTokenAmount] - Optional ERC20 token limit\n * @param {Address} [policyToken.paymasterAddress] - Optional Paymaster Address\n * @param {\"NONE\" | \"PERMIT\"} [policyToken.approvalMode] - ERC20 approve mode\n * @param {string} [policyToken.erc20Name] - EIP2612 specified ERC20 contract name\n * @param {string} [policyToken.version] - EIP2612 specified ERC20 contract version\n * @returns {Promise<Hex>} Returns a Promise containing the signed EIP2612 permit\n */\nconst generateSignedPermit = async <TAccount extends SmartContractAccount>(\n  client: MiddlewareClient,\n  account: TAccount,\n  policyToken: {\n    address: Address;\n    maxTokenAmount: bigint;\n    paymasterAddress?: Address;\n    approvalMode?: \"NONE\" | \"PERMIT\";\n    erc20Name?: string;\n    version?: string;\n  },\n): Promise<Hex> => {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n  if (!policyToken.erc20Name || !policyToken.version) {\n    throw new Error(\"erc20Name or version is missing\");\n  }\n\n  let decimalsFuture = client.call({\n    to: policyToken.address,\n    data: encodeFunctionData({\n      abi: parseAbi(ERC20Abis),\n      functionName: \"decimals\",\n      args: [],\n    }),\n  });\n\n  let nonceFuture = client.call({\n    to: policyToken.address,\n    data: encodeFunctionData({\n      abi: parseAbi(EIP7597Abis),\n      functionName: \"nonces\",\n      args: [account.address],\n    }),\n  });\n\n  const [decimalsResponse, nonceResponse] = await Promise.all([\n    decimalsFuture,\n    nonceFuture,\n  ]);\n  if (!decimalsResponse.data) {\n    throw new Error(\"No decimals returned from erc20 contract call\");\n  }\n  if (!nonceResponse.data) {\n    throw new Error(\"No nonces returned from erc20 contract call\");\n  }\n\n  const decimals =\n    10n ** (decimalsResponse.data ? BigInt(decimalsResponse.data) : 18n);\n  const maxAmountToken = policyToken.maxTokenAmount * decimals;\n  const nonce = BigInt(nonceResponse.data);\n\n  const paymasterAddress =\n    policyToken.paymasterAddress ??\n    getAlchemyPaymasterAddress(client.chain, account.getEntryPoint().version);\n\n  if (paymasterAddress === undefined || paymasterAddress === \"0x\") {\n    throw new Error(\"no paymaster contract address available\");\n  }\n\n  const deadline = BigInt(Math.floor(Date.now() / 1000) + 60 * 10);\n\n  const typedPermitData = {\n    types: PermitTypes,\n    primaryType: \"Permit\" as const,\n    domain: {\n      name: policyToken.erc20Name ?? \"\",\n      version: policyToken.version ?? \"\",\n      chainId: BigInt(client.chain.id),\n      verifyingContract: policyToken.address,\n    } satisfies PermitDomain,\n    message: {\n      owner: account.address,\n      spender: paymasterAddress,\n      value: maxAmountToken,\n      nonce: nonce,\n      deadline,\n    } satisfies PermitMessage,\n  } as const;\n\n  const signedPermit = await account.signTypedData(typedPermitData);\n  return encodeAbiParameters(\n    [{ type: \"uint256\" }, { type: \"uint256\" }, { type: \"bytes\" }],\n    [maxAmountToken, deadline, signedPermit],\n  );\n};\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.43.1";
+export declare const VERSION = "4.45.0";

package/dist/esm/version.js

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

package/dist/esm/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,yBAAyB;AACzB,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC","sourcesContent":["// This file is autogenerated by inject-version.ts. Any changes will be\n// overwritten on commit!\nexport const VERSION = \"4.43.1\";\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.45.0\";\n"]}

package/dist/types/gas-manager.d.ts

@@ -1,8 +1,14 @@
-import type { Address, Chain, Hex } from "viem";
+import { type Address, type Chain, type Hex } from "viem";
+import type { EntryPointVersion } from "@aa-sdk/core";
+export declare const AlchemyPaymasterAddressV06Unify = "0x0000000000ce04e2359130e7d0204A5249958921";
+export declare const AlchemyPaymasterAddressV07Unify = "0x00000000000667F27D4DB42334ec11a25db7EBb4";
+export declare const AlchemyPaymasterAddressV4 = "0xEaf0Cde110a5d503f2dD69B3a49E031e29b3F9D2";
 export declare const AlchemyPaymasterAddressV3 = "0x4f84a207A80c39E9e8BaE717c1F25bA7AD1fB08F";
 export declare const AlchemyPaymasterAddressV2 = "0x4Fd9098af9ddcB41DA48A1d78F91F1398965addc";
 export declare const ArbSepoliaPaymasterAddress = "0x0804Afe6EEFb73ce7F93CD0d5e7079a5a8068592";
 export declare const AlchemyPaymasterAddressV1 = "0xc03aac639bb21233e0139381970328db8bceeb67";
+export declare const AlchemyPaymasterAddressV07V2 = "0x2cc0c7981D846b9F2a16276556f6e8cb52BfB633";
+export declare const AlchemyPaymasterAddressV07V1 = "0xEF725Aa22d43Ea69FB22bE2EBe6ECa205a6BCf5B";
 /**
  * Retrieves the Alchemy paymaster address for the given chain. Returns different addresses based on the chain ID.
  *
@@ -10,15 +16,14 @@ export declare const AlchemyPaymasterAddressV1 = "0xc03aac639bb21233e01393819703
  * ```ts
  * import { sepolia, getAlchemyPaymasterAddress } from "@account-kit/infra";
  *
- * const paymasterAddress = getAlchemyPaymasterAddress(sepolia);
+ * const paymasterAddress = getAlchemyPaymasterAddress(sepolia, "0.6.0");
  * ```
  *
  * @param {Chain} chain The chain for which the paymaster address is required
+ * @param {EntryPointVersion} version The version of the entry point
  * @returns {Address} The Alchemy paymaster address corresponding to the specified chain
- *
- * @deprecated This chain list in this function is no longer maintained since the ERC-7677 middleware is typically used to resolve the paymaster address
  */
-export declare const getAlchemyPaymasterAddress: (chain: Chain) => Address;
+export declare const getAlchemyPaymasterAddress: (chain: Chain, version: EntryPointVersion) => Address;
 export declare const PermitTypes: {
     readonly EIP712Domain: readonly [{
         readonly name: "name";
@@ -50,7 +55,9 @@ export declare const PermitTypes: {
         readonly type: "uint256";
     }];
 };
-export declare const EIP712NoncesAbi: readonly ["function nonces(address owner) external view returns (uint)", "function decimals() public view returns (uint8)", "function balanceOf(address owner) external view returns (uint256)", "function allowance(address owner, address spender) external view returns (uint256)"];
+export declare const ERC20Abis: readonly ["function decimals() public view returns (uint8)", "function balanceOf(address owner) external view returns (uint256)", "function allowance(address owner, address spender) external view returns (uint256)", "function approve(address spender, uint256 amount) external returns (bool)"];
+export declare const EIP7597Abis: readonly ["function nonces(address owner) external view returns (uint)"];
+export declare const approveTokenCallData: (paymasterAddress: Address, allowance: BigInt) => `0x${string}`;
 export type PermitMessage = {
     owner: Hex;
     spender: Hex;

package/dist/types/gas-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas-manager.d.ts","sourceRoot":"","sources":["../../src/gas-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAmBhD,eAAO,MAAM,yBAAyB,+CACQ,CAAC;AAC/C,eAAO,MAAM,yBAAyB,+CACQ,CAAC;AAC/C,eAAO,MAAM,0BAA0B,+CACO,CAAC;AAC/C,eAAO,MAAM,yBAAyB,+CACQ,CAAC;AAE/C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,0BAA0B,GAAI,OAAO,KAAK,KAAG,OAwBzD,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAcd,CAAC;AAEX,eAAO,MAAM,eAAe,wRAKlB,CAAC;AAEX,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,GAAG,CAAC;CACxB,CAAC"}
+{"version":3,"file":"gas-manager.d.ts","sourceRoot":"","sources":["../../src/gas-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AA6C9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,eAAO,MAAM,+BAA+B,+CACE,CAAC;AAC/C,eAAO,MAAM,+BAA+B,+CACE,CAAC;AAE/C,eAAO,MAAM,yBAAyB,+CACQ,CAAC;AAC/C,eAAO,MAAM,yBAAyB,+CACQ,CAAC;AAC/C,eAAO,MAAM,yBAAyB,+CACQ,CAAC;AAC/C,eAAO,MAAM,0BAA0B,+CACO,CAAC;AAC/C,eAAO,MAAM,yBAAyB,+CACQ,CAAC;AAE/C,eAAO,MAAM,4BAA4B,+CACK,CAAC;AAC/C,eAAO,MAAM,4BAA4B,+CACK,CAAC;AAE/C;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,0BAA0B,GACrC,OAAO,KAAK,EACZ,SAAS,iBAAiB,KACzB,OA0GF,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAcd,CAAC;AAEX,eAAO,MAAM,SAAS,sSAKZ,CAAC;AAEX,eAAO,MAAM,WAAW,0EAEd,CAAC;AAEX,eAAO,MAAM,oBAAoB,GAC/B,kBAAkB,OAAO,EACzB,WAAW,MAAM,kBAOlB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,GAAG,CAAC;CACxB,CAAC"}

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

@@ -31,6 +31,7 @@ interface AlchemyGasAndPaymasterAndDataMiddlewareParams {
 export type PolicyToken = {
     address: Address;
     maxTokenAmount: bigint;
+    paymasterAddress?: Address;
     approvalMode?: "NONE" | "PERMIT";
     erc20Name?: string;
     version?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"gasManager.d.ts","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,sBAAsB,EACtB,kBAAkB,EAQnB,MAAM,cAAc,CAAC;AAyBtB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAe/D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAC3B,WAAW,CAAC,EAAE,WAAW,GACxB,QAAQ,CACT,IAAI,CAAC,sBAAsB,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,CAC3E,CA6CA;AAED,UAAU,6CAA6C;IACrD,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IAC1C,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,uCAAuC,CACrD,MAAM,EAAE,6CAA6C,GACpD,IAAI,CACL,sBAAsB,EACtB,uBAAuB,GAAG,cAAc,GAAG,cAAc,GAAG,kBAAkB,CAC/E,CA8IA"}
+{"version":3,"file":"gasManager.d.ts","sourceRoot":"","sources":["../../../src/middleware/gasManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,sBAAsB,EACtB,kBAAkB,EAOnB,MAAM,cAAc,CAAC;AAuBtB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAoB/D;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAC3B,WAAW,CAAC,EAAE,WAAW,GACxB,QAAQ,CACT,IAAI,CAAC,sBAAsB,EAAE,uBAAuB,GAAG,kBAAkB,CAAC,CAC3E,CAyCA;AAED,UAAU,6CAA6C;IACrD,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IAC1C,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,uCAAuC,CACrD,MAAM,EAAE,6CAA6C,GACpD,IAAI,CACL,sBAAsB,EACtB,uBAAuB,GAAG,cAAc,GAAG,cAAc,GAAG,kBAAkB,CAC/E,CA4IA"}

package/dist/types/version.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/infra",
-  "version": "4.43.1",
+  "version": "4.45.0",
   "description": "adapters for @aa-sdk/core for interacting with alchemy services",
   "author": "Alchemy",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "typescript-template": "*"
   },
   "dependencies": {
-    "@aa-sdk/core": "^4.43.1",
-    "@account-kit/logging": "^4.43.1",
+    "@aa-sdk/core": "^4.45.0",
+    "@account-kit/logging": "^4.45.0",
     "eventemitter3": "^5.0.1",
     "zod": "^3.22.4"
   },
@@ -63,7 +63,7 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "f11e22e20d988764c0431dbec6a00c921ebaabec",
+  "gitHead": "00073ad37479818c37646a7f2600ddf3d0fcb91f",
   "optionalDependencies": {
     "alchemy-sdk": "^3.0.0"
   }

package/src/gas-manager.ts

@@ -1,4 +1,4 @@
-import type { Address, Chain, Hex } from "viem";
+import { encodeFunctionData, type Address, type Chain, type Hex } from "viem";
 import {
   arbitrum,
   arbitrumSepolia,
@@ -11,12 +11,46 @@ import {
   optimismSepolia,
   polygon,
   polygonAmoy,
-  polygonMumbai,
+  unichainSepolia,
+  worldChainSepolia,
   sepolia,
   zora,
   zoraSepolia,
+  shapeSepolia,
+  optimismGoerli,
+  arbitrumGoerli,
+  arbitrumNova,
+  baseGoerli,
+  beraChainBartio,
+  celoAlfajores,
+  celoMainnet,
+  gensynTestnet,
+  goerli,
+  inkMainnet,
+  inkSepolia,
+  monadTestnet,
+  opbnbMainnet,
+  opbnbTestnet,
+  openlootSepolia,
+  polygonMumbai,
+  riseTestnet,
+  shape,
+  soneiumMainnet,
+  soneiumMinato,
+  storyAeneid,
+  storyMainnet,
+  teaSepolia,
+  unichainMainnet,
+  worldChain,
 } from "./chains.js";
+import type { EntryPointVersion } from "@aa-sdk/core";
+export const AlchemyPaymasterAddressV06Unify =
+  "0x0000000000ce04e2359130e7d0204A5249958921";
+export const AlchemyPaymasterAddressV07Unify =
+  "0x00000000000667F27D4DB42334ec11a25db7EBb4";
 
+export const AlchemyPaymasterAddressV4 =
+  "0xEaf0Cde110a5d503f2dD69B3a49E031e29b3F9D2";
 export const AlchemyPaymasterAddressV3 =
   "0x4f84a207A80c39E9e8BaE717c1F25bA7AD1fB08F";
 export const AlchemyPaymasterAddressV2 =
@@ -26,6 +60,11 @@ export const ArbSepoliaPaymasterAddress =
 export const AlchemyPaymasterAddressV1 =
   "0xc03aac639bb21233e0139381970328db8bceeb67";
 
+export const AlchemyPaymasterAddressV07V2 =
+  "0x2cc0c7981D846b9F2a16276556f6e8cb52BfB633";
+export const AlchemyPaymasterAddressV07V1 =
+  "0xEF725Aa22d43Ea69FB22bE2EBe6ECa205a6BCf5B";
+
 /**
  * Retrieves the Alchemy paymaster address for the given chain. Returns different addresses based on the chain ID.
  *
@@ -33,37 +72,121 @@ export const AlchemyPaymasterAddressV1 =
  * ```ts
  * import { sepolia, getAlchemyPaymasterAddress } from "@account-kit/infra";
  *
- * const paymasterAddress = getAlchemyPaymasterAddress(sepolia);
+ * const paymasterAddress = getAlchemyPaymasterAddress(sepolia, "0.6.0");
  * ```
  *
  * @param {Chain} chain The chain for which the paymaster address is required
+ * @param {EntryPointVersion} version The version of the entry point
  * @returns {Address} The Alchemy paymaster address corresponding to the specified chain
- *
- * @deprecated This chain list in this function is no longer maintained since the ERC-7677 middleware is typically used to resolve the paymaster address
  */
-export const getAlchemyPaymasterAddress = (chain: Chain): Address => {
-  switch (chain.id) {
-    case polygonAmoy.id:
-    case optimismSepolia.id:
-    case baseSepolia.id:
-    case zora.id:
-    case zoraSepolia.id:
-    case fraxtal.id:
-    case fraxtalSepolia.id:
-      return AlchemyPaymasterAddressV3;
-    case mainnet.id:
-    case arbitrum.id:
-    case optimism.id:
-    case polygon.id:
-    case base.id:
-      return AlchemyPaymasterAddressV2;
-    case arbitrumSepolia.id:
-      return ArbSepoliaPaymasterAddress;
-    case sepolia.id:
-    case polygonMumbai.id:
-      return AlchemyPaymasterAddressV1;
+export const getAlchemyPaymasterAddress = (
+  chain: Chain,
+  version: EntryPointVersion,
+): Address => {
+  switch (version) {
+    case "0.6.0":
+      switch (chain.id) {
+        case fraxtalSepolia.id:
+        case worldChainSepolia.id:
+        case shapeSepolia.id:
+        case unichainSepolia.id:
+        case opbnbTestnet.id:
+        case inkSepolia.id:
+        case monadTestnet.id:
+        case openlootSepolia.id:
+        case gensynTestnet.id:
+        case riseTestnet.id:
+        case storyAeneid.id:
+        case teaSepolia.id:
+        case arbitrumGoerli.id:
+        case goerli.id:
+        case optimismGoerli.id:
+        case baseGoerli.id:
+        case polygonMumbai.id:
+        case worldChain.id:
+        case shape.id:
+        case unichainMainnet.id:
+        case soneiumMinato.id:
+        case soneiumMainnet.id:
+        case opbnbMainnet.id:
+        case beraChainBartio.id:
+        case inkMainnet.id:
+        case arbitrumNova.id:
+        case storyMainnet.id:
+        case celoAlfajores.id:
+        case celoMainnet.id:
+          return AlchemyPaymasterAddressV4;
+        case polygonAmoy.id:
+        case optimismSepolia.id:
+        case baseSepolia.id:
+        case zora.id:
+        case zoraSepolia.id:
+        case fraxtal.id:
+          return AlchemyPaymasterAddressV3;
+        case mainnet.id:
+        case arbitrum.id:
+        case optimism.id:
+        case polygon.id:
+        case base.id:
+          return AlchemyPaymasterAddressV2;
+        case arbitrumSepolia.id:
+          return ArbSepoliaPaymasterAddress;
+        case sepolia.id:
+          return AlchemyPaymasterAddressV1;
+        default:
+          return AlchemyPaymasterAddressV06Unify;
+      }
+    case "0.7.0":
+      switch (chain.id) {
+        case arbitrumNova.id:
+        case celoAlfajores.id:
+        case celoMainnet.id:
+        case gensynTestnet.id:
+        case inkMainnet.id:
+        case inkSepolia.id:
+        case monadTestnet.id:
+        case opbnbMainnet.id:
+        case opbnbTestnet.id:
+        case openlootSepolia.id:
+        case riseTestnet.id:
+        case shape.id:
+        case shapeSepolia.id:
+        case soneiumMainnet.id:
+        case soneiumMinato.id:
+        case storyAeneid.id:
+        case storyMainnet.id:
+        case teaSepolia.id:
+        case unichainMainnet.id:
+        case unichainSepolia.id:
+        case worldChain.id:
+        case worldChainSepolia.id:
+          return AlchemyPaymasterAddressV07V1;
+        case arbitrum.id:
+        case arbitrumGoerli.id:
+        case arbitrumSepolia.id:
+        case base.id:
+        case baseGoerli.id:
+        case baseSepolia.id:
+        case beraChainBartio.id:
+        case fraxtal.id:
+        case fraxtalSepolia.id:
+        case goerli.id:
+        case mainnet.id:
+        case optimism.id:
+        case optimismGoerli.id:
+        case optimismSepolia.id:
+        case polygon.id:
+        case polygonAmoy.id:
+        case polygonMumbai.id:
+        case sepolia.id:
+        case zora.id:
+        case zoraSepolia.id:
+          return AlchemyPaymasterAddressV07V2;
+        default:
+          return AlchemyPaymasterAddressV07Unify;
+      }
     default:
-      throw new Error(`Unsupported chain: ${chain}`);
+      throw new Error(`Unsupported EntryPointVersion: ${version}`);
   }
 };
 
@@ -83,13 +206,28 @@ export const PermitTypes = {
   ],
 } as const;
 
-export const EIP712NoncesAbi = [
-  "function nonces(address owner) external view returns (uint)",
+export const ERC20Abis = [
   "function decimals() public view returns (uint8)",
   "function balanceOf(address owner) external view returns (uint256)",
   "function allowance(address owner, address spender) external view returns (uint256)",
+  "function approve(address spender, uint256 amount) external returns (bool)",
 ] as const;
 
+export const EIP7597Abis = [
+  "function nonces(address owner) external view returns (uint)",
+] as const;
+
+export const approveTokenCallData = (
+  paymasterAddress: Address,
+  allowance: BigInt,
+) => {
+  return encodeFunctionData({
+    abi: ERC20Abis,
+    functionName: "approve",
+    args: [paymasterAddress, allowance],
+  });
+};
+
 export type PermitMessage = {
   owner: Hex;
   spender: Hex;

package/src/middleware/gasManager.ts

@@ -3,7 +3,6 @@ import type {
   ClientMiddlewareConfig,
   ClientMiddlewareFn,
   EntryPointVersion,
-  Erc7677Client,
   Multiplier,
   SmartContractAccount,
   UserOperationFeeOptions,
@@ -26,18 +25,21 @@ import {
 import {
   fromHex,
   isHex,
-  toHex,
   type Hex,
   encodeAbiParameters,
   encodeFunctionData,
   parseAbi,
-  sliceHex,
 } from "viem";
 import type { AlchemySmartAccountClient } from "../client/smartAccountClient.js";
 import type { AlchemyTransport } from "../alchemyTransport.js";
 import { alchemyFeeEstimator } from "./feeEstimator.js";
 import type { RequestGasAndPaymasterAndDataRequest } from "../actions/types.js";
-import { PermitTypes, EIP712NoncesAbi } from "../gas-manager.js";
+import {
+  PermitTypes,
+  EIP7597Abis,
+  ERC20Abis,
+  getAlchemyPaymasterAddress,
+} from "../gas-manager.js";
 import type { PermitMessage, PermitDomain } from "../gas-manager.js";
 import type { MiddlewareClient } from "../../../../aa-sdk/core/dist/types/middleware/actions.js";
 
@@ -76,7 +78,6 @@ export function alchemyGasManagerMiddleware(
   Pick<ClientMiddlewareConfig, "dummyPaymasterAndData" | "paymasterAndData">
 > {
   const buildContext = async (
-    uo: Parameters<ClientMiddlewareFn>[0],
     args: Parameters<ClientMiddlewareFn>[1],
   ): Promise<Context> => {
     const context: Context = { policyId };
@@ -87,7 +88,6 @@ export function alchemyGasManagerMiddleware(
     }
 
     if (policyToken !== undefined) {
-      const userOp = await deepHexlify(await resolveProperties(uo));
       context.erc20Context = {
         tokenAddress: policyToken.address,
         maxTokenAmount: policyToken.maxTokenAmount,
@@ -95,10 +95,8 @@ export function alchemyGasManagerMiddleware(
 
       if (policyToken.approvalMode === "PERMIT") {
         context.erc20Context.permit = await generateSignedPermit(
-          userOp,
           client as AlchemySmartAccountClient,
           account,
-          policyId,
           policyToken,
         );
       }
@@ -108,13 +106,13 @@ export function alchemyGasManagerMiddleware(
   };
   return {
     dummyPaymasterAndData: async (uo, args) => {
-      const context = await buildContext(uo, args);
+      const context = await buildContext(args);
       const baseMiddleware = erc7677Middleware({ context });
       return baseMiddleware.dummyPaymasterAndData(uo, args);
     },
 
     paymasterAndData: async (uo, args) => {
-      const context = await buildContext(uo, args);
+      const context = await buildContext(args);
       const baseMiddleware = erc7677Middleware({ context });
       return baseMiddleware.paymasterAndData(uo, args);
     },
@@ -132,6 +130,7 @@ interface AlchemyGasAndPaymasterAndDataMiddlewareParams {
 export type PolicyToken = {
   address: Address;
   maxTokenAmount: bigint;
+  paymasterAddress?: Address;
   approvalMode?: "NONE" | "PERMIT";
   erc20Name?: string;
   version?: string;
@@ -280,10 +279,8 @@ export function alchemyGasAndPaymasterAndDataMiddleware(
         };
         if (policyToken.approvalMode === "PERMIT") {
           erc20Context.permit = await generateSignedPermit(
-            userOp,
             client,
             account,
-            policyId,
             policyToken,
           );
         }
@@ -366,29 +363,24 @@ const overrideField = <
 /**
  * Utility function to generate a signed Permit for erc20 transaction
  *
- * @param {UserOperationRequest<TEntryPointVersion>} userOp - The user operation request
  * @param {MiddlewareClient} client - The Alchemy smart account client
  * @param {TAccount} account - The smart account instance
- * @param {string | string[]} policyId - The policy ID or array of policy IDs
  * @param {PolicyToken} policyToken - The policy token configuration
  * @param {Address} policyToken.address - ERC20 contract addressya
  * @param {bigint} [policyToken.maxTokenAmount] - Optional ERC20 token limit
+ * @param {Address} [policyToken.paymasterAddress] - Optional Paymaster Address
  * @param {"NONE" | "PERMIT"} [policyToken.approvalMode] - ERC20 approve mode
  * @param {string} [policyToken.erc20Name] - EIP2612 specified ERC20 contract name
  * @param {string} [policyToken.version] - EIP2612 specified ERC20 contract version
  * @returns {Promise<Hex>} Returns a Promise containing the signed EIP2612 permit
  */
-const generateSignedPermit = async <
-  TAccount extends SmartContractAccount,
-  TEntryPointVersion extends EntryPointVersion = EntryPointVersion,
->(
-  userOp: UserOperationRequest<TEntryPointVersion>,
+const generateSignedPermit = async <TAccount extends SmartContractAccount>(
   client: MiddlewareClient,
   account: TAccount,
-  policyId: string | string[],
   policyToken: {
     address: Address;
     maxTokenAmount: bigint;
+    paymasterAddress?: Address;
     approvalMode?: "NONE" | "PERMIT";
     erc20Name?: string;
     version?: string;
@@ -404,7 +396,7 @@ const generateSignedPermit = async <
   let decimalsFuture = client.call({
     to: policyToken.address,
     data: encodeFunctionData({
-      abi: parseAbi(EIP712NoncesAbi),
+      abi: parseAbi(ERC20Abis),
       functionName: "decimals",
       args: [],
     }),
@@ -413,28 +405,15 @@ const generateSignedPermit = async <
   let nonceFuture = client.call({
     to: policyToken.address,
     data: encodeFunctionData({
-      abi: parseAbi(EIP712NoncesAbi),
+      abi: parseAbi(EIP7597Abis),
       functionName: "nonces",
       args: [account.address],
     }),
   });
 
-  let paymasterDataFuture = (client as Erc7677Client).request({
-    method: "pm_getPaymasterStubData",
-    params: [
-      userOp,
-      account.getEntryPoint().address,
-      toHex(client.chain.id),
-      {
-        policyId: Array.isArray(policyId) ? policyId[0] : policyId,
-      },
-    ],
-  });
-
-  const [decimalsResponse, nonceResponse, paymasterData] = await Promise.all([
+  const [decimalsResponse, nonceResponse] = await Promise.all([
     decimalsFuture,
     nonceFuture,
-    paymasterDataFuture,
   ]);
   if (!decimalsResponse.data) {
     throw new Error("No decimals returned from erc20 contract call");
@@ -448,11 +427,9 @@ const generateSignedPermit = async <
   const maxAmountToken = policyToken.maxTokenAmount * decimals;
   const nonce = BigInt(nonceResponse.data);
 
-  const paymasterAddress = paymasterData.paymaster
-    ? paymasterData.paymaster
-    : paymasterData.paymasterAndData
-      ? sliceHex(paymasterData.paymasterAndData, 0, 20)
-      : undefined;
+  const paymasterAddress =
+    policyToken.paymasterAddress ??
+    getAlchemyPaymasterAddress(client.chain, account.getEntryPoint().version);
 
   if (paymasterAddress === undefined || paymasterAddress === "0x") {
     throw new Error("no paymaster contract address available");

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