@alchemy/aa-infra 0.0.0-alpha.9 → 5.0.0-beta.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Alchemy Insights, Inc.
+Copyright (c) 2026 Alchemy Insights, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -0,0 +1,35 @@
+# @alchemy/aa-infra
+
+Alchemy Account Abstraction infrastructure utilities. Provides Rundler-specific fee estimation and RPC types for use with viem's bundler client.
+
+## Installation
+
+```bash
+npm install @alchemy/aa-infra @alchemy/common viem
+```
+
+## Key Exports
+
+- **`estimateFeesPerGas`** - Custom fee estimation using Alchemy's `rundler_maxPriorityFeePerGas` RPC method. Pass this as `userOperation.estimateFeesPerGas` when creating a viem `BundlerClient` pointed at Alchemy's Rundler.
+- **`RundlerClient`** / **`RundlerRpcSchema`** - TypeScript types extending viem's `BundlerClient` with Rundler-specific RPC methods
+
+## Usage
+
+```ts
+import { estimateFeesPerGas } from "@alchemy/aa-infra";
+import { createBundlerClient } from "viem/account-abstraction";
+import { sepolia } from "viem/chains";
+import { alchemyTransport } from "@alchemy/common";
+
+const bundlerClient = createBundlerClient({
+  chain: sepolia,
+  transport: alchemyTransport({ apiKey: "YOUR_API_KEY" }),
+  userOperation: {
+    estimateFeesPerGas,
+  },
+});
+```
+
+## License
+
+MIT

package/dist/esm/estimateFeesPerGas.d.ts

@@ -1,7 +1,7 @@
 import { type Client, type Transport, type Chain, type Account } from "viem";
-import type { UserOperationRequest, SmartAccount } from "viem/account-abstraction";
+import type { UserOperationRequest, SmartAccount, BundlerClient } from "viem/account-abstraction";
 import type { RundlerRpcSchema } from "./schema.js";
-export type RundlerClient<transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined, account extends Account | undefined = Account | undefined> = Client<transport, chain, account, RundlerRpcSchema>;
+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.
  *
@@ -17,7 +17,7 @@ export type RundlerClient<transport extends Transport = Transport, chain extends
  * @example
  * ```ts
  * import { createBundlerClient } from "viem/account-abstraction";
- * import { alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
+ * import { estimateFeesPerGas as alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
  *
  * const bundler = createBundlerClient({
  *   transport: http("<rundler-url>"),
@@ -27,8 +27,8 @@ export type RundlerClient<transport extends Transport = Transport, chain extends
  * });
  * ```
  */
-export declare function estimateFeesPerGas<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TAccount extends Account | undefined = Account | undefined>({ bundlerClient, account: _account, userOperation: _userOperation, }: {
-    bundlerClient: RundlerClient<TTransport, TChain, TAccount>;
+export declare function estimateFeesPerGas<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TAccount extends SmartAccount | Account | undefined = SmartAccount | Account | undefined>({ bundlerClient, account: _account, userOperation: _userOperation, }: {
+    bundlerClient: Client<TTransport, TChain, TAccount>;
     account?: SmartAccount;
     userOperation?: UserOperationRequest;
 }): Promise<{

package/dist/esm/estimateFeesPerGas.js

@@ -1,6 +1,6 @@
 import { getBlock } from "viem/actions";
 import { isHex, hexToBigInt, } from "viem";
-import { bigIntMultiply } from "@alchemy/common";
+import { BaseError, bigIntMultiply } from "@alchemy/common";
 import { InvalidHexValueError } from "./errors.js";
 /**
  * A custom `estimateFeesPerGas` function for viem bundler clients to use `rundler_maxPriorityFeePerGas` for priority fee estimation.
@@ -17,7 +17,7 @@ import { InvalidHexValueError } from "./errors.js";
  * @example
  * ```ts
  * import { createBundlerClient } from "viem/account-abstraction";
- * import { alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
+ * import { estimateFeesPerGas as alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
  *
  * const bundler = createBundlerClient({
  *   transport: http("<rundler-url>"),
@@ -28,27 +28,36 @@ import { InvalidHexValueError } from "./errors.js";
  * ```
  */
 export async function estimateFeesPerGas({ bundlerClient, account: _account, userOperation: _userOperation, }) {
+    // Cast to RundlerClient to access rundler-specific RPC methods and BundlerClient properties.
+    // This mirrors viem's pattern in prepareUserOperation.ts where they cast `client as unknown as BundlerClient`
+    // 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([
-        getBlock(bundlerClient, { blockTag: "latest" }), // This is technically hitting the node rpc, not rundler.
-        bundlerClient.request({
+        // 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 Error("baseFeePerGas is null");
+        throw new BaseError("baseFeePerGas is null");
     }
     if (maxPriorityFeePerGasHex == null) {
-        throw new Error("rundler_maxPriorityFeePerGas returned null or undefined");
+        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);
     return {
-        maxPriorityFeePerGas,
-        maxFeePerGas: bigIntMultiply(baseFeePerGas, 1.5) + maxPriorityFeePerGas,
+        maxPriorityFeePerGas: bufferedMaxPriorityFeePerGas,
+        maxFeePerGas: bigIntMultiply(baseFeePerGas, 1.5) + bufferedMaxPriorityFeePerGas,
     };
 }
 //# 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,EAIL,WAAW,GACZ,MAAM,MAAM,CAAC;AAKd,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AASnD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAItC,EACA,aAAa,EACb,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,cAAc,GAK9B;IAIC,MAAM,CAAC,KAAK,EAAE,uBAAuB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACzD,QAAQ,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,EAAE,yDAAyD;QAC1G,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,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,uBAAuB,IAAI,IAAI,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,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,OAAO;QACL,oBAAoB;QACpB,YAAY,EAAE,cAAc,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,oBAAoB;KACxE,CAAC;AACJ,CAAC","sourcesContent":["import { getBlock } from \"viem/actions\";\nimport {\n  type Client,\n  isHex,\n  type Transport,\n  type Chain,\n  type Account,\n  hexToBigInt,\n} from \"viem\";\nimport type {\n  UserOperationRequest,\n  SmartAccount,\n} from \"viem/account-abstraction\";\nimport { 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 Account | undefined = Account | undefined,\n> = Client<transport, chain, account, RundlerRpcSchema>;\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 { 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 Account | undefined = Account | undefined,\n>({\n  bundlerClient,\n  account: _account,\n  userOperation: _userOperation,\n}: {\n  bundlerClient: RundlerClient<TTransport, TChain, TAccount>;\n  account?: SmartAccount;\n  userOperation?: UserOperationRequest;\n}): Promise<{\n  maxFeePerGas: bigint;\n  maxPriorityFeePerGas: bigint;\n}> {\n  const [block, maxPriorityFeePerGasHex] = await Promise.all([\n    getBlock(bundlerClient, { blockTag: \"latest\" }), // This is technically hitting the node rpc, not rundler.\n    bundlerClient.request({\n      method: \"rundler_maxPriorityFeePerGas\",\n      params: [],\n    }),\n  ]);\n\n  const baseFeePerGas = block.baseFeePerGas;\n  if (baseFeePerGas == null) {\n    throw new Error(\"baseFeePerGas is null\");\n  }\n  if (maxPriorityFeePerGasHex == null) {\n    throw new Error(\"rundler_maxPriorityFeePerGas returned null or undefined\");\n  }\n  if (!isHex(maxPriorityFeePerGasHex)) {\n    throw new InvalidHexValueError(maxPriorityFeePerGasHex);\n  }\n  const maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGasHex);\n\n  return {\n    maxPriorityFeePerGas,\n    maxFeePerGas: bigIntMultiply(baseFeePerGas, 1.5) + maxPriorityFeePerGas,\n  };\n}\n"]}
+{"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"]}

package/dist/esm/logger.d.ts

@@ -1,2 +1,2 @@
-import type { DiagnosticsLogger } from "@alchemy/common";
+import type { DiagnosticsLogger } from "@alchemy/common/internal";
 export declare const LOGGER: DiagnosticsLogger;

package/dist/esm/logger.js

@@ -1,4 +1,4 @@
-import { createLogger } from "@alchemy/common";
+import { createLogger } from "@alchemy/common/internal";
 import { VERSION } from "./version.js";
 export const LOGGER = createLogger({
     package: "@alchemy/aa-infra",

package/dist/esm/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAsB,YAAY,CAAC;IACpD,OAAO,EAAE,mBAAmB;IAC5B,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,UAAU;CACtB,CAAC,CAAC","sourcesContent":["import { createLogger } from \"@alchemy/common\";\nimport type { DiagnosticsLogger } from \"@alchemy/common\";\nimport { VERSION } from \"./version.js\";\n\nexport const LOGGER: DiagnosticsLogger = createLogger({\n  package: \"@alchemy/aa-infra\",\n  version: VERSION,\n  namespace: \"aa-infra\",\n});\n"]}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAsB,YAAY,CAAC;IACpD,OAAO,EAAE,mBAAmB;IAC5B,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,UAAU;CACtB,CAAC,CAAC","sourcesContent":["import { createLogger } from \"@alchemy/common/internal\";\nimport type { DiagnosticsLogger } from \"@alchemy/common/internal\";\nimport { VERSION } from \"./version.js\";\n\nexport const LOGGER: DiagnosticsLogger = createLogger({\n  package: \"@alchemy/aa-infra\",\n  version: VERSION,\n  namespace: \"aa-infra\",\n});\n"]}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.0.0-alpha.8";
+export declare const VERSION = "5.0.0-beta.1";

package/dist/esm/version.js

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

package/dist/esm/version.js.map

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

package/dist/types/estimateFeesPerGas.d.ts

@@ -1,7 +1,7 @@
 import { type Client, type Transport, type Chain, type Account } from "viem";
-import type { UserOperationRequest, SmartAccount } from "viem/account-abstraction";
+import type { UserOperationRequest, SmartAccount, BundlerClient } from "viem/account-abstraction";
 import type { RundlerRpcSchema } from "./schema.js";
-export type RundlerClient<transport extends Transport = Transport, chain extends Chain | undefined = Chain | undefined, account extends Account | undefined = Account | undefined> = Client<transport, chain, account, RundlerRpcSchema>;
+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.
  *
@@ -17,7 +17,7 @@ export type RundlerClient<transport extends Transport = Transport, chain extends
  * @example
  * ```ts
  * import { createBundlerClient } from "viem/account-abstraction";
- * import { alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
+ * import { estimateFeesPerGas as alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
  *
  * const bundler = createBundlerClient({
  *   transport: http("<rundler-url>"),
@@ -27,8 +27,8 @@ export type RundlerClient<transport extends Transport = Transport, chain extends
  * });
  * ```
  */
-export declare function estimateFeesPerGas<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TAccount extends Account | undefined = Account | undefined>({ bundlerClient, account: _account, userOperation: _userOperation, }: {
-    bundlerClient: RundlerClient<TTransport, TChain, TAccount>;
+export declare function estimateFeesPerGas<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TAccount extends SmartAccount | Account | undefined = SmartAccount | Account | undefined>({ bundlerClient, account: _account, userOperation: _userOperation, }: {
+    bundlerClient: Client<TTransport, TChain, TAccount>;
     account?: SmartAccount;
     userOperation?: UserOperationRequest;
 }): Promise<{

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,EACV,KAAK,OAAO,EAEb,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EACV,oBAAoB,EACpB,YAAY,EACb,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,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,IACvD,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,EAC1D,EACA,aAAa,EACb,OAAO,EAAE,QAAQ,EACjB,aAAa,EAAE,cAAc,GAC9B,EAAE;IACD,aAAa,EAAE,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC3D,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,CAyBD"}
+{"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"}

package/dist/types/logger.d.ts

@@ -1,3 +1,3 @@
-import type { DiagnosticsLogger } from "@alchemy/common";
+import type { DiagnosticsLogger } from "@alchemy/common/internal";
 export declare const LOGGER: DiagnosticsLogger;
 //# sourceMappingURL=logger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGzD,eAAO,MAAM,MAAM,EAAE,iBAInB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,eAAO,MAAM,MAAM,EAAE,iBAInB,CAAC"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.0.0-alpha.8";
+export declare const VERSION = "5.0.0-beta.1";
 //# 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,kBAAkB,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,OAAO,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy/aa-infra",
-  "version": "0.0.0-alpha.9",
+  "version": "5.0.0-beta.2",
   "description": "Alchemy Account Abstraction Infrastructure",
   "author": "Alchemy",
   "license": "MIT",
@@ -34,17 +34,19 @@
     "build": "yarn clean && yarn build:esm && yarn 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",
-    "fern:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../docs/pages/reference/alchemy/aa-infra",
     "clean": "rm -rf ./dist",
     "test": "vitest",
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "typescript-template": "*"
+    "typescript-template": "*",
+    "viem": "^2.45.0"
   },
   "dependencies": {
-    "@alchemy/common": "^0.0.0-alpha.9",
-    "viem": "^2.32.0"
+    "@alchemy/common": "^5.0.0-beta.2"
+  },
+  "peerDependencies": {
+    "viem": "^2.45.0"
   },
   "publishConfig": {
     "access": "public",
@@ -58,5 +60,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "54eef9b1cadf5376a4c809375c7cf012bce3e392"
+  "gitHead": "9042002b7414ac2ae8a6251ee4cf96555b091eca"
 }

package/src/estimateFeesPerGas.ts

@@ -4,14 +4,15 @@ import {
   isHex,
   type Transport,
   type Chain,
-  type Account,
   hexToBigInt,
+  type Account,
 } from "viem";
 import type {
   UserOperationRequest,
   SmartAccount,
+  BundlerClient,
 } from "viem/account-abstraction";
-import { bigIntMultiply } from "@alchemy/common";
+import { BaseError, bigIntMultiply } from "@alchemy/common";
 import type { RundlerRpcSchema } from "./schema.js";
 import { InvalidHexValueError } from "./errors.js";
 
@@ -19,8 +20,14 @@ import { InvalidHexValueError } from "./errors.js";
 export type RundlerClient<
   transport extends Transport = Transport,
   chain extends Chain | undefined = Chain | undefined,
-  account extends Account | undefined = Account | undefined,
-> = Client<transport, chain, account, RundlerRpcSchema>;
+  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.
@@ -37,7 +44,7 @@ export type RundlerClient<
  * @example
  * ```ts
  * import { createBundlerClient } from "viem/account-abstraction";
- * import { alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
+ * import { estimateFeesPerGas as alchemyEstimateFeesPerGas } from "@alchemy/aa-infra";
  *
  * const bundler = createBundlerClient({
  *   transport: http("<rundler-url>"),
@@ -50,22 +57,34 @@ export type RundlerClient<
 export async function estimateFeesPerGas<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
-  TAccount extends Account | undefined = Account | undefined,
+  TAccount extends SmartAccount | Account | undefined =
+    | SmartAccount
+    | Account
+    | undefined,
 >({
   bundlerClient,
   account: _account,
   userOperation: _userOperation,
 }: {
-  bundlerClient: RundlerClient<TTransport, TChain, TAccount>;
+  bundlerClient: Client<TTransport, TChain, TAccount>;
   account?: SmartAccount;
   userOperation?: UserOperationRequest;
 }): Promise<{
   maxFeePerGas: bigint;
   maxPriorityFeePerGas: bigint;
 }> {
+  // Cast to RundlerClient to access rundler-specific RPC methods and BundlerClient properties.
+  // This mirrors viem's pattern in prepareUserOperation.ts where they cast `client as unknown as BundlerClient`
+  // 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 as unknown as RundlerClient;
+
   const [block, maxPriorityFeePerGasHex] = await Promise.all([
-    getBlock(bundlerClient, { blockTag: "latest" }), // This is technically hitting the node rpc, not rundler.
-    bundlerClient.request({
+    // 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: [],
     }),
@@ -73,18 +92,26 @@ export async function estimateFeesPerGas<
 
   const baseFeePerGas = block.baseFeePerGas;
   if (baseFeePerGas == null) {
-    throw new Error("baseFeePerGas is null");
+    throw new BaseError("baseFeePerGas is null");
   }
   if (maxPriorityFeePerGasHex == null) {
-    throw new Error("rundler_maxPriorityFeePerGas returned null or undefined");
+    throw new BaseError(
+      "rundler_maxPriorityFeePerGas returned null or undefined",
+    );
   }
   if (!isHex(maxPriorityFeePerGasHex)) {
     throw new InvalidHexValueError(maxPriorityFeePerGasHex);
   }
   const maxPriorityFeePerGas = hexToBigInt(maxPriorityFeePerGasHex);
 
-  return {
+  const bufferedMaxPriorityFeePerGas = bigIntMultiply(
     maxPriorityFeePerGas,
-    maxFeePerGas: bigIntMultiply(baseFeePerGas, 1.5) + maxPriorityFeePerGas,
+    1.5,
+  );
+
+  return {
+    maxPriorityFeePerGas: bufferedMaxPriorityFeePerGas,
+    maxFeePerGas:
+      bigIntMultiply(baseFeePerGas, 1.5) + bufferedMaxPriorityFeePerGas,
   };
 }

package/src/logger.ts

@@ -1,5 +1,5 @@
-import { createLogger } from "@alchemy/common";
-import type { DiagnosticsLogger } from "@alchemy/common";
+import { createLogger } from "@alchemy/common/internal";
+import type { DiagnosticsLogger } from "@alchemy/common/internal";
 import { VERSION } from "./version.js";
 
 export const LOGGER: DiagnosticsLogger = createLogger({

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