@alchemy/aa-infra 5.0.0-beta.2 → 5.0.0-beta.20

package/dist/esm/estimateFeesPerGas.d.ts

@@ -3,13 +3,10 @@ import type { UserOperationRequest, SmartAccount, BundlerClient } from "viem/acc
 import type { RundlerRpcSchema } from "./schema.js";
 export type RundlerClient<transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined, account extends SmartAccount | undefined = SmartAccount | undefined> = BundlerClient<transport, chain, account, Client | undefined, RundlerRpcSchema>;
 /**
- * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_maxPriorityFeePerGas` for priority fee estimation.
+ * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_getUserOperationGasPrice` for fee estimation.
  *
- * It fetches:
- * 1. `baseFeePerGas` from the latest block.
- * 2. `maxPriorityFeePerGas` via `rundler_maxPriorityFeePerGas`.
- *
- * It then returns `maxFeePerGas = baseFee * 1.5 + priority` (aligns with viem default).
+ * It fetches gas price via `rundler_getUserOperationGasPrice` and returns the
+ * `suggested.maxFeePerGas` and `suggested.maxPriorityFeePerGas` values directly.
  *
  * @param {RundlerClient} bundlerClient Bundler client with the rundler RPC method.
  * @returns {Promise<{maxFeePerGas: bigint, maxPriorityFeePerGas: bigint}>} Estimated fee values.

package/dist/esm/estimateFeesPerGas.js

@@ -1,15 +1,9 @@
-import { getBlock } from "viem/actions";
-import { isHex, hexToBigInt, } from "viem";
-import { BaseError, bigIntMultiply } from "@alchemy/common";
-import { InvalidHexValueError } from "./errors.js";
+import { hexToBigInt, } from "viem";
 /**
- * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_maxPriorityFeePerGas` for priority fee estimation.
+ * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_getUserOperationGasPrice` for fee estimation.
  *
- * It fetches:
- * 1. `baseFeePerGas` from the latest block.
- * 2. `maxPriorityFeePerGas` via `rundler_maxPriorityFeePerGas`.
- *
- * It then returns `maxFeePerGas = baseFee * 1.5 + priority` (aligns with viem default).
+ * It fetches gas price via `rundler_getUserOperationGasPrice` and returns the
+ * `suggested.maxFeePerGas` and `suggested.maxPriorityFeePerGas` values directly.
  *
  * @param {RundlerClient} bundlerClient Bundler client with the rundler RPC method.
  * @returns {Promise<{maxFeePerGas: bigint, maxPriorityFeePerGas: bigint}>} Estimated fee values.
@@ -33,31 +27,13 @@ export async function estimateFeesPerGas({ bundlerClient, account: _account, use
     // to access bundler-specific properties from a base Client type.
     // See: https://github.com/wevm/viem/blob/d18b3b27/src/account-abstraction/actions/bundler/prepareUserOperation.ts#L355
     const rundlerClient = bundlerClient;
-    const [block, maxPriorityFeePerGasHex] = await Promise.all([
-        // If the node rpc url is different from the bundler url, the public
-        // client should be passed in when creating the bundler client, which
-        // we can access here for public actions.
-        getBlock(rundlerClient.client ?? rundlerClient, { blockTag: "latest" }),
-        rundlerClient.request({
-            method: "rundler_maxPriorityFeePerGas",
-            params: [],
-        }),
-    ]);
-    const baseFeePerGas = block.baseFeePerGas;
-    if (baseFeePerGas == null) {
-        throw new BaseError("baseFeePerGas is null");
-    }
-    if (maxPriorityFeePerGasHex == null) {
-        throw new BaseError("rundler_maxPriorityFeePerGas returned null or undefined");
-    }
-    if (!isHex(maxPriorityFeePerGasHex)) {
-        throw new InvalidHexValueError(maxPriorityFeePerGasHex);
-    }
-    const maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGasHex);
-    const bufferedMaxPriorityFeePerGas = bigIntMultiply(maxPriorityFeePerGas, 1.5);
+    const { suggested } = await rundlerClient.request({
+        method: "rundler_getUserOperationGasPrice",
+        params: [],
+    });
     return {
-        maxPriorityFeePerGas: bufferedMaxPriorityFeePerGas,
-        maxFeePerGas: bigIntMultiply(baseFeePerGas, 1.5) + bufferedMaxPriorityFeePerGas,
+        maxPriorityFeePerGas: hexToBigInt(suggested.maxPriorityFeePerGas),
+        maxFeePerGas: hexToBigInt(suggested.maxFeePerGas),
     };
 }
 //# sourceMappingURL=estimateFeesPerGas.js.map

package/dist/esm/estimateFeesPerGas.js.map

@@ -1 +1 @@
-{"version":3,"file":"estimateFeesPerGas.js","sourceRoot":"","sources":["../../src/estimateFeesPerGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAEL,KAAK,EAGL,WAAW,GAEZ,MAAM,MAAM,CAAC;AAMd,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAenD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAOtC,EACA,aAAa,EACb,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,cAAc,GAK9B;IAIC,6FAA6F;IAC7F,8GAA8G;IAC9G,iEAAiE;IACjE,uHAAuH;IACvH,MAAM,aAAa,GAAG,aAAyC,CAAC;IAEhE,MAAM,CAAC,KAAK,EAAE,uBAAuB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACzD,oEAAoE;QACpE,qEAAqE;QACrE,yCAAyC;QACzC,QAAQ,CAAC,aAAa,CAAC,MAAM,IAAI,aAAa,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;QACvE,aAAa,CAAC,OAAO,CAAC;YACpB,MAAM,EAAE,8BAA8B;YACtC,MAAM,EAAE,EAAE;SACX,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;IAC1C,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,SAAS,CAAC,uBAAuB,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,uBAAuB,IAAI,IAAI,EAAE,CAAC;QACpC,MAAM,IAAI,SAAS,CACjB,yDAAyD,CAC1D,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,oBAAoB,CAAC,uBAAuB,CAAC,CAAC;IAC1D,CAAC;IACD,MAAM,oBAAoB,GAAG,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAElE,MAAM,4BAA4B,GAAG,cAAc,CACjD,oBAAoB,EACpB,GAAG,CACJ,CAAC;IAEF,OAAO;QACL,oBAAoB,EAAE,4BAA4B;QAClD,YAAY,EACV,cAAc,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,4BAA4B;KACpE,CAAC;AACJ,CAAC","sourcesContent":["import { getBlock } from \"viem/actions\";\nimport {\n  type Client,\n  isHex,\n  type Transport,\n  type Chain,\n  hexToBigInt,\n  type Account,\n} from \"viem\";\nimport type {\n  UserOperationRequest,\n  SmartAccount,\n  BundlerClient,\n} from \"viem/account-abstraction\";\nimport { BaseError, bigIntMultiply } from \"@alchemy/common\";\nimport type { RundlerRpcSchema } from \"./schema.js\";\nimport { InvalidHexValueError } from \"./errors.js\";\n\n// Extend client with Rundler rpc schema.\nexport type RundlerClient<\n  transport extends Transport = Transport,\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartAccount | undefined = SmartAccount | undefined,\n> = BundlerClient<\n  transport,\n  chain,\n  account,\n  Client | undefined,\n  RundlerRpcSchema\n>;\n\n/**\n * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_maxPriorityFeePerGas` for priority fee estimation.\n *\n * It fetches:\n * 1. `baseFeePerGas` from the latest block.\n * 2. `maxPriorityFeePerGas` via `rundler_maxPriorityFeePerGas`.\n *\n * It then returns `maxFeePerGas = baseFee * 1.5 + priority` (aligns with viem default).\n *\n * @param {RundlerClient} bundlerClient Bundler client with the rundler RPC method.\n * @returns {Promise<{maxFeePerGas: bigint, maxPriorityFeePerGas: bigint}>} Estimated fee values.\n *\n * @example\n * ```ts\n * import { createBundlerClient } from \"viem/account-abstraction\";\n * import { estimateFeesPerGas as alchemyEstimateFeesPerGas } from \"@alchemy/aa-infra\";\n *\n * const bundler = createBundlerClient({\n *   transport: http(\"<rundler-url>\"),\n *   userOperation: {\n *     estimateFeesPerGas: alchemyEstimateFeesPerGas,\n *   },\n * });\n * ```\n */\nexport async function estimateFeesPerGas<\n  TTransport extends Transport = Transport,\n  TChain extends Chain | undefined = Chain | undefined,\n  TAccount extends SmartAccount | Account | undefined =\n    | SmartAccount\n    | Account\n    | undefined,\n>({\n  bundlerClient,\n  account: _account,\n  userOperation: _userOperation,\n}: {\n  bundlerClient: Client<TTransport, TChain, TAccount>;\n  account?: SmartAccount;\n  userOperation?: UserOperationRequest;\n}): Promise<{\n  maxFeePerGas: bigint;\n  maxPriorityFeePerGas: bigint;\n}> {\n  // Cast to RundlerClient to access rundler-specific RPC methods and BundlerClient properties.\n  // This mirrors viem's pattern in prepareUserOperation.ts where they cast `client as unknown as BundlerClient`\n  // to access bundler-specific properties from a base Client type.\n  // See: https://github.com/wevm/viem/blob/d18b3b27/src/account-abstraction/actions/bundler/prepareUserOperation.ts#L355\n  const rundlerClient = bundlerClient as unknown as RundlerClient;\n\n  const [block, maxPriorityFeePerGasHex] = await Promise.all([\n    // If the node rpc url is different from the bundler url, the public\n    // client should be passed in when creating the bundler client, which\n    // we can access here for public actions.\n    getBlock(rundlerClient.client ?? rundlerClient, { blockTag: \"latest\" }),\n    rundlerClient.request({\n      method: \"rundler_maxPriorityFeePerGas\",\n      params: [],\n    }),\n  ]);\n\n  const baseFeePerGas = block.baseFeePerGas;\n  if (baseFeePerGas == null) {\n    throw new BaseError(\"baseFeePerGas is null\");\n  }\n  if (maxPriorityFeePerGasHex == null) {\n    throw new BaseError(\n      \"rundler_maxPriorityFeePerGas returned null or undefined\",\n    );\n  }\n  if (!isHex(maxPriorityFeePerGasHex)) {\n    throw new InvalidHexValueError(maxPriorityFeePerGasHex);\n  }\n  const maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGasHex);\n\n  const bufferedMaxPriorityFeePerGas = bigIntMultiply(\n    maxPriorityFeePerGas,\n    1.5,\n  );\n\n  return {\n    maxPriorityFeePerGas: bufferedMaxPriorityFeePerGas,\n    maxFeePerGas:\n      bigIntMultiply(baseFeePerGas, 1.5) + bufferedMaxPriorityFeePerGas,\n  };\n}\n"]}
+{"version":3,"file":"estimateFeesPerGas.js","sourceRoot":"","sources":["../../src/estimateFeesPerGas.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,WAAW,GAEZ,MAAM,MAAM,CAAC;AAqBd;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAOtC,EACA,aAAa,EACb,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,cAAc,GAK9B;IAIC,6FAA6F;IAC7F,8GAA8G;IAC9G,iEAAiE;IACjE,uHAAuH;IACvH,MAAM,aAAa,GAAG,aAAyC,CAAC;IAEhE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC;QAChD,MAAM,EAAE,kCAAkC;QAC1C,MAAM,EAAE,EAAE;KACX,CAAC,CAAC;IAEH,OAAO;QACL,oBAAoB,EAAE,WAAW,CAAC,SAAS,CAAC,oBAAoB,CAAC;QACjE,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC;KAClD,CAAC;AACJ,CAAC","sourcesContent":["import {\n  type Client,\n  type Transport,\n  type Chain,\n  hexToBigInt,\n  type Account,\n} from \"viem\";\nimport type {\n  UserOperationRequest,\n  SmartAccount,\n  BundlerClient,\n} from \"viem/account-abstraction\";\nimport type { RundlerRpcSchema } from \"./schema.js\";\n\n// Extend client with Rundler rpc schema.\nexport type RundlerClient<\n  transport extends Transport = Transport,\n  chain extends Chain | undefined = Chain | undefined,\n  account extends SmartAccount | undefined = SmartAccount | undefined,\n> = BundlerClient<\n  transport,\n  chain,\n  account,\n  Client | undefined,\n  RundlerRpcSchema\n>;\n\n/**\n * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_getUserOperationGasPrice` for fee estimation.\n *\n * It fetches gas price via `rundler_getUserOperationGasPrice` and returns the\n * `suggested.maxFeePerGas` and `suggested.maxPriorityFeePerGas` values directly.\n *\n * @param {RundlerClient} bundlerClient Bundler client with the rundler RPC method.\n * @returns {Promise<{maxFeePerGas: bigint, maxPriorityFeePerGas: bigint}>} Estimated fee values.\n *\n * @example\n * ```ts\n * import { createBundlerClient } from \"viem/account-abstraction\";\n * import { estimateFeesPerGas as alchemyEstimateFeesPerGas } from \"@alchemy/aa-infra\";\n *\n * const bundler = createBundlerClient({\n *   transport: http(\"<rundler-url>\"),\n *   userOperation: {\n *     estimateFeesPerGas: alchemyEstimateFeesPerGas,\n *   },\n * });\n * ```\n */\nexport async function estimateFeesPerGas<\n  TTransport extends Transport = Transport,\n  TChain extends Chain | undefined = Chain | undefined,\n  TAccount extends SmartAccount | Account | undefined =\n    | SmartAccount\n    | Account\n    | undefined,\n>({\n  bundlerClient,\n  account: _account,\n  userOperation: _userOperation,\n}: {\n  bundlerClient: Client<TTransport, TChain, TAccount>;\n  account?: SmartAccount;\n  userOperation?: UserOperationRequest;\n}): Promise<{\n  maxFeePerGas: bigint;\n  maxPriorityFeePerGas: bigint;\n}> {\n  // Cast to RundlerClient to access rundler-specific RPC methods and BundlerClient properties.\n  // This mirrors viem's pattern in prepareUserOperation.ts where they cast `client as unknown as BundlerClient`\n  // to access bundler-specific properties from a base Client type.\n  // See: https://github.com/wevm/viem/blob/d18b3b27/src/account-abstraction/actions/bundler/prepareUserOperation.ts#L355\n  const rundlerClient = bundlerClient as unknown as RundlerClient;\n\n  const { suggested } = await rundlerClient.request({\n    method: \"rundler_getUserOperationGasPrice\",\n    params: [],\n  });\n\n  return {\n    maxPriorityFeePerGas: hexToBigInt(suggested.maxPriorityFeePerGas),\n    maxFeePerGas: hexToBigInt(suggested.maxFeePerGas),\n  };\n}\n"]}

package/dist/esm/schema.d.ts

@@ -4,5 +4,21 @@ type RundlerMaxPriorityFeePerGasSchema = {
     Parameters: [];
     ReturnType: Hex;
 };
-export type RundlerRpcSchema = [RundlerMaxPriorityFeePerGasSchema];
+type RundlerGetUserOperationGasPriceSchema = {
+    Method: "rundler_getUserOperationGasPrice";
+    Parameters: [];
+    ReturnType: {
+        priorityFee: Hex;
+        baseFee: Hex;
+        blockNumber: Hex;
+        suggested: {
+            maxPriorityFeePerGas: Hex;
+            maxFeePerGas: Hex;
+        };
+    };
+};
+export type RundlerRpcSchema = [
+    RundlerMaxPriorityFeePerGasSchema,
+    RundlerGetUserOperationGasPriceSchema
+];
 export {};

package/dist/esm/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from \"viem\";\n\ntype RundlerMaxPriorityFeePerGasSchema = {\n  Method: \"rundler_maxPriorityFeePerGas\";\n  Parameters: [];\n  ReturnType: Hex;\n};\n\nexport type RundlerRpcSchema = [RundlerMaxPriorityFeePerGasSchema];\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from \"viem\";\n\ntype RundlerMaxPriorityFeePerGasSchema = {\n  Method: \"rundler_maxPriorityFeePerGas\";\n  Parameters: [];\n  ReturnType: Hex;\n};\n\ntype RundlerGetUserOperationGasPriceSchema = {\n  Method: \"rundler_getUserOperationGasPrice\";\n  Parameters: [];\n  ReturnType: {\n    priorityFee: Hex;\n    baseFee: Hex;\n    blockNumber: Hex;\n    suggested: {\n      maxPriorityFeePerGas: Hex;\n      maxFeePerGas: Hex;\n    };\n  };\n};\n\nexport type RundlerRpcSchema = [\n  RundlerMaxPriorityFeePerGasSchema,\n  RundlerGetUserOperationGasPriceSchema,\n];\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "5.0.0-beta.1";
+export declare const VERSION = "5.0.0-beta.19";

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

package/dist/types/estimateFeesPerGas.d.ts

@@ -3,13 +3,10 @@ import type { UserOperationRequest, SmartAccount, BundlerClient } from "viem/acc
 import type { RundlerRpcSchema } from "./schema.js";
 export type RundlerClient<transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined, account extends SmartAccount | undefined = SmartAccount | undefined> = BundlerClient<transport, chain, account, Client | undefined, RundlerRpcSchema>;
 /**
- * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_maxPriorityFeePerGas` for priority fee estimation.
+ * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_getUserOperationGasPrice` for fee estimation.
  *
- * It fetches:
- * 1. `baseFeePerGas` from the latest block.
- * 2. `maxPriorityFeePerGas` via `rundler_maxPriorityFeePerGas`.
- *
- * It then returns `maxFeePerGas = baseFee * 1.5 + priority` (aligns with viem default).
+ * It fetches gas price via `rundler_getUserOperationGasPrice` and returns the
+ * `suggested.maxFeePerGas` and `suggested.maxPriorityFeePerGas` values directly.
  *
  * @param {RundlerClient} bundlerClient Bundler client with the rundler RPC method.
  * @returns {Promise<{maxFeePerGas: bigint, maxPriorityFeePerGas: bigint}>} Estimated fee values.

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

@@ -1 +1 @@
-{"version":3,"file":"estimateFeesPerGas.d.ts","sourceRoot":"","sources":["../../src/estimateFeesPerGas.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,MAAM,EAEX,KAAK,SAAS,EACd,KAAK,KAAK,EAEV,KAAK,OAAO,EACb,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EACV,oBAAoB,EACpB,YAAY,EACZ,aAAa,EACd,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAIpD,MAAM,MAAM,aAAa,CACvB,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACnD,OAAO,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,IACjE,aAAa,CACf,SAAS,EACT,KAAK,EACL,OAAO,EACP,MAAM,GAAG,SAAS,EAClB,gBAAgB,CACjB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,YAAY,GAAG,OAAO,GAAG,SAAS,GAC/C,YAAY,GACZ,OAAO,GACP,SAAS,EACb,EACA,aAAa,EACb,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,cAAc,GAC9B,EAAE;IACD,aAAa,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpD,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACtC,GAAG,OAAO,CAAC;IACV,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC,CA0CD"}
+{"version":3,"file":"estimateFeesPerGas.d.ts","sourceRoot":"","sources":["../../src/estimateFeesPerGas.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,MAAM,EACX,KAAK,SAAS,EACd,KAAK,KAAK,EAEV,KAAK,OAAO,EACb,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EACV,oBAAoB,EACpB,YAAY,EACZ,aAAa,EACd,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,MAAM,aAAa,CACvB,SAAS,SAAS,SAAS,GAAG,SAAS,EACvC,KAAK,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACnD,OAAO,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,IACjE,aAAa,CACf,SAAS,EACT,KAAK,EACL,OAAO,EACP,MAAM,GAAG,SAAS,EAClB,gBAAgB,CACjB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,YAAY,GAAG,OAAO,GAAG,SAAS,GAC/C,YAAY,GACZ,OAAO,GACP,SAAS,EACb,EACA,aAAa,EACb,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,cAAc,GAC9B,EAAE;IACD,aAAa,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpD,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,aAAa,CAAC,EAAE,oBAAoB,CAAC;CACtC,GAAG,OAAO,CAAC;IACV,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC,CAgBD"}

package/dist/types/schema.d.ts

@@ -4,6 +4,22 @@ type RundlerMaxPriorityFeePerGasSchema = {
     Parameters: [];
     ReturnType: Hex;
 };
-export type RundlerRpcSchema = [RundlerMaxPriorityFeePerGasSchema];
+type RundlerGetUserOperationGasPriceSchema = {
+    Method: "rundler_getUserOperationGasPrice";
+    Parameters: [];
+    ReturnType: {
+        priorityFee: Hex;
+        baseFee: Hex;
+        blockNumber: Hex;
+        suggested: {
+            maxPriorityFeePerGas: Hex;
+            maxFeePerGas: Hex;
+        };
+    };
+};
+export type RundlerRpcSchema = [
+    RundlerMaxPriorityFeePerGasSchema,
+    RundlerGetUserOperationGasPriceSchema
+];
 export {};
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,KAAK,iCAAiC,GAAG;IACvC,MAAM,EAAE,8BAA8B,CAAC;IACvC,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,iCAAiC,CAAC,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,KAAK,iCAAiC,GAAG;IACvC,MAAM,EAAE,8BAA8B,CAAC;IACvC,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;CACjB,CAAC;AAEF,KAAK,qCAAqC,GAAG;IAC3C,MAAM,EAAE,kCAAkC,CAAC;IAC3C,UAAU,EAAE,EAAE,CAAC;IACf,UAAU,EAAE;QACV,WAAW,EAAE,GAAG,CAAC;QACjB,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,EAAE,GAAG,CAAC;QACjB,SAAS,EAAE;YACT,oBAAoB,EAAE,GAAG,CAAC;YAC1B,YAAY,EAAE,GAAG,CAAC;SACnB,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iCAAiC;IACjC,qCAAqC;CACtC,CAAC"}

package/dist/types/version.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,iBAAiB,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy/aa-infra",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.20",
   "description": "Alchemy Account Abstraction Infrastructure",
   "author": "Alchemy",
   "license": "MIT",
@@ -31,7 +31,7 @@
   },
   "scripts": {
     "prebuild": "tsx ./inject-version.ts",
-    "build": "yarn clean && yarn build:esm && yarn build:types",
+    "build": "pnpm run clean && pnpm run build:esm && pnpm run build:types",
     "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
     "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "clean": "rm -rf ./dist",
@@ -39,11 +39,11 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "typescript-template": "*",
+    "typescript-template": "workspace:*",
     "viem": "^2.45.0"
   },
   "dependencies": {
-    "@alchemy/common": "^5.0.0-beta.2"
+    "@alchemy/common": "5.0.0-beta.20"
   },
   "peerDependencies": {
     "viem": "^2.45.0"
@@ -60,5 +60,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "9042002b7414ac2ae8a6251ee4cf96555b091eca"
+  "gitHead": "e8b35b489e1f129877c618752b35b4fb05149a55"
 }

package/src/estimateFeesPerGas.ts

@@ -1,7 +1,5 @@
-import { getBlock } from "viem/actions";
 import {
   type Client,
-  isHex,
   type Transport,
   type Chain,
   hexToBigInt,
@@ -12,9 +10,7 @@ import type {
   SmartAccount,
   BundlerClient,
 } from "viem/account-abstraction";
-import { BaseError, bigIntMultiply } from "@alchemy/common";
 import type { RundlerRpcSchema } from "./schema.js";
-import { InvalidHexValueError } from "./errors.js";
 
 // Extend client with Rundler rpc schema.
 export type RundlerClient<
@@ -30,13 +26,10 @@ export type RundlerClient<
 >;
 
 /**
- * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_maxPriorityFeePerGas` for priority fee estimation.
+ * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_getUserOperationGasPrice` for fee estimation.
  *
- * It fetches:
- * 1. `baseFeePerGas` from the latest block.
- * 2. `maxPriorityFeePerGas` via `rundler_maxPriorityFeePerGas`.
- *
- * It then returns `maxFeePerGas = baseFee * 1.5 + priority` (aligns with viem default).
+ * It fetches gas price via `rundler_getUserOperationGasPrice` and returns the
+ * `suggested.maxFeePerGas` and `suggested.maxPriorityFeePerGas` values directly.
  *
  * @param {RundlerClient} bundlerClient Bundler client with the rundler RPC method.
  * @returns {Promise<{maxFeePerGas: bigint, maxPriorityFeePerGas: bigint}>} Estimated fee values.
@@ -79,39 +72,13 @@ export async function estimateFeesPerGas<
   // See: https://github.com/wevm/viem/blob/d18b3b27/src/account-abstraction/actions/bundler/prepareUserOperation.ts#L355
   const rundlerClient = bundlerClient as unknown as RundlerClient;
 
-  const [block, maxPriorityFeePerGasHex] = await Promise.all([
-    // If the node rpc url is different from the bundler url, the public
-    // client should be passed in when creating the bundler client, which
-    // we can access here for public actions.
-    getBlock(rundlerClient.client ?? rundlerClient, { blockTag: "latest" }),
-    rundlerClient.request({
-      method: "rundler_maxPriorityFeePerGas",
-      params: [],
-    }),
-  ]);
-
-  const baseFeePerGas = block.baseFeePerGas;
-  if (baseFeePerGas == null) {
-    throw new BaseError("baseFeePerGas is null");
-  }
-  if (maxPriorityFeePerGasHex == null) {
-    throw new BaseError(
-      "rundler_maxPriorityFeePerGas returned null or undefined",
-    );
-  }
-  if (!isHex(maxPriorityFeePerGasHex)) {
-    throw new InvalidHexValueError(maxPriorityFeePerGasHex);
-  }
-  const maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGasHex);
-
-  const bufferedMaxPriorityFeePerGas = bigIntMultiply(
-    maxPriorityFeePerGas,
-    1.5,
-  );
+  const { suggested } = await rundlerClient.request({
+    method: "rundler_getUserOperationGasPrice",
+    params: [],
+  });
 
   return {
-    maxPriorityFeePerGas: bufferedMaxPriorityFeePerGas,
-    maxFeePerGas:
-      bigIntMultiply(baseFeePerGas, 1.5) + bufferedMaxPriorityFeePerGas,
+    maxPriorityFeePerGas: hexToBigInt(suggested.maxPriorityFeePerGas),
+    maxFeePerGas: hexToBigInt(suggested.maxFeePerGas),
   };
 }

package/src/schema.ts

@@ -6,4 +6,21 @@ type RundlerMaxPriorityFeePerGasSchema = {
   ReturnType: Hex;
 };
 
-export type RundlerRpcSchema = [RundlerMaxPriorityFeePerGasSchema];
+type RundlerGetUserOperationGasPriceSchema = {
+  Method: "rundler_getUserOperationGasPrice";
+  Parameters: [];
+  ReturnType: {
+    priorityFee: Hex;
+    baseFee: Hex;
+    blockNumber: Hex;
+    suggested: {
+      maxPriorityFeePerGas: Hex;
+      maxFeePerGas: Hex;
+    };
+  };
+};
+
+export type RundlerRpcSchema = [
+  RundlerMaxPriorityFeePerGasSchema,
+  RundlerGetUserOperationGasPriceSchema,
+];

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 = "5.0.0-beta.2";
+export const VERSION = "5.0.0-beta.20";