@account-kit/infra 4.20.1 → 4.22.0

package/src/chains.ts

@@ -21,6 +21,8 @@ import {
   arbitrumNova as vabn,
   zora as vzora,
   zoraSepolia as vzoras,
+  sonic as vsonic,
+  sonicTestnet as vsonict,
 } from "viem/chains";
 
 export type AlchemyChainConfig = {
@@ -238,6 +240,20 @@ export const zoraSepolia: Chain = {
   },
 };
 
+export const sonic: Chain = {
+  ...vsonic,
+  rpcUrls: {
+    ...vsonic.rpcUrls,
+  },
+};
+
+export const sonicTestnet: Chain = {
+  ...vsonict,
+  rpcUrls: {
+    ...vsonict.rpcUrls,
+  },
+};
+
 export const worldChainSepolia: Chain = defineChain({
   id: 4801,
   name: "World Chain Sepolia",
@@ -562,3 +578,27 @@ export const gensynTestnet: Chain = defineChain({
   },
   testnet: true,
 });
+
+export const riseTestnet: Chain = defineChain({
+  id: 11155931,
+  name: "Rise Testnet",
+  nativeCurrency: { name: "eth", symbol: "eth", decimals: 18 },
+  rpcUrls: {
+    default: {
+      http: ["https://rise-testnet.g.alchemy.com/v2"],
+    },
+    public: {
+      http: ["https://rise-testnet.g.alchemy.com/v2"],
+    },
+    alchemy: {
+      http: ["https://rise-testnet.g.alchemy.com/v2"],
+    },
+  },
+  blockExplorers: {
+    default: {
+      name: "Block Explorer",
+      url: "https://testnet-explorer.riselabs.xyz",
+    },
+  },
+  testnet: true,
+});

package/src/client/decorators/smartAccount.ts

@@ -10,6 +10,7 @@ import {
   type SmartContractAccount,
   type UserOperationContext,
   type UserOperationOverrides,
+  clientHeaderTrack,
 } from "@aa-sdk/core";
 import type {
   Chain,
@@ -64,7 +65,7 @@ export type AlchemySmartAccountClientActions<
  * const clientWithAlchemyActions = client.extend(alchemyActions);
  * ```
  *
- * @param {Client<TTransport, TChain, TAccount>} client The client instance used to perform actions
+ * @param {Client<TTransport, TChain, TAccount>} client_ The client instance used to perform actions
  * @returns {AlchemySmartAccountClientActions<TAccount, TContext>} An object containing Alchemy Smart Account client actions
  */
 export const alchemyActions: <
@@ -79,11 +80,14 @@ export const alchemyActions: <
 >(
   client: Client<TTransport, TChain, TAccount>
 ) => AlchemySmartAccountClientActions<TAccount, TContext, TChain> = (
-  client
+  client_
 ) => ({
-  simulateUserOperation: async (args) =>
-    simulateUserOperationChanges(client, args),
-  sendUserOperation: async (args) => {
+  simulateUserOperation: async (args) => {
+    const client = clientHeaderTrack(client_, "simulateUserOperation");
+    return simulateUserOperationChanges(client, args);
+  },
+  async sendUserOperation(args) {
+    const client = clientHeaderTrack(client_, "infraSendUserOperation");
     const { account = client.account } = args;
 
     const result = sendUserOperation(client, args);
@@ -91,6 +95,7 @@ export const alchemyActions: <
     return result;
   },
   sendTransaction: async (args, overrides, context) => {
+    const client = clientHeaderTrack(client_, "sendTransaction");
     const { account = client.account } = args;
 
     const result = await sendTransaction(client, args, overrides, context);
@@ -98,6 +103,7 @@ export const alchemyActions: <
     return result;
   },
   async sendTransactions(args) {
+    const client = clientHeaderTrack(client_, "sendTransactions");
     const { account = client.account } = args;
 
     const result = sendTransactions(client, args);

package/src/client/smartAccountClient.ts

@@ -1,5 +1,6 @@
 import {
   ChainNotFoundError,
+  clientHeaderTrack,
   createSmartAccountClient,
   isSmartAccountWithSigner,
   type Prettify,
@@ -12,7 +13,11 @@ import {
   type UserOperationContext,
 } from "@aa-sdk/core";
 import { type Chain } from "viem";
-import type { AlchemyTransport } from "../alchemyTransport.js";
+import {
+  alchemy,
+  convertHeadersToObject,
+  type AlchemyTransport,
+} from "../alchemyTransport.js";
 import { getDefaultUserOperationFeeOptions } from "../defaults.js";
 import { alchemyFeeEstimator } from "../middleware/feeEstimator.js";
 import { alchemyGasAndPaymasterAndDataMiddleware } from "../middleware/gasManager.js";
@@ -22,6 +27,7 @@ import {
   type AlchemySmartAccountClientActions,
 } from "./decorators/smartAccount.js";
 import type { AlchemyRpcSchema } from "./types.js";
+import { headersUpdate } from "../alchemyTrackerHeaders.js";
 
 export function getSignerTypeHeader<
   TAccount extends SmartContractAccountWithSigner
@@ -125,58 +131,71 @@ export function createAlchemySmartAccountClient<
  * @param {AlchemySmartAccountClientConfig} config The configuration for creating the Alchemy smart account client
  * @returns {AlchemySmartAccountClient} An instance of `AlchemySmartAccountClient` configured based on the provided options
  */
-export function createAlchemySmartAccountClient({
-  account,
-  policyId,
-  useSimulation,
-  feeEstimator,
-  customMiddleware,
-  gasEstimator,
-  signUserOperation,
-  transport,
-  chain,
-  opts,
-}: AlchemySmartAccountClientConfig): AlchemySmartAccountClient {
-  if (!chain) {
+export function createAlchemySmartAccountClient(
+  config: AlchemySmartAccountClientConfig
+): AlchemySmartAccountClient {
+  if (!config.chain) {
     throw new ChainNotFoundError();
   }
 
   const feeOptions =
-    opts?.feeOptions ?? getDefaultUserOperationFeeOptions(chain);
+    config.opts?.feeOptions ?? getDefaultUserOperationFeeOptions(config.chain);
 
   const scaClient = createSmartAccountClient({
-    account,
-    transport,
-    chain,
+    account: config.account,
+    transport: config.transport,
+    chain: config.chain,
     type: "AlchemySmartAccountClient",
     opts: {
-      ...opts,
+      ...config.opts,
       feeOptions,
     },
-    feeEstimator: feeEstimator ?? alchemyFeeEstimator(transport),
-    gasEstimator,
+    feeEstimator: config.feeEstimator ?? alchemyFeeEstimator(config.transport),
+    gasEstimator: config.gasEstimator,
     customMiddleware: async (struct, args) => {
       if (isSmartAccountWithSigner(args.account)) {
-        transport.updateHeaders(getSignerTypeHeader(args.account));
+        config.transport.updateHeaders(getSignerTypeHeader(args.account));
       }
-      return customMiddleware ? customMiddleware(struct, args) : struct;
+      return config.customMiddleware
+        ? config.customMiddleware(struct, args)
+        : struct;
     },
-    ...(policyId
+    ...(config.policyId
       ? alchemyGasAndPaymasterAndDataMiddleware({
-          policyId,
-          transport,
-          gasEstimatorOverride: gasEstimator,
-          feeEstimatorOverride: feeEstimator,
+          policyId: config.policyId,
+          transport: config.transport,
+          gasEstimatorOverride: config.gasEstimator,
+          feeEstimatorOverride: config.feeEstimator,
         })
       : {}),
-    userOperationSimulator: useSimulation
-      ? alchemyUserOperationSimulator(transport)
+    userOperationSimulator: config.useSimulation
+      ? alchemyUserOperationSimulator(config.transport)
       : undefined,
-    signUserOperation,
-  }).extend(alchemyActions);
+    signUserOperation: config.signUserOperation,
+    addBreadCrumb(breadcrumb: string) {
+      const oldConfig = config.transport.config;
+      const dynamicFetchOptions = config.transport.dynamicFetchOptions;
+      const newTransport = alchemy({ ...oldConfig });
+      newTransport.updateHeaders(
+        headersUpdate(breadcrumb)(
+          convertHeadersToObject(dynamicFetchOptions?.headers)
+        )
+      );
+      return createAlchemySmartAccountClient({
+        ...config,
+        transport: newTransport,
+      }) as any;
+    },
+  })
+    .extend(alchemyActions)
+    .extend((client_) => ({
+      addBreadcrumb(breadcrumb: string) {
+        return clientHeaderTrack(client_, breadcrumb);
+      },
+    }));
 
-  if (account && isSmartAccountWithSigner(account)) {
-    transport.updateHeaders(getSignerTypeHeader(account));
+  if (config.account && isSmartAccountWithSigner(config.account)) {
+    config.transport.updateHeaders(getSignerTypeHeader(config.account));
   }
 
   return scaClient;

package/src/index.ts

@@ -43,6 +43,9 @@ export {
   monadTestnet,
   openlootSepolia,
   gensynTestnet,
+  riseTestnet,
+  sonic,
+  sonicTestnet,
 } from "./chains.js";
 export type * from "./client/decorators/alchemyEnhancedApis.js";
 export { alchemyEnhancedApiActions } from "./client/decorators/alchemyEnhancedApis.js";
@@ -58,6 +61,7 @@ export { getDefaultUserOperationFeeOptions } from "./defaults.js";
 export { getAlchemyPaymasterAddress } from "./gas-manager.js";
 export { alchemyFeeEstimator } from "./middleware/feeEstimator.js";
 export type * from "./middleware/gasManager.js";
+export * from "./alchemyTrackerHeaders.js";
 export {
   alchemyGasManagerMiddleware,
   alchemyGasAndPaymasterAndDataMiddleware,

package/src/middleware/feeEstimator.ts

@@ -1,5 +1,9 @@
 import type { ClientMiddlewareFn } from "@aa-sdk/core";
-import { applyUserOpOverrideOrFeeOption, bigIntMultiply } from "@aa-sdk/core";
+import {
+  applyUserOpOverrideOrFeeOption,
+  bigIntMultiply,
+  clientHeaderTrack,
+} from "@aa-sdk/core";
 import type { AlchemyTransport } from "../alchemyTransport";
 
 /**
@@ -29,7 +33,8 @@ export const alchemyFeeEstimator: (
   transport: AlchemyTransport
 ) => ClientMiddlewareFn =
   (transport) =>
-  async (struct, { overrides, feeOptions, client }) => {
+  async (struct, { overrides, feeOptions, client: client_ }) => {
+    const client = clientHeaderTrack(client_, "alchemyFeeEstimator");
     const transport_ = transport({ chain: client.chain });
     let [block, maxPriorityFeePerGasEstimate] = await Promise.all([
       client.getBlock({ blockTag: "latest" }),

package/src/middleware/gasManager.ts

@@ -10,6 +10,7 @@ import type {
 import {
   bypassPaymasterAndData,
   ChainNotFoundError,
+  clientHeaderTrack,
   deepHexlify,
   defaultGasEstimator,
   erc7677Middleware,
@@ -129,8 +130,9 @@ export function alchemyGasAndPaymasterAndDataMiddleware(
     },
     paymasterAndData: async (
       uo,
-      { account, client, feeOptions, overrides: overrides_ }
+      { account, client: client_, feeOptions, overrides: overrides_ }
     ) => {
+      const client = clientHeaderTrack(client_, "alchemyFeeEstimator");
       if (!client.chain) {
         throw new ChainNotFoundError();
       }

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