@aa-sdk/core 4.34.1 → 4.35.1

package/src/client/smartAccountClient.ts

@@ -18,7 +18,6 @@ import { ChainNotFoundError } from "../errors/client.js";
 import { middlewareActions } from "../middleware/actions.js";
 import type { ClientMiddleware } from "../middleware/types.js";
 import type { Prettify } from "../utils/index.js";
-import { ADD_BREADCRUMB } from "./addBreadcrumb.js";
 import { createBundlerClient, type BundlerClient } from "./bundlerClient.js";
 import {
   type BundlerActions,
@@ -30,6 +29,7 @@ import {
 } from "./decorators/smartAccountClient.js";
 import { SmartAccountClientOptsSchema } from "./schema.js";
 import type { ClientMiddlewareConfig } from "./types.js";
+import { ADD_BREADCRUMB } from "./addBreadcrumb.js";
 
 type SmartAccountClientOpts = z.output<typeof SmartAccountClientOptsSchema>;
 
@@ -41,7 +41,7 @@ export type SmartAccountClientConfig<
     | undefined,
   context extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 > = Prettify<
   Pick<
     ClientConfig<transport, chain, account>,
@@ -69,7 +69,7 @@ export type SmartAccountClientConfig<
 
 export type SmartAccountClientRpcSchema = [
   ...BundlerRpcSchema,
-  ...PublicRpcSchema
+  ...PublicRpcSchema,
 ];
 
 // [!region SmartAccountClientActions]
@@ -80,7 +80,7 @@ export type SmartAccountClientActions<
     | undefined,
   context extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 > = BaseSmartAccountClientActions<chain, account, context> &
   BundlerActions &
   PublicActions;
@@ -97,7 +97,7 @@ export type SmartAccountClient<
   rpcSchema extends RpcSchema = SmartAccountClientRpcSchema,
   context extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 > = Prettify<
   Client<
     transport,
@@ -117,7 +117,7 @@ export type BaseSmartAccountClient<
     | undefined,
   context extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 > = Prettify<
   Client<
     transport,
@@ -140,9 +140,9 @@ export function createSmartAccountClient<
     | undefined,
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 >(
-  config: SmartAccountClientConfig<TTransport, TChain, TAccount, TContext>
+  config: SmartAccountClientConfig<TTransport, TChain, TAccount, TContext>,
 ): SmartAccountClient<TTransport, TChain, TAccount>;
 
 /**
@@ -166,7 +166,7 @@ export function createSmartAccountClient<
  * @returns {SmartAccountClient} A smart account client capable of handling transactions, message signing, and other operations on a smart account
  */
 export function createSmartAccountClient(
-  config: SmartAccountClientConfig
+  config: SmartAccountClientConfig,
 ): SmartAccountClient {
   const {
     key = "account",
@@ -189,106 +189,100 @@ export function createSmartAccountClient(
     transport: (opts) => {
       const rpcTransport = transport(opts);
 
-      return custom(
-        {
-          name: "SmartAccountClientTransport",
-          async request({ method, params }) {
-            switch (method) {
-              case "eth_accounts": {
-                if (!client.account) {
-                  throw new AccountNotFoundError();
-                }
+      return custom({
+        name: "SmartAccountClientTransport",
+        async request({ method, params }) {
+          switch (method) {
+            case "eth_accounts": {
+              if (!client.account) {
+                throw new AccountNotFoundError();
+              }
 
-                return [client.account.address];
+              return [client.account.address];
+            }
+            case "eth_sendTransaction":
+              if (!client.account) {
+                throw new AccountNotFoundError();
               }
-              case "eth_sendTransaction":
-                if (!client.account) {
-                  throw new AccountNotFoundError();
-                }
-                if (!client.chain) {
-                  throw new ChainNotFoundError();
-                }
-                const [tx] = params as [FormattedTransactionRequest];
-                return client.sendTransaction({
-                  ...tx,
-                  account: client.account,
-                  chain: client.chain,
-                });
-              case "eth_sign":
-                if (!client.account) {
-                  throw new AccountNotFoundError();
-                }
-                const [address, data] = params!;
-                if (
-                  address?.toLowerCase() !==
-                  client.account.address.toLowerCase()
-                ) {
-                  throw new Error(
-                    "cannot sign for address that is not the current account"
-                  );
-                }
-                return client.signMessage({
-                  message: data,
-                  account: client.account,
-                });
-              case "personal_sign": {
-                if (!client.account) {
-                  throw new AccountNotFoundError();
-                }
-                const [data, address] = params!;
-                if (
-                  address?.toLowerCase() !==
-                  client.account.address.toLowerCase()
-                ) {
-                  throw new Error(
-                    "cannot sign for address that is not the current account"
-                  );
-                }
-                return client.signMessage({
-                  message: data,
+              if (!client.chain) {
+                throw new ChainNotFoundError();
+              }
+              const [tx] = params as [FormattedTransactionRequest];
+              return client.sendTransaction({
+                ...tx,
+                account: client.account,
+                chain: client.chain,
+              });
+            case "eth_sign":
+              if (!client.account) {
+                throw new AccountNotFoundError();
+              }
+              const [address, data] = params!;
+              if (
+                address?.toLowerCase() !== client.account.address.toLowerCase()
+              ) {
+                throw new Error(
+                  "cannot sign for address that is not the current account",
+                );
+              }
+              return client.signMessage({
+                message: data,
+                account: client.account,
+              });
+            case "personal_sign": {
+              if (!client.account) {
+                throw new AccountNotFoundError();
+              }
+              const [data, address] = params!;
+              if (
+                address?.toLowerCase() !== client.account.address.toLowerCase()
+              ) {
+                throw new Error(
+                  "cannot sign for address that is not the current account",
+                );
+              }
+              return client.signMessage({
+                message: data,
+                account: client.account,
+              });
+            }
+            case "eth_signTypedData_v4": {
+              if (!client.account) {
+                throw new AccountNotFoundError();
+              }
+              const [address, dataParams] = params!;
+              if (
+                address?.toLowerCase() !== client.account.address.toLowerCase()
+              ) {
+                throw new Error(
+                  "cannot sign for address that is not the current account",
+                );
+              }
+              try {
+                return client.signTypedData({
                   account: client.account,
+                  typedData:
+                    typeof dataParams === "string"
+                      ? JSON.parse(dataParams)
+                      : dataParams,
                 });
+              } catch {
+                throw new Error("invalid JSON data params");
               }
-              case "eth_signTypedData_v4": {
-                if (!client.account) {
-                  throw new AccountNotFoundError();
-                }
-                const [address, dataParams] = params!;
-                if (
-                  address?.toLowerCase() !==
-                  client.account.address.toLowerCase()
-                ) {
-                  throw new Error(
-                    "cannot sign for address that is not the current account"
-                  );
-                }
-                try {
-                  return client.signTypedData({
-                    account: client.account,
-                    typedData:
-                      typeof dataParams === "string"
-                        ? JSON.parse(dataParams)
-                        : dataParams,
-                  });
-                } catch {
-                  throw new Error("invalid JSON data params");
-                }
+            }
+            case "eth_chainId":
+              if (!opts.chain) {
+                throw new ChainNotFoundError();
               }
-              case "eth_chainId":
-                if (!opts.chain) {
-                  throw new ChainNotFoundError();
-                }
 
-                return opts.chain.id;
-              default:
-                // TODO: there's probably a number of methods we just don't support, will need to test most of them out
-                // first let's get something working though
-                return rpcTransport.request({ method, params });
-            }
-          },
+              return opts.chain.id;
+            default:
+              // TODO: there's probably a number of methods we just don't support, will need to test most of them out
+              // first let's get something working though
+              return rpcTransport.request({ method, params });
+          }
         },
-        { retryCount: 0 }
-      )(opts);
+      })(opts);
     },
   })
     .extend(() => {
@@ -323,12 +317,12 @@ export function createSmartAccountClientFromExisting<
   TRpcSchema extends SmartAccountClientRpcSchema = SmartAccountClientRpcSchema,
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 >(
   config: Omit<
     SmartAccountClientConfig<Transport, TChain, TAccount, TContext>,
     "transport" | "chain"
-  > & { client: TClient }
+  > & { client: TClient },
 ): SmartAccountClient<
   CustomTransport,
   TChain,
@@ -362,7 +356,7 @@ export function createSmartAccountClientFromExisting<
 export function createSmartAccountClientFromExisting(
   config: Omit<SmartAccountClientConfig, "transport" | "chain"> & {
     client: BundlerClient;
-  }
+  },
 ): SmartAccountClient {
   return createSmartAccountClient({
     ...config,

package/src/client/types.ts

@@ -15,7 +15,7 @@ export type ConnectionConfig = z.input<typeof ConnectionConfigSchema>;
 
 // [!region SendUserOperationResult]
 export type SendUserOperationResult<
-  TEntryPointVersion extends EntryPointVersion = EntryPointVersion
+  TEntryPointVersion extends EntryPointVersion = EntryPointVersion,
 > = {
   hash: Hash;
   request: UserOperationRequest<TEntryPointVersion>;
@@ -33,6 +33,6 @@ export type UpgradeToData = {
 export type ClientMiddlewareConfig<
   TContext extends UserOperationContext | undefined =
     | UserOperationContext
-    | undefined
+    | undefined,
 > = Partial<ClientMiddleware<TContext>>;
 // [!endregion ClientMiddlewareConfig]

package/src/ens/utils.ts

@@ -2,7 +2,7 @@ import * as chains from "viem/chains";
 import { mainnet, type Chain } from "viem/chains";
 
 export const ChainsById: Map<number, chains.Chain> = new Map(
-  Object.values(chains).map((x) => [x.id, x])
+  Object.values(chains).map((x) => [x.id, x]),
 );
 
 /**

package/src/entrypoint/0.6.ts

@@ -40,7 +40,7 @@ const packUserOperation = (request: UserOperationRequest<"0.6.0">): Hex => {
       hexToBigInt(request.maxFeePerGas),
       hexToBigInt(request.maxPriorityFeePerGas),
       hashedPaymasterAndData,
-    ]
+    ],
   );
 };
 
@@ -56,7 +56,7 @@ export default {
   getUserOperationHash: (
     request: UserOperationRequest<"0.6.0">,
     entryPointAddress: Address,
-    chainId: number
+    chainId: number,
   ): Hash => {
     const encoded = encodeAbiParameters(
       [{ type: "bytes32" }, { type: "address" }, { type: "uint256" }],
@@ -64,7 +64,7 @@ export default {
         keccak256(packUserOperation(request)),
         entryPointAddress,
         BigInt(chainId),
-      ]
+      ],
     );
 
     return keccak256(encoded);

package/src/entrypoint/0.7.ts

@@ -62,7 +62,7 @@ const packUserOperation = (request: UserOperationRequest<"0.7.0">): Hex => {
       hexToBigInt(request.preVerificationGas),
       gasFees,
       keccak256(paymasterAndData),
-    ]
+    ],
   );
 };
 
@@ -78,7 +78,7 @@ export default {
   getUserOperationHash: (
     request: UserOperationRequest<"0.7.0">,
     entryPointAddress: Address,
-    chainId: number
+    chainId: number,
   ): Hash => {
     const encoded = encodeAbiParameters(
       [{ type: "bytes32" }, { type: "address" }, { type: "uint256" }],
@@ -86,7 +86,7 @@ export default {
         keccak256(packUserOperation(request)),
         entryPointAddress,
         BigInt(chainId),
-      ]
+      ],
     );
 
     return keccak256(encoded);
@@ -98,7 +98,7 @@ export default {
 export function packAccountGasLimits(
   data:
     | Pick<UserOperationRequest_v7, "verificationGasLimit" | "callGasLimit">
-    | Pick<UserOperationRequest_v7, "maxPriorityFeePerGas" | "maxFeePerGas">
+    | Pick<UserOperationRequest_v7, "maxPriorityFeePerGas" | "maxFeePerGas">,
 ): Hex {
   return concat(Object.values(data).map((v) => pad(v, { size: 16 })));
 }

package/src/entrypoint/index.ts

@@ -32,30 +32,31 @@ export const entryPointRegistry: EntryPointRegistry = {
  * @returns {boolean} true if the value is a valid key of EntryPointRegistry, false otherwise
  */
 export const isEntryPointVersion = (
-  value: any
+  value: any,
 ): value is keyof EntryPointRegistry => {
   return Object.keys(entryPointRegistry).includes(value);
 };
 
 export function getEntryPoint<
   TEntryPointVersion extends EntryPointVersion = DefaultEntryPointVersion,
-  TChain extends Chain = Chain
+  TChain extends Chain = Chain,
 >(
   chain: TChain,
-  options: GetEntryPointOptions<TEntryPointVersion>
+  options: GetEntryPointOptions<TEntryPointVersion>,
 ): EntryPointDefRegistry<TChain>[TEntryPointVersion];
 
 export function getEntryPoint<
-  TEntryPointVersion extends DefaultEntryPointVersion = DefaultEntryPointVersion,
-  TChain extends Chain = Chain
+  TEntryPointVersion extends
+    DefaultEntryPointVersion = DefaultEntryPointVersion,
+  TChain extends Chain = Chain,
 >(
   chain: TChain,
-  options?: GetEntryPointOptions<TEntryPointVersion>
+  options?: GetEntryPointOptions<TEntryPointVersion>,
 ): EntryPointDefRegistry<TChain>[TEntryPointVersion];
 
 export function getEntryPoint<TChain extends Chain = Chain>(
   chain: TChain,
-  options?: GetEntryPointOptions<DefaultEntryPointVersion>
+  options?: GetEntryPointOptions<DefaultEntryPointVersion>,
 ): EntryPointDefRegistry<TChain>[DefaultEntryPointVersion];
 
 /**
@@ -76,10 +77,10 @@ export function getEntryPoint<TChain extends Chain = Chain>(
  */
 export function getEntryPoint<
   TEntryPointVersion extends EntryPointVersion,
-  TChain extends Chain = Chain
+  TChain extends Chain = Chain,
 >(
   chain: TChain,
-  options: GetEntryPointOptions<TEntryPointVersion>
+  options: GetEntryPointOptions<TEntryPointVersion>,
 ): EntryPointDefRegistry<TChain>[EntryPointVersion] {
   const { version = defaultEntryPointVersion, addressOverride } = options ?? {
     version: defaultEntryPointVersion,

package/src/entrypoint/types.ts

@@ -23,7 +23,7 @@ export type DefaultEntryPointVersion = OneOf<"0.6.0", EntryPointVersion>;
 export type SupportedEntryPoint<
   TEntryPointVersion extends EntryPointVersion = EntryPointVersion,
   TChain extends Chain = Chain,
-  TAbi extends Abi | readonly unknown[] = Abi
+  TAbi extends Abi | readonly unknown[] = Abi,
 > = {
   version: TEntryPointVersion;
   address: Record<TChain["id"] | "default", Address>;
@@ -40,7 +40,7 @@ export type SupportedEntryPoint<
   getUserOperationHash: (
     request: UserOperationRequest<TEntryPointVersion>,
     entryPointAddress: Address,
-    chainId: number
+    chainId: number,
   ) => Hash;
 
   /**
@@ -53,7 +53,7 @@ export type SupportedEntryPoint<
    * @returns the hash of the UserOperation
    */
   packUserOperation: (
-    userOperation: UserOperationRequest<TEntryPointVersion>
+    userOperation: UserOperationRequest<TEntryPointVersion>,
   ) => Hex;
 };
 
@@ -69,17 +69,17 @@ export interface EntryPointRegistry<TChain extends Chain = Chain>
 export type EntryPointDef<
   TEntryPointVersion extends EntryPointVersion = EntryPointVersion,
   TChain extends Chain = Chain,
-  TAbi extends Abi | readonly unknown[] = Abi
+  TAbi extends Abi | readonly unknown[] = Abi,
 > = {
   version: TEntryPointVersion;
   address: Address;
   chain: TChain;
   abi: GetContractParameters<Transport, TChain, Account, TAbi>["abi"];
   getUserOperationHash: (
-    request: UserOperationRequest<TEntryPointVersion>
+    request: UserOperationRequest<TEntryPointVersion>,
   ) => Hex;
   packUserOperation: (
-    userOperation: UserOperationRequest<TEntryPointVersion>
+    userOperation: UserOperationRequest<TEntryPointVersion>,
   ) => Hex;
 };
 // [!endregion EntryPointDef]
@@ -93,28 +93,30 @@ export interface EntryPointDefRegistry<TChain extends Chain = Chain>
 }
 
 export type GetEntryPointOptions<
-  TEntryPointVersion extends EntryPointVersion = DefaultEntryPointVersion
-> = EQ<TEntryPointVersion, DefaultEntryPointVersion> extends true
-  ?
-      | {
-          addressOverride?: Address;
-          version?: OneOf<TEntryPointVersion, EntryPointVersion>;
-        }
-      | undefined
-  : {
-      addressOverride?: Address;
-      version: OneOf<TEntryPointVersion, EntryPointVersion>;
-    };
+  TEntryPointVersion extends EntryPointVersion = DefaultEntryPointVersion,
+> =
+  EQ<TEntryPointVersion, DefaultEntryPointVersion> extends true
+    ?
+        | {
+            addressOverride?: Address;
+            version?: OneOf<TEntryPointVersion, EntryPointVersion>;
+          }
+        | undefined
+    : {
+        addressOverride?: Address;
+        version: OneOf<TEntryPointVersion, EntryPointVersion>;
+      };
 
 export type EntryPointParameter<
   TEntryPointVersion extends EntryPointVersion,
-  TChain extends Chain = Chain
-> = EQ<TEntryPointVersion, DefaultEntryPointVersion> extends true
-  ? {
-      entryPoint?: EntryPointDef<TEntryPointVersion, TChain>;
-    }
-  : {
-      entryPoint: IsOneOf<TEntryPointVersion, EntryPointVersion> extends true
-        ? EntryPointDef<TEntryPointVersion, TChain>
-        : never;
-    };
+  TChain extends Chain = Chain,
+> =
+  EQ<TEntryPointVersion, DefaultEntryPointVersion> extends true
+    ? {
+        entryPoint?: EntryPointDef<TEntryPointVersion, TChain>;
+      }
+    : {
+        entryPoint: IsOneOf<TEntryPointVersion, EntryPointVersion> extends true
+          ? EntryPointDef<TEntryPointVersion, TChain>
+          : never;
+      };

package/src/errors/account.ts

@@ -36,7 +36,7 @@ export class DefaultFactoryNotDefinedError extends BaseError {
       [
         `No default factory for ${accountType} found on chain ${chain.name} for entrypoint version ${version}`,
         "Supply an override via the `factoryAddress` parameter when creating an account",
-      ].join("\n")
+      ].join("\n"),
     );
   }
 }

package/src/errors/client.ts

@@ -19,7 +19,7 @@ export class IncompatibleClientError extends BaseError {
       [
         `Client of type (${client.type}) is not a ${expectedClient}.`,
         `Create one with \`createSmartAccountClient\` first before using \`${method}\``,
-      ].join("\n")
+      ].join("\n"),
     );
   }
 }
@@ -67,7 +67,7 @@ export class InvalidEntityIdError extends BaseError {
    */
   constructor(entityId: number) {
     super(
-      `Entity ID used is ${entityId}, but must be less than or equal to uint32.max`
+      `Entity ID used is ${entityId}, but must be less than or equal to uint32.max`,
     );
   }
 }
@@ -85,7 +85,7 @@ export class InvalidNonceKeyError extends BaseError {
    */
   constructor(nonceKey: bigint) {
     super(
-      `Nonce key is ${nonceKey} but has to be less than or equal to 2**152`
+      `Nonce key is ${nonceKey} but has to be less than or equal to 2**152`,
     );
   }
 }

package/src/errors/entrypoint.ts

@@ -18,7 +18,7 @@ export class EntryPointNotFoundError extends BaseError {
       [
         `No default entry point v${entryPointVersion} exists for ${chain.name}.`,
         `Supply an override.`,
-      ].join("\n")
+      ].join("\n"),
     );
   }
 }
@@ -37,7 +37,7 @@ export class InvalidEntryPointError extends BaseError {
    */
   constructor(chain: Chain, entryPointVersion: any) {
     super(
-      `Invalid entry point: unexpected version ${entryPointVersion} for ${chain.name}.`
+      `Invalid entry point: unexpected version ${entryPointVersion} for ${chain.name}.`,
     );
   }
 }

package/src/errors/signer.ts

@@ -16,7 +16,7 @@ export class InvalidSignerTypeError extends BaseError {
       [
         "Invalid signer type parameter passed to SmartAccountSigner.",
         signerType ?? "A signerType must be provided.",
-      ].join("\n")
+      ].join("\n"),
     );
   }
 }

package/src/errors/useroperation.ts

@@ -30,8 +30,8 @@ export class InvalidUserOperationError extends BaseError {
                 value: value.toString(),
               }
             : value,
-        2
-      )}`
+        2,
+      )}`,
     );
   }
 }
@@ -47,7 +47,10 @@ export class WaitForUserOperationError extends BaseError {
    * @param {UserOperationRequest} request the user operation request that failed
    * @param {Error} error the underlying error that caused the failure
    */
-  constructor(public request: UserOperationRequest, error: Error) {
+  constructor(
+    public request: UserOperationRequest,
+    error: Error,
+  ) {
     super(`Failed to find User Operation: ${error.message}`);
   }
 }

package/src/middleware/actions.ts

@@ -30,7 +30,7 @@ export type MiddlewareClient<
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends SmartContractAccount | undefined =
     | SmartContractAccount
-    | undefined
+    | undefined,
 > = Client<
   TTransport,
   TChain,
@@ -53,9 +53,9 @@ export const middlewareActions =
     TChain extends Chain | undefined = Chain | undefined,
     TAccount extends SmartContractAccount | undefined =
       | SmartContractAccount
-      | undefined
+      | undefined,
   >(
-    client: MiddlewareClient<TTransport, TChain, TAccount>
+    client: MiddlewareClient<TTransport, TChain, TAccount>,
   ): { middleware: ClientMiddleware } => ({
     middleware: {
       customMiddleware: overrides.customMiddleware ?? noopMiddleware,