@account-kit/infra 4.44.0 → 4.46.0

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

@@ -58,13 +58,23 @@ export type RequestGasAndPaymasterAndDataRequest = [
 export type RequestGasAndPaymasterAndDataResponse<TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = Pick<UserOperationRequest, "callGasLimit" | "preVerificationGas" | "verificationGasLimit" | "maxFeePerGas" | "maxPriorityFeePerGas"> & (TEntryPointVersion extends "0.6.0" ? {
     paymasterAndData: UserOperationRequest<"0.6.0">["paymasterAndData"];
 } : TEntryPointVersion extends "0.7.0" ? Pick<UserOperationRequest<"0.7.0">, "paymaster" | "paymasterData" | "paymasterVerificationGasLimit" | "paymasterPostOpGasLimit"> : never);
-export type RequestPayamsterTokenQuoteRequest = [
+export type RequestPaymasterTokenQuoteRequest = [
     {
         policyId: string;
-        tokenAddress: Address;
+        entryPoint: Address;
+        erc20Context?: {
+            tokenAddress: Address;
+            permit?: Hex;
+            maxTokenAmount?: BigInt;
+        };
+        dummySignature: Hex;
+        userOperation: UserOperationRequest;
+        overrides?: UserOperationOverrides;
     }
 ];
-export type RequestPayamsterTokenQuoteResponse = {
-    ethToTokenConversionRate: string;
+export type RequestPaymasterTokenQuoteResponse = {
+    tokensPerEth: string;
+    estimatedTokenAmount: string;
+    estimatedUsd: number;
 };
 //# sourceMappingURL=types.d.ts.map

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

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

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

@@ -1,5 +1,5 @@
 import { type BundlerClient, type Erc7677RpcSchema, type UserOperationRequest } from "@aa-sdk/core";
-import type { SimulateUserOperationAssetChangesRequest, SimulateUserOperationAssetChangesResponse, RequestGasAndPaymasterAndDataRequest, RequestGasAndPaymasterAndDataResponse, RequestPayamsterTokenQuoteRequest, RequestPayamsterTokenQuoteResponse } from "../actions/types";
+import type { SimulateUserOperationAssetChangesRequest, SimulateUserOperationAssetChangesResponse, RequestGasAndPaymasterAndDataRequest, RequestGasAndPaymasterAndDataResponse, RequestPaymasterTokenQuoteRequest, RequestPaymasterTokenQuoteResponse } from "../actions/types";
 import type { AlchemyTransport } from "../alchemyTransport";
 export type AlchemyRpcSchema = [
     {
@@ -22,8 +22,8 @@ export type AlchemyRpcSchema = [
     },
     {
         Method: "alchemy_requestPaymasterTokenQuote";
-        Parameters: RequestPayamsterTokenQuoteRequest;
-        ReturnType: RequestPayamsterTokenQuoteResponse;
+        Parameters: RequestPaymasterTokenQuoteRequest;
+        ReturnType: RequestPaymasterTokenQuoteResponse;
     }
 ];
 export type ClientWithAlchemyMethods = BundlerClient<AlchemyTransport> & {

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.44.0";
+export declare const VERSION = "4.46.0";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/infra",
-  "version": "4.44.0",
+  "version": "4.46.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.44.0",
-    "@account-kit/logging": "^4.44.0",
+    "@aa-sdk/core": "^4.46.0",
+    "@account-kit/logging": "^4.46.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": "29c87d1385f13cffcb55e6286bfaeb26637d5fe9",
+  "gitHead": "fb516cc1ba7059a257fb329fb8663c7cc90947bb",
   "optionalDependencies": {
     "alchemy-sdk": "^3.0.0"
   }

package/src/actions/types.ts

@@ -92,13 +92,23 @@ export type RequestGasAndPaymasterAndDataResponse<
         >
       : never);
 
-export type RequestPayamsterTokenQuoteRequest = [
+export type RequestPaymasterTokenQuoteRequest = [
   {
     policyId: string;
-    tokenAddress: Address;
+    entryPoint: Address;
+    erc20Context?: {
+      tokenAddress: Address;
+      permit?: Hex;
+      maxTokenAmount?: BigInt;
+    };
+    dummySignature: Hex;
+    userOperation: UserOperationRequest;
+    overrides?: UserOperationOverrides;
   },
 ];
 
-export type RequestPayamsterTokenQuoteResponse = {
-  ethToTokenConversionRate: string;
+export type RequestPaymasterTokenQuoteResponse = {
+  tokensPerEth: string;
+  estimatedTokenAmount: string;
+  estimatedUsd: number;
 };

package/src/client/types.ts

@@ -8,8 +8,8 @@ import type {
   SimulateUserOperationAssetChangesResponse,
   RequestGasAndPaymasterAndDataRequest,
   RequestGasAndPaymasterAndDataResponse,
-  RequestPayamsterTokenQuoteRequest,
-  RequestPayamsterTokenQuoteResponse,
+  RequestPaymasterTokenQuoteRequest,
+  RequestPaymasterTokenQuoteResponse,
 } from "../actions/types";
 import type { AlchemyTransport } from "../alchemyTransport";
 
@@ -32,8 +32,8 @@ export type AlchemyRpcSchema = [
   },
   {
     Method: "alchemy_requestPaymasterTokenQuote";
-    Parameters: RequestPayamsterTokenQuoteRequest;
-    ReturnType: RequestPayamsterTokenQuoteResponse;
+    Parameters: RequestPaymasterTokenQuoteRequest;
+    ReturnType: RequestPaymasterTokenQuoteResponse;
   },
 ];
 

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