@aa-sdk/core 4.0.0-alpha.0

package/dist/cjs/abis/SimpleAccountFactoryAbi.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleAccountFactoryAbi = void 0;
+exports.SimpleAccountFactoryAbi = [
+    {
+        inputs: [
+            {
+                internalType: "contract IEntryPoint",
+                name: "_entryPoint",
+                type: "address",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "constructor",
+    },
+    {
+        inputs: [],
+        name: "accountImplementation",
+        outputs: [
+            {
+                internalType: "contract SimpleAccount",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "owner",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "salt",
+                type: "uint256",
+            },
+        ],
+        name: "createAccount",
+        outputs: [
+            {
+                internalType: "contract SimpleAccount",
+                name: "ret",
+                type: "address",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "owner",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "salt",
+                type: "uint256",
+            },
+        ],
+        name: "getAddress",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+];
+//# sourceMappingURL=SimpleAccountFactoryAbi.js.map

package/dist/cjs/abis/SimpleAccountFactoryAbi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SimpleAccountFactoryAbi.js","sourceRoot":"","sources":["../../../src/abis/SimpleAccountFactoryAbi.ts"],"names":[],"mappings":";;;AAAa,QAAA,uBAAuB,GAAG;IACrC;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,sBAAsB;gBACpC,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,aAAa;KACpB;IACD;QACE,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,wBAAwB;gBACtC,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,wBAAwB;gBACtC,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACjB;IACD;QACE,MAAM,EAAE;YACN;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAChB;YACD;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,SAAS;aAChB;SACF;QACD,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE;YACP;gBACE,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,SAAS;aAChB;SACF;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACjB;CACO,CAAC","sourcesContent":["export const SimpleAccountFactoryAbi = [\n  {\n    inputs: [\n      {\n        internalType: \"contract IEntryPoint\",\n        name: \"_entryPoint\",\n        type: \"address\",\n      },\n    ],\n    stateMutability: \"nonpayable\",\n    type: \"constructor\",\n  },\n  {\n    inputs: [],\n    name: \"accountImplementation\",\n    outputs: [\n      {\n        internalType: \"contract SimpleAccount\",\n        name: \"\",\n        type: \"address\",\n      },\n    ],\n    stateMutability: \"view\",\n    type: \"function\",\n  },\n  {\n    inputs: [\n      {\n        internalType: \"address\",\n        name: \"owner\",\n        type: \"address\",\n      },\n      {\n        internalType: \"uint256\",\n        name: \"salt\",\n        type: \"uint256\",\n      },\n    ],\n    name: \"createAccount\",\n    outputs: [\n      {\n        internalType: \"contract SimpleAccount\",\n        name: \"ret\",\n        type: \"address\",\n      },\n    ],\n    stateMutability: \"nonpayable\",\n    type: \"function\",\n  },\n  {\n    inputs: [\n      {\n        internalType: \"address\",\n        name: \"owner\",\n        type: \"address\",\n      },\n      {\n        internalType: \"uint256\",\n        name: \"salt\",\n        type: \"uint256\",\n      },\n    ],\n    name: \"getAddress\",\n    outputs: [\n      {\n        internalType: \"address\",\n        name: \"\",\n        type: \"address\",\n      },\n    ],\n    stateMutability: \"view\",\n    type: \"function\",\n  },\n] as const;\n"]}

package/dist/cjs/account/base.d.ts

@@ -0,0 +1,49 @@
+import type { Address } from "abitype";
+import { 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 { type BundlerClient } from "../client/bundlerClient.js";
+import type { SmartAccountSigner } from "../signer/types.js";
+import type { BatchUserOperationCallData, NullAddress } from "../types.js";
+import type { BaseSmartAccountParams, ISmartContractAccount, SignTypedDataParams } from "./types.js";
+export declare enum DeploymentState {
+    UNDEFINED = "0x0",
+    NOT_DEPLOYED = "0x1",
+    DEPLOYED = "0x2"
+}
+export declare abstract class BaseSmartContractAccount<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner> implements ISmartContractAccount<TTransport, TSigner> {
+    protected factoryAddress: Address;
+    protected deploymentState: DeploymentState;
+    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>);
+    abstract getDummySignature(): Hex | Promise<Hex>;
+    abstract encodeExecute(target: string, value: bigint, data: string): Promise<Hash>;
+    abstract signMessage(msg: string | Uint8Array): Promise<Hash>;
+    protected abstract getAccountInitCode(): Promise<Hash>;
+    signUserOperationHash(uoHash: Hash): Promise<Hash>;
+    signTypedData(_params: SignTypedDataParams): Promise<`0x${string}`>;
+    signMessageWith6492(msg: string | Uint8Array): Promise<`0x${string}`>;
+    signTypedDataWith6492(params: SignTypedDataParams): Promise<`0x${string}`>;
+    encodeBatchExecute(_txs: BatchUserOperationCallData): Promise<`0x${string}`>;
+    encodeUpgradeToAndCall: (_upgradeToImplAddress: Address, _upgradeToInitData: Hex) => Promise<Hex>;
+    getNonce(): Promise<bigint>;
+    getInitCode(): Promise<Hex>;
+    getAddress(): Promise<Address>;
+    extend: <R>(fn: (self: this) => R) => this & R;
+    getSigner(): TSigner;
+    getFactoryAddress(): Address;
+    getEntryPointAddress(): Address;
+    isAccountDeployed(): Promise<boolean>;
+    getDeploymentState(): Promise<DeploymentState>;
+    protected parseFactoryAddressFromAccountInitCode(): Promise<[
+        Address,
+        Hex
+    ]>;
+    protected getImplementationAddress(): Promise<NullAddress | Address>;
+    private _getAccountInitCode;
+    private create6492Signature;
+}

package/dist/cjs/account/base.js

@@ -0,0 +1,257 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseSmartContractAccount = exports.DeploymentState = void 0;
+const viem_1 = require("viem");
+const EntryPointAbi_v6_js_1 = require("../abis/EntryPointAbi_v6.js");
+const bundlerClient_js_1 = require("../client/bundlerClient.js");
+const index_js_1 = require("../entrypoint/index.js");
+const account_js_1 = require("../errors/account.js");
+const client_js_1 = require("../errors/client.js");
+const logger_js_1 = require("../logger.js");
+const utils_js_1 = require("../signer/utils.js");
+const schema_js_1 = require("./schema.js");
+var DeploymentState;
+(function (DeploymentState) {
+    DeploymentState["UNDEFINED"] = "0x0";
+    DeploymentState["NOT_DEPLOYED"] = "0x1";
+    DeploymentState["DEPLOYED"] = "0x2";
+})(DeploymentState || (exports.DeploymentState = DeploymentState = {}));
+class BaseSmartContractAccount {
+    constructor(params_) {
+        Object.defineProperty(this, "factoryAddress", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "deploymentState", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: DeploymentState.UNDEFINED
+        });
+        Object.defineProperty(this, "accountAddress", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "accountInitCode", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "signer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "entryPoint", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "entryPointAddress", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "rpcProvider", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "encodeUpgradeToAndCall", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: async (_upgradeToImplAddress, _upgradeToInitData) => {
+                throw new account_js_1.UpgradeToAndCallNotSupportedError("BaseAccount");
+            }
+        });
+        Object.defineProperty(this, "extend", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (fn) => {
+                const extended = fn(this);
+                for (const key in this) {
+                    delete extended[key];
+                }
+                return Object.assign(this, extended);
+            }
+        });
+        const params = (0, schema_js_1.createBaseSmartAccountParamsSchema)().parse(params_);
+        this.entryPointAddress =
+            params.entryPointAddress ?? (0, index_js_1.getEntryPoint)(params.chain).address;
+        const rpcUrl = typeof params.rpcClient === "string"
+            ? params.rpcClient
+            : params.rpcClient.transport.type === "http"
+                ? params.rpcClient.transport.url || params.chain.rpcUrls.default.http[0]
+                : undefined;
+        const fetchOptions = typeof params.rpcClient === "string"
+            ? undefined
+            : params.rpcClient.transport.type === "http"
+                ? params.rpcClient.transport.fetchOptions
+                : undefined;
+        this.rpcProvider = rpcUrl
+            ? (0, bundlerClient_js_1.createBundlerClient)({
+                chain: params.chain,
+                transport: (0, viem_1.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;
+        this.accountAddress = params.accountAddress;
+        this.factoryAddress = params.factoryAddress;
+        this.signer = params.signer;
+        this.accountInitCode = params.initCode;
+        this.entryPoint = (0, viem_1.getContract)({
+            address: this.entryPointAddress,
+            abi: EntryPointAbi_v6_js_1.EntryPointAbi_v6,
+            client: this.rpcProvider,
+        });
+    }
+    async signUserOperationHash(uoHash) {
+        return this.signMessage(uoHash);
+    }
+    async signTypedData(_params) {
+        throw new Error("signTypedData not supported");
+    }
+    async signMessageWith6492(msg) {
+        const [isDeployed, signature] = await Promise.all([
+            this.isAccountDeployed(),
+            this.signMessage(msg),
+        ]);
+        return this.create6492Signature(isDeployed, signature);
+    }
+    async signTypedDataWith6492(params) {
+        const [isDeployed, signature] = await Promise.all([
+            this.isAccountDeployed(),
+            this.signTypedData(params),
+        ]);
+        return this.create6492Signature(isDeployed, signature);
+    }
+    async encodeBatchExecute(_txs) {
+        throw new account_js_1.BatchExecutionNotSupportedError("BaseAccount");
+    }
+    async getNonce() {
+        if (!(await this.isAccountDeployed())) {
+            return 0n;
+        }
+        const address = await this.getAddress();
+        return this.entryPoint.read.getNonce([address, BigInt(0)]);
+    }
+    async getInitCode() {
+        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() {
+        if (!this.accountAddress) {
+            const initCode = await this._getAccountInitCode();
+            logger_js_1.Logger.verbose("[BaseSmartContractAccount](getAddress) initCode: ", initCode);
+            try {
+                await this.entryPoint.simulate.getSenderAddress([initCode]);
+            }
+            catch (err) {
+                logger_js_1.Logger.verbose("[BaseSmartContractAccount](getAddress) getSenderAddress err: ", err);
+                if (err.cause?.data?.errorName === "SenderAddressResult") {
+                    this.accountAddress = err.cause.data.args[0];
+                    logger_js_1.Logger.verbose("[BaseSmartContractAccount](getAddress) entryPoint.getSenderAddress result:", this.accountAddress);
+                    return this.accountAddress;
+                }
+                if (err.details === "Invalid URL") {
+                    throw new client_js_1.InvalidRpcUrlError();
+                }
+            }
+            throw new account_js_1.GetCounterFactualAddressError();
+        }
+        return this.accountAddress;
+    }
+    getSigner() {
+        return this.signer;
+    }
+    getFactoryAddress() {
+        return this.factoryAddress;
+    }
+    getEntryPointAddress() {
+        return this.entryPointAddress;
+    }
+    async isAccountDeployed() {
+        return (await this.getDeploymentState()) === DeploymentState.DEPLOYED;
+    }
+    async getDeploymentState() {
+        if (this.deploymentState === DeploymentState.UNDEFINED) {
+            const initCode = await this.getInitCode();
+            return initCode === "0x"
+                ? DeploymentState.DEPLOYED
+                : DeploymentState.NOT_DEPLOYED;
+        }
+        else {
+            return this.deploymentState;
+        }
+    }
+    async parseFactoryAddressFromAccountInitCode() {
+        const initCode = await this._getAccountInitCode();
+        const factoryAddress = `0x${initCode.substring(2, 42)}`;
+        const factoryCalldata = `0x${initCode.substring(42)}`;
+        return [factoryAddress, factoryCalldata];
+    }
+    async getImplementationAddress() {
+        const accountAddress = await this.getAddress();
+        const storage = await this.rpcProvider.getStorageAt({
+            address: accountAddress,
+            slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc",
+        });
+        if (storage == null) {
+            throw new account_js_1.FailedToGetStorageSlotError("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc", "Proxy Implementation Address");
+        }
+        return (0, viem_1.trim)(storage);
+    }
+    async _getAccountInitCode() {
+        return this.accountInitCode ?? this.getAccountInitCode();
+    }
+    async create6492Signature(isDeployed, signature) {
+        if (isDeployed) {
+            return signature;
+        }
+        const [factoryAddress, factoryCalldata] = await this.parseFactoryAddressFromAccountInitCode();
+        logger_js_1.Logger.verbose(`[BaseSmartContractAccount](create6492Signature)\
+        factoryAddress: ${factoryAddress}, factoryCalldata: ${factoryCalldata}`);
+        return (0, utils_js_1.wrapSignatureWith6492)({
+            factoryAddress,
+            factoryCalldata,
+            signature,
+        });
+    }
+}
+exports.BaseSmartContractAccount = BaseSmartContractAccount;
+//# sourceMappingURL=base.js.map

package/dist/cjs/account/base.js.map

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

package/dist/cjs/account/schema.d.ts

@@ -0,0 +1,100 @@
+import { type Transport } from "viem";
+import z from "zod";
+import type { SmartAccountSigner } from "../signer/types.js";
+export declare const createBaseSmartAccountParamsSchema: <TTransport extends Transport = Transport, TSigner extends SmartAccountSigner<any> = SmartAccountSigner<any>>() => z.ZodObject<{
+    rpcClient: z.ZodUnion<[z.ZodString, z.ZodType<import("../index.js").BundlerClient<TTransport>, z.ZodTypeDef, import("../index.js").BundlerClient<TTransport>>]>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+}, "strip", z.ZodTypeAny, { [k_1 in keyof z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+    rpcClient: z.ZodUnion<[z.ZodString, z.ZodType<import("../index.js").BundlerClient<TTransport>, z.ZodTypeDef, import("../index.js").BundlerClient<TTransport>>]>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+}>, "chain" | "factoryAddress" | "rpcClient" | (undefined extends TSigner ? never : "signer")>]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+    rpcClient: z.ZodUnion<[z.ZodString, z.ZodType<import("../index.js").BundlerClient<TTransport>, z.ZodTypeDef, import("../index.js").BundlerClient<TTransport>>]>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+}>, "chain" | "factoryAddress" | "rpcClient" | (undefined extends TSigner ? never : "signer")>[k_1]; }, { [k_2 in keyof z.baseObjectInputType<{
+    rpcClient: z.ZodUnion<[z.ZodString, z.ZodType<import("../index.js").BundlerClient<TTransport>, z.ZodTypeDef, import("../index.js").BundlerClient<TTransport>>]>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+}>]: z.baseObjectInputType<{
+    rpcClient: z.ZodUnion<[z.ZodString, z.ZodType<import("../index.js").BundlerClient<TTransport>, z.ZodTypeDef, import("../index.js").BundlerClient<TTransport>>]>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+}>[k_2]; }>;
+export declare const SimpleSmartAccountParamsSchema: <TTransport extends Transport = Transport, TSigner extends SmartAccountSigner<any> = SmartAccountSigner<any>>() => z.ZodObject<{
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+    transport: z.ZodType<TTransport, z.ZodTypeDef, TTransport>;
+    salt: z.ZodOptional<z.ZodBigInt>;
+}, "strip", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+    transport: z.ZodType<TTransport, z.ZodTypeDef, TTransport>;
+    salt: z.ZodOptional<z.ZodBigInt>;
+}>, "chain" | "factoryAddress" | (undefined extends TTransport ? never : "transport") | (undefined extends TSigner ? never : "signer")> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+    transport: z.ZodType<TTransport, z.ZodTypeDef, TTransport>;
+    salt: z.ZodOptional<z.ZodBigInt>;
+}>, "chain" | "factoryAddress" | (undefined extends TTransport ? never : "transport") | (undefined extends TSigner ? never : "signer")>[k]; } : never, z.baseObjectInputType<{
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+    transport: z.ZodType<TTransport, z.ZodTypeDef, TTransport>;
+    salt: z.ZodOptional<z.ZodBigInt>;
+}> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<{
+    initCode: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
+    chain: z.ZodType<import("viem").Chain, z.ZodTypeDef, import("viem").Chain>;
+    factoryAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
+    signer: z.ZodType<TSigner, z.ZodTypeDef, TSigner>;
+    entryPointAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    accountAddress: z.ZodOptional<z.ZodEffects<z.ZodString, `0x${string}`, string>>;
+    entryPointVersion: z.ZodOptional<z.ZodType<keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>, z.ZodTypeDef, keyof import("../entrypoint/types.js").EntryPointRegistryBase<unknown>>>;
+    transport: z.ZodType<TTransport, z.ZodTypeDef, TTransport>;
+    salt: z.ZodOptional<z.ZodBigInt>;
+}>[k_1]; } : never>;

package/dist/cjs/account/schema.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleSmartAccountParamsSchema = exports.createBaseSmartAccountParamsSchema = void 0;
+const zod_1 = require("abitype/zod");
+const viem_1 = require("viem");
+const zod_2 = __importDefault(require("zod"));
+const schema_js_1 = require("../client/schema.js");
+const index_js_1 = require("../entrypoint/index.js");
+const schema_js_2 = require("../signer/schema.js");
+const index_js_2 = require("../utils/index.js");
+const createBaseSmartAccountParamsSchema = () => zod_2.default.object({
+    rpcClient: zod_2.default.union([
+        zod_2.default.string(),
+        (0, schema_js_1.createPublicErc4337ClientSchema)(),
+    ]),
+    factoryAddress: zod_1.Address,
+    signer: zod_2.default.custom(schema_js_2.isSigner),
+    entryPointAddress: zod_1.Address.optional(),
+    chain: index_js_2.ChainSchema,
+    accountAddress: zod_1.Address.optional().describe("Optional override for the account address."),
+    initCode: zod_2.default
+        .string()
+        .refine((x) => (0, viem_1.isHex)(x, { strict: true }), "initCode must be a valid hex.")
+        .optional()
+        .describe("Optional override for the account init code."),
+    entryPointVersion: zod_2.default
+        .custom(index_js_1.isEntryPointVersion)
+        .optional(),
+});
+exports.createBaseSmartAccountParamsSchema = createBaseSmartAccountParamsSchema;
+const SimpleSmartAccountParamsSchema = () => (0, exports.createBaseSmartAccountParamsSchema)()
+    .omit({
+    rpcClient: true,
+})
+    .extend({
+    transport: zod_2.default.custom(),
+    salt: zod_2.default.bigint().optional(),
+});
+exports.SimpleSmartAccountParamsSchema = SimpleSmartAccountParamsSchema;
+//# sourceMappingURL=schema.js.map

package/dist/cjs/account/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/account/schema.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAsC;AACtC,+BAA6C;AAC7C,8CAAoB;AACpB,mDAAsE;AACtE,qDAA6D;AAE7D,mDAA+C;AAE/C,gDAAgD;AAEzC,MAAM,kCAAkC,GAAG,GAG9C,EAAE,CACJ,aAAC,CAAC,MAAM,CAAC;IACP,SAAS,EAAE,aAAC,CAAC,KAAK,CAAC;QACjB,aAAC,CAAC,MAAM,EAAE;QACV,IAAA,2CAA+B,GAAc;KAC9C,CAAC;IACF,cAAc,EAAE,aAAO;IACvB,MAAM,EAAE,aAAC,CAAC,MAAM,CAAU,oBAAQ,CAAC;IACnC,iBAAiB,EAAE,aAAO,CAAC,QAAQ,EAAE;IACrC,KAAK,EAAE,sBAAW;IAClB,cAAc,EAAE,aAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACzC,4CAA4C,CAC7C;IACD,QAAQ,EAAE,aAAC;SACR,MAAM,EAAE;SACR,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,YAAK,EAAC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EACjC,+BAA+B,CAChC;SACA,QAAQ,EAAE;SACV,QAAQ,CAAC,8CAA8C,CAAC;IAC3D,iBAAiB,EAAE,aAAC;SACjB,MAAM,CAAoB,8BAAmB,CAAC;SAC9C,QAAQ,EAAE;CACd,CAAC,CAAC;AA3BQ,QAAA,kCAAkC,sCA2B1C;AAEE,MAAM,8BAA8B,GAAG,GAG1C,EAAE,CACJ,IAAA,0CAAkC,GAAuB;KACtD,IAAI,CAAC;IACJ,SAAS,EAAE,IAAI;CAChB,CAAC;KACD,MAAM,CAAC;IACN,SAAS,EAAE,aAAC,CAAC,MAAM,EAAc;IACjC,IAAI,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC5B,CAAC,CAAC;AAXM,QAAA,8BAA8B,kCAWpC","sourcesContent":["import { Address } from \"abitype/zod\";\nimport { isHex, type Transport } from \"viem\";\nimport z from \"zod\";\nimport { createPublicErc4337ClientSchema } from \"../client/schema.js\";\nimport { isEntryPointVersion } from \"../entrypoint/index.js\";\nimport type { EntryPointVersion } from \"../entrypoint/types.js\";\nimport { isSigner } from \"../signer/schema.js\";\nimport type { SmartAccountSigner } from \"../signer/types.js\";\nimport { ChainSchema } from \"../utils/index.js\";\n\nexport const createBaseSmartAccountParamsSchema = <\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>() =>\n  z.object({\n    rpcClient: z.union([\n      z.string(),\n      createPublicErc4337ClientSchema<TTransport>(),\n    ]),\n    factoryAddress: Address,\n    signer: z.custom<TSigner>(isSigner),\n    entryPointAddress: Address.optional(),\n    chain: ChainSchema,\n    accountAddress: Address.optional().describe(\n      \"Optional override for the account address.\"\n    ),\n    initCode: z\n      .string()\n      .refine(\n        (x) => isHex(x, { strict: true }),\n        \"initCode must be a valid hex.\"\n      )\n      .optional()\n      .describe(\"Optional override for the account init code.\"),\n    entryPointVersion: z\n      .custom<EntryPointVersion>(isEntryPointVersion)\n      .optional(),\n  });\n\nexport const SimpleSmartAccountParamsSchema = <\n  TTransport extends Transport = Transport,\n  TSigner extends SmartAccountSigner = SmartAccountSigner\n>() =>\n  createBaseSmartAccountParamsSchema<TTransport, TSigner>()\n    .omit({\n      rpcClient: true,\n    })\n    .extend({\n      transport: z.custom<TTransport>(),\n      salt: z.bigint().optional(),\n    });\n"]}

package/dist/cjs/account/simple.d.ts

@@ -0,0 +1,14 @@
+import type { Address } from "abitype";
+import { type Chain, type Hex, type Transport } from "viem";
+import type { DefaultEntryPointVersion, EntryPointParameter, EntryPointVersion } from "../entrypoint/types.js";
+import type { SmartAccountSigner } from "../signer/types.js";
+import { type SmartContractAccountWithSigner, type ToSmartContractAccountParams } from "./smartContractAccount.js";
+export type SimpleSmartAccount<TSigner extends SmartAccountSigner = SmartAccountSigner, TEntryPointVersion extends EntryPointVersion = EntryPointVersion> = SmartContractAccountWithSigner<"SimpleAccount", TSigner, TEntryPointVersion>;
+export type CreateSimpleAccountParams<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner, TEntryPointVersion extends EntryPointVersion = DefaultEntryPointVersion> = Pick<ToSmartContractAccountParams<"SimpleAccount", TTransport, Chain, TEntryPointVersion>, "chain" | "transport"> & {
+    signer: TSigner;
+    salt?: bigint;
+    accountAddress?: Address;
+    factoryAddress?: Address;
+    initCode?: Hex;
+} & EntryPointParameter<TEntryPointVersion, Chain>;
+export declare function createSimpleSmartAccount<TTransport extends Transport = Transport, TSigner extends SmartAccountSigner = SmartAccountSigner, TEntryPointVersion extends EntryPointVersion = DefaultEntryPointVersion>(config: CreateSimpleAccountParams<TTransport, TSigner, TEntryPointVersion>): Promise<SimpleSmartAccount<TSigner, TEntryPointVersion>>;