@aa-sdk/core 4.0.0-alpha.1 → 4.0.0-alpha.11

package/dist/types/account/types.d.ts

@@ -1,144 +0,0 @@
-import type { Address } from "abitype";
-import type { Hash, Hex, HttpTransport, Transport } from "viem";
-import type { SignTypedDataParameters } from "viem/accounts";
-import type { z } from "zod";
-import type { BundlerClient } from "../client/bundlerClient";
-import type { SmartAccountSigner } from "../signer/types";
-import type { BatchUserOperationCallData } from "../types";
-import type { SimpleSmartAccountParamsSchema, createBaseSmartAccountParamsSchema } from "./schema";
-/** @deprecated */
-export type SignTypedDataParams = Omit<SignTypedDataParameters, "privateKey">;
-/**
- * @deprecated don't use base smart account anymore, migrate to using toSmartContractAccount instead
- */
-export type BaseSmartAccountParams<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner> = z.input<ReturnType<typeof createBaseSmartAccountParamsSchema<TTransport, TSigner>>>;
-export type SimpleSmartAccountParams<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner> = z.input<ReturnType<typeof SimpleSmartAccountParamsSchema<TTransport, TSigner>>>;
-/**
- * @deprecated use `toSmartContractAccount` instead for creating instances of smart accounts
- */
-export interface ISmartContractAccount<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner> {
-    /**
-     * The RPC provider the account uses to make RPC calls
-     */
-    readonly rpcProvider: BundlerClient<TTransport> | BundlerClient<HttpTransport>;
-    /**
-     * @returns the init code for the account
-     */
-    getInitCode(): Promise<Hex>;
-    /**
-     * This is useful for estimating gas costs. It should return a signature that doesn't cause the account to revert
-     * when validation is run during estimation.
-     *
-     * @returns a dummy signature that doesn't cause the account to revert during estimation
-     */
-    getDummySignature(): Hex | Promise<Hex>;
-    /**
-     * Encodes a call to the account's execute function.
-     *
-     * @param target - the address receiving the call data
-     * @param value - optionally the amount of native token to send
-     * @param data - the call data or "0x" if empty
-     */
-    encodeExecute(target: string, value: bigint, data: string): Promise<Hex>;
-    /**
-     * Encodes a batch of transactions to the account's batch execute function.
-     * NOTE: not all accounts support batching.
-     *
-     * @param txs - An Array of objects containing the target, value, and data for each transaction
-     * @returns the encoded callData for a UserOperation
-     */
-    encodeBatchExecute(txs: BatchUserOperationCallData): Promise<Hex>;
-    /**
-     * @returns the nonce of the account
-     */
-    getNonce(): Promise<bigint>;
-    /**
-     * If your account handles 1271 signatures of personal_sign differently
-     * than it does UserOperations, you can implement two different approaches to signing
-     *
-     * @param uoHash -- The hash of the UserOperation to sign
-     * @returns the signature of the UserOperation
-     */
-    signUserOperationHash(uoHash: Hash): Promise<Hash>;
-    /**
-     * Returns a signed and prefixed message.
-     *
-     * @param msg - the message to sign
-     * @returns the signature of the message
-     */
-    signMessage(msg: string | Uint8Array | Hex): Promise<Hex>;
-    /**
-     * Signs a typed data object as per ERC-712
-     *
-     * @param params - {@link SignTypedDataParams}
-     * @returns the signed hash for the message passed
-     */
-    signTypedData(params: SignTypedDataParams): Promise<Hash>;
-    /**
-     * If the account is not deployed, it will sign the message and then wrap it in 6492 format
-     *
-     * @param msg - the message to sign
-     * @returns ths signature wrapped in 6492 format
-     */
-    signMessageWith6492(msg: string | Uint8Array | Hex): Promise<Hex>;
-    /**
-     * If the account is not deployed, it will sign the typed data blob and then wrap it in 6492 format
-     *
-     * @param params - {@link SignTypedDataParams}
-     * @returns the signed hash for the params passed in wrapped in 6492 format
-     */
-    signTypedDataWith6492(params: SignTypedDataParams): Promise<Hash>;
-    /**
-     * @returns the address of the account
-     */
-    getAddress(): Promise<Address>;
-    /**
-     * @returns the current account signer instance that the smart account client
-     * operations are being signed with.
-     *
-     * The signer is expected to be the owner or one of the owners of the account
-     * for the signatures to be valid for the acting account.
-     */
-    getSigner(): TSigner;
-    /**
-     * The factory address of the smart account created by the factory
-     *
-     * @returns the address of the factory contract for the smart account
-     */
-    getFactoryAddress(): Address;
-    /**
-     * The entrypoint address is the address ERC 4337 entrypoint singleton contract
-     * that this smart account and the connected bundler client use
-     *
-     * @returns the address of the entry point contract for the smart account
-     */
-    getEntryPointAddress(): Address;
-    /**
-     * Allows you to add additional functionality and utility methods to this account
-     * via a decorator pattern.
-     *
-     * NOTE: this method does not allow you to override existing methods on the account.
-     *
-     * @example
-     * ```ts
-     * const account = new BaseSmartCobntractAccount(...).extend((account) => ({
-     *  readAccountState: async (...args) => {
-     *    return this.rpcProvider.readContract({
-     *        address: await this.getAddress(),
-     *        abi: ThisContractsAbi
-     *        args: args
-     *    });
-     *  }
-     * }));
-     *
-     * account.debugSendUserOperation(...);
-     * ```
-     *
-     * @param extendFn -- this function gives you access to the created account instance and returns an object
-     * with the extension methods
-     * @returns -- the account with the extension methods added
-     */
-    extend: <R>(extendFn: (self: this) => R) => this & R;
-    encodeUpgradeToAndCall: (upgradeToImplAddress: Address, upgradeToInitData: Hex) => Promise<Hex>;
-}
-//# sourceMappingURL=types.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/account/types.ts"],"names":[],"mappings":"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"}

package/dist/types/chains/index.d.ts

@@ -1,21 +0,0 @@
-import { type Chain } from "viem";
-export declare const arbitrum: Chain;
-export declare const arbitrumGoerli: Chain;
-export declare const arbitrumSepolia: Chain;
-export declare const goerli: Chain;
-export declare const mainnet: Chain;
-export declare const optimism: Chain;
-export declare const optimismGoerli: Chain;
-export declare const optimismSepolia: Chain;
-export declare const sepolia: Chain;
-export declare const base: Chain;
-export declare const baseGoerli: Chain;
-export declare const baseSepolia: Chain;
-export declare const polygonMumbai: Chain;
-export declare const polygonAmoy: Chain;
-export declare const polygon: Chain;
-export declare const fraxtal: Chain;
-export declare const fraxtalSepolia: Chain;
-export declare const zora: Chain;
-export declare const zoraSepolia: Chain;
-//# sourceMappingURL=index.d.ts.map

package/dist/types/chains/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/chains/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,MAAM,CAAC;AAsB/C,eAAO,MAAM,QAAQ,EAAE,KAQtB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,KAQ5B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,KAQ7B,CAAC;AACF,eAAO,MAAM,MAAM,EAAE,KAQpB,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,KAQrB,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,KAQtB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,KAQ5B,CAAC;AACF,eAAO,MAAM,eAAe,EAAE,KAQ7B,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,KAQrB,CAAC;AACF,eAAO,MAAM,IAAI,EAAE,KAQlB,CAAC;AACF,eAAO,MAAM,UAAU,EAAE,KAQxB,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,KAQzB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,KAQ3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAQzB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,KAQrB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,KAKrB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,KAS3B,CAAC;AAEH,eAAO,MAAM,IAAI,EAAE,KAKlB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAKzB,CAAC"}

package/src/account/base.ts

@@ -1,415 +0,0 @@
-import type { Address } from "abitype";
-import {
-  getContract,
-  http,
-  trim,
-  type GetContractReturnType,
-  type Hash,
-  type Hex,
-  type HttpTransport,
-  type PublicClient,
-  type Transport,
-} from "viem";
-import { EntryPointAbi_v6 as EntryPointAbi } from "../abis/EntryPointAbi_v6.js";
-import {
-  createBundlerClient,
-  type BundlerClient,
-} from "../client/bundlerClient.js";
-import { getEntryPoint } from "../entrypoint/index.js";
-import {
-  BatchExecutionNotSupportedError,
-  FailedToGetStorageSlotError,
-  GetCounterFactualAddressError,
-  UpgradeToAndCallNotSupportedError,
-} from "../errors/account.js";
-import { InvalidRpcUrlError } from "../errors/client.js";
-import { Logger } from "../logger.js";
-import type { SmartAccountSigner } from "../signer/types.js";
-import { wrapSignatureWith6492 } from "../signer/utils.js";
-import type { BatchUserOperationCallData, NullAddress } from "../types.js";
-import { createBaseSmartAccountParamsSchema } from "./schema.js";
-import type {
-  BaseSmartAccountParams,
-  ISmartContractAccount,
-  SignTypedDataParams,
-} from "./types.js";
-
-export enum DeploymentState {
-  UNDEFINED = "0x0",
-  NOT_DEPLOYED = "0x1",
-  DEPLOYED = "0x2",
-}
-
-/**
- * @deprecated use `toSmartContractAccount` instead for creating SmartAccountInstances
- */
-export abstract class BaseSmartContractAccount<
-  TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
-> implements ISmartContractAccount<TTransport, TSigner>
-{
-  protected factoryAddress: Address;
-  protected deploymentState: DeploymentState = DeploymentState.UNDEFINED;
-  protected accountAddress?: Address;
-  protected accountInitCode?: Hex;
-  protected signer: TSigner;
-  protected entryPoint: GetContractReturnType<
-    typeof EntryPointAbi,
-    PublicClient
-  >;
-  protected entryPointAddress: Address;
-  readonly rpcProvider:
-    | BundlerClient<TTransport>
-    | BundlerClient<HttpTransport>;
-
-  constructor(params_: BaseSmartAccountParams<TTransport, TSigner>) {
-    const params = createBaseSmartAccountParamsSchema<
-      TTransport,
-      TSigner
-    >().parse(params_);
-
-    this.entryPointAddress =
-      params.entryPointAddress ?? getEntryPoint(params.chain).address;
-
-    const rpcUrl =
-      typeof params.rpcClient === "string"
-        ? params.rpcClient
-        : params.rpcClient.transport.type === "http"
-        ? (
-            params.rpcClient.transport as ReturnType<HttpTransport>["config"] &
-              ReturnType<HttpTransport>["value"]
-          ).url || params.chain.rpcUrls.default.http[0]
-        : undefined;
-
-    const fetchOptions =
-      typeof params.rpcClient === "string"
-        ? undefined
-        : params.rpcClient.transport.type === "http"
-        ? (
-            params.rpcClient.transport as ReturnType<HttpTransport>["config"] &
-              ReturnType<HttpTransport>["value"]
-          ).fetchOptions
-        : undefined;
-
-    this.rpcProvider = rpcUrl
-      ? createBundlerClient({
-          chain: params.chain,
-          transport: http(rpcUrl, {
-            fetchOptions: {
-              ...fetchOptions,
-              headers: {
-                ...fetchOptions?.headers,
-                ...(rpcUrl.toLowerCase().indexOf("alchemy") > -1
-                  ? {
-                      "Alchemy-Aa-Sdk-Signer":
-                        params.signer?.signerType || "unknown",
-                      "Alchemy-Aa-Sdk-Factory-Address": params.factoryAddress,
-                    }
-                  : undefined),
-              },
-            },
-          }),
-        })
-      : (params.rpcClient as BundlerClient<TTransport>);
-
-    this.accountAddress = params.accountAddress;
-    this.factoryAddress = params.factoryAddress;
-    this.signer = params.signer as TSigner;
-    this.accountInitCode = params.initCode as Hex;
-
-    this.entryPoint = getContract({
-      address: this.entryPointAddress,
-      abi: EntryPointAbi,
-      client: this.rpcProvider as PublicClient,
-    });
-  }
-
-  //#region abstract-methods
-
-  /**
-   * This method should return a signature that will not `revert` during validation.
-   * It does not have to pass validation, just not cause the contract to revert.
-   * This is required for gas estimation so that the gas estimate are accurate.
-   *
-   */
-  abstract getDummySignature(): Hex | Promise<Hex>;
-
-  /**
-   * this method should return the abi encoded function data for a call to your contract's `execute` method
-   *
-   * @param target -- equivalent to `to` in a normal transaction
-   * @param value -- equivalent to `value` in a normal transaction
-   * @param data -- equivalent to `data` in a normal transaction
-   * @returns abi encoded function data for a call to your contract's `execute` method
-   */
-  abstract encodeExecute(
-    target: string,
-    value: bigint,
-    data: string
-  ): Promise<Hash>;
-
-  /**
-   * this should return an ERC-191 compliant message and is used to sign UO Hashes
-   *
-   * @param msg -- the message to sign
-   */
-  abstract signMessage(msg: string | Uint8Array): Promise<Hash>;
-
-  /**
-   * this should return the init code that will be used to create an account if one does not exist.
-   * This is the concatenation of the account's factory address and the abi encoded function data of the account factory's `createAccount` method.
-   * https://github.com/eth-infinitism/account-abstraction/blob/abff2aca61a8f0934e533d0d352978055fddbd96/contracts/core/SenderCreator.sol#L12
-   */
-  protected abstract getAccountInitCode(): Promise<Hash>;
-
-  //#endregion abstract-methods
-
-  //#region optional-methods
-
-  /**
-   * If your account handles 1271 signatures of personal_sign differently
-   * than it does UserOperations, you can implement two different approaches to signing
-   *
-   * @param uoHash -- The hash of the UserOperation to sign
-   * @returns the signature of the UserOperation
-   */
-  async signUserOperationHash(uoHash: Hash): Promise<Hash> {
-    return this.signMessage(uoHash);
-  }
-
-  /**
-   * If your contract supports signing and verifying typed data,
-   * you should implement this method.
-   *
-   * @param _params -- Typed Data params to sign
-   */
-  async signTypedData(_params: SignTypedDataParams): Promise<`0x${string}`> {
-    throw new Error("signTypedData not supported");
-  }
-
-  /**
-   * This method should wrap the result of `signMessage` as per
-   * [EIP-6492](https://eips.ethereum.org/EIPS/eip-6492)
-   *
-   * @param msg -- the message to sign
-   * @returns the signature wrapped in 6492 format
-   */
-  async signMessageWith6492(msg: string | Uint8Array): Promise<`0x${string}`> {
-    const [isDeployed, signature] = await Promise.all([
-      this.isAccountDeployed(),
-      this.signMessage(msg),
-    ]);
-
-    return this.create6492Signature(isDeployed, signature);
-  }
-
-  /**
-   * Similar to the signMessageWith6492 method above,
-   * this method should wrap the result of `signTypedData` as per
-   * [EIP-6492](https://eips.ethereum.org/EIPS/eip-6492)
-   *
-   * @param params -- Typed Data params to sign
-   * @returns the signature wrapped in 6492 format
-   */
-  async signTypedDataWith6492(
-    params: SignTypedDataParams
-  ): Promise<`0x${string}`> {
-    const [isDeployed, signature] = await Promise.all([
-      this.isAccountDeployed(),
-      this.signTypedData(params),
-    ]);
-
-    return this.create6492Signature(isDeployed, signature);
-  }
-
-  /**
-   * Not all contracts support batch execution.
-   * If your contract does, this method should encode a list of
-   * transactions into the call data that will be passed to your
-   * contract's batch execution method.
-   *
-   * @param _txs -- the transactions to batch execute
-   */
-  async encodeBatchExecute(
-    _txs: BatchUserOperationCallData
-  ): Promise<`0x${string}`> {
-    throw new BatchExecutionNotSupportedError("BaseAccount");
-  }
-
-  /**
-   * If your contract supports UUPS, you can implement this method which can be
-   * used to upgrade the implementation of the account.
-   *
-   * @param _upgradeToImplAddress -- the implementation address of the contract you want to upgrade to
-   * @param _upgradeToInitData -- the initialization data required by that account
-   */
-  encodeUpgradeToAndCall = async (
-    _upgradeToImplAddress: Address,
-    _upgradeToInitData: Hex
-  ): Promise<Hex> => {
-    throw new UpgradeToAndCallNotSupportedError("BaseAccount");
-  };
-  //#endregion optional-methods
-
-  // Extra implementations
-  async getNonce(): Promise<bigint> {
-    if (!(await this.isAccountDeployed())) {
-      return 0n;
-    }
-    const address = await this.getAddress();
-    return this.entryPoint.read.getNonce([address, BigInt(0)]);
-  }
-
-  async getInitCode(): Promise<Hex> {
-    if (this.deploymentState === DeploymentState.DEPLOYED) {
-      return "0x";
-    }
-
-    const contractCode = await this.rpcProvider.getBytecode({
-      address: await this.getAddress(),
-    });
-
-    if ((contractCode?.length ?? 0) > 2) {
-      this.deploymentState = DeploymentState.DEPLOYED;
-      return "0x";
-    } else {
-      this.deploymentState = DeploymentState.NOT_DEPLOYED;
-    }
-
-    return this._getAccountInitCode();
-  }
-
-  async getAddress(): Promise<Address> {
-    if (!this.accountAddress) {
-      const initCode = await this._getAccountInitCode();
-      Logger.verbose(
-        "[BaseSmartContractAccount](getAddress) initCode: ",
-        initCode
-      );
-      try {
-        await this.entryPoint.simulate.getSenderAddress([initCode]);
-      } catch (err: any) {
-        Logger.verbose(
-          "[BaseSmartContractAccount](getAddress) getSenderAddress err: ",
-          err
-        );
-
-        if (err.cause?.data?.errorName === "SenderAddressResult") {
-          this.accountAddress = err.cause.data.args[0] as Address;
-          Logger.verbose(
-            "[BaseSmartContractAccount](getAddress) entryPoint.getSenderAddress result:",
-            this.accountAddress
-          );
-          return this.accountAddress;
-        }
-
-        if (err.details === "Invalid URL") {
-          throw new InvalidRpcUrlError();
-        }
-      }
-
-      throw new GetCounterFactualAddressError();
-    }
-
-    return this.accountAddress;
-  }
-
-  extend = <R>(fn: (self: this) => R): this & R => {
-    const extended = fn(this) as any;
-    // this should make it so extensions can't overwrite the base methods
-    for (const key in this) {
-      delete extended[key];
-    }
-    return Object.assign(this, extended);
-  };
-
-  getSigner(): TSigner {
-    return this.signer;
-  }
-
-  getFactoryAddress(): Address {
-    return this.factoryAddress;
-  }
-
-  getEntryPointAddress(): Address {
-    return this.entryPointAddress;
-  }
-
-  async isAccountDeployed(): Promise<boolean> {
-    return (await this.getDeploymentState()) === DeploymentState.DEPLOYED;
-  }
-
-  async getDeploymentState(): Promise<DeploymentState> {
-    if (this.deploymentState === DeploymentState.UNDEFINED) {
-      const initCode = await this.getInitCode();
-      return initCode === "0x"
-        ? DeploymentState.DEPLOYED
-        : DeploymentState.NOT_DEPLOYED;
-    } else {
-      return this.deploymentState;
-    }
-  }
-
-  /**
-   * https://eips.ethereum.org/EIPS/eip-4337#first-time-account-creation
-   * The initCode field (if non-zero length) is parsed as a 20-byte address,
-   * followed by calldata to pass to this address.
-   * The factory address is the first 40 char after the 0x, and the callData is the rest.
-   *
-   * @returns [factoryAddress, factoryCalldata]
-   */
-  protected async parseFactoryAddressFromAccountInitCode(): Promise<
-    [Address, Hex]
-  > {
-    const initCode = await this._getAccountInitCode();
-    const factoryAddress: Address = `0x${initCode.substring(2, 42)}`;
-    const factoryCalldata: Hex = `0x${initCode.substring(42)}`;
-    return [factoryAddress, factoryCalldata];
-  }
-
-  protected async getImplementationAddress(): Promise<NullAddress | Address> {
-    const accountAddress = await this.getAddress();
-
-    const storage = await this.rpcProvider.getStorageAt({
-      address: accountAddress,
-      // This is the default slot for the implementation address for Proxies
-      slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-    });
-
-    if (storage == null) {
-      throw new FailedToGetStorageSlotError(
-        "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
-        "Proxy Implementation Address"
-      );
-    }
-
-    return trim(storage);
-  }
-
-  private async _getAccountInitCode(): Promise<Hash> {
-    return this.accountInitCode ?? this.getAccountInitCode();
-  }
-
-  private async create6492Signature(
-    isDeployed: boolean,
-    signature: Hash
-  ): Promise<Hash> {
-    if (isDeployed) {
-      return signature;
-    }
-
-    const [factoryAddress, factoryCalldata] =
-      await this.parseFactoryAddressFromAccountInitCode();
-
-    Logger.verbose(
-      `[BaseSmartContractAccount](create6492Signature)\
-        factoryAddress: ${factoryAddress}, factoryCalldata: ${factoryCalldata}`
-    );
-
-    return wrapSignatureWith6492({
-      factoryAddress,
-      factoryCalldata,
-      signature,
-    });
-  }
-}

package/src/account/schema.ts

@@ -1,51 +0,0 @@
-import { Address } from "abitype/zod";
-import { isHex, type Transport } from "viem";
-import z from "zod";
-import { createPublicErc4337ClientSchema } from "../client/schema.js";
-import { isEntryPointVersion } from "../entrypoint/index.js";
-import type { EntryPointVersion } from "../entrypoint/types.js";
-import { isSigner } from "../signer/schema.js";
-import type { SmartAccountSigner } from "../signer/types.js";
-import { ChainSchema } from "../utils/index.js";
-
-export const createBaseSmartAccountParamsSchema = <
-  TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
->() =>
-  z.object({
-    rpcClient: z.union([
-      z.string(),
-      createPublicErc4337ClientSchema<TTransport>(),
-    ]),
-    factoryAddress: Address,
-    signer: z.custom<TSigner>(isSigner),
-    entryPointAddress: Address.optional(),
-    chain: ChainSchema,
-    accountAddress: Address.optional().describe(
-      "Optional override for the account address."
-    ),
-    initCode: z
-      .string()
-      .refine(
-        (x) => isHex(x, { strict: true }),
-        "initCode must be a valid hex."
-      )
-      .optional()
-      .describe("Optional override for the account init code."),
-    entryPointVersion: z
-      .custom<EntryPointVersion>(isEntryPointVersion)
-      .optional(),
-  });
-
-export const SimpleSmartAccountParamsSchema = <
-  TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
->() =>
-  createBaseSmartAccountParamsSchema<TTransport, TSigner>()
-    .omit({
-      rpcClient: true,
-    })
-    .extend({
-      transport: z.custom<TTransport>(),
-      salt: z.bigint().optional(),
-    });