@zerodev/sdk 5.2.0-alpha-1 → 5.2.0-alpha-3

package/README.md

@@ -0,0 +1,3 @@
+# ZeroDev SDK
+
+See [ZeroDev docs](https://docs.zerodev.app/) for details.

package/_cjs/accounts/index.js

@@ -1,13 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addressToEmptyAccount = exports.createKernelV1Account = exports.EIP1271ABI = exports.KERNEL_ADDRESSES = exports.createKernelAccount = void 0;
+exports.addressToEmptyAccount = exports.EIP1271Abi = exports.KernelFactoryV2Abi = exports.KernelAccountV2Abi = exports.createKernelV2Account = exports.createKernelV1Account = exports.KERNEL_ADDRESSES = exports.createKernelAccount = void 0;
 const tslib_1 = require("tslib");
 var createKernelAccount_js_1 = require("./kernel/createKernelAccount.js");
 Object.defineProperty(exports, "createKernelAccount", { enumerable: true, get: function () { return createKernelAccount_js_1.createKernelAccount; } });
 Object.defineProperty(exports, "KERNEL_ADDRESSES", { enumerable: true, get: function () { return createKernelAccount_js_1.KERNEL_ADDRESSES; } });
-Object.defineProperty(exports, "EIP1271ABI", { enumerable: true, get: function () { return createKernelAccount_js_1.EIP1271ABI; } });
 var createKernelV1Account_js_1 = require("./kernel/v1/createKernelV1Account.js");
 Object.defineProperty(exports, "createKernelV1Account", { enumerable: true, get: function () { return createKernelV1Account_js_1.createKernelV1Account; } });
+var createKernelV2Account_js_1 = require("./kernel/v2/createKernelV2Account.js");
+Object.defineProperty(exports, "createKernelV2Account", { enumerable: true, get: function () { return createKernelV2Account_js_1.createKernelV2Account; } });
+var KernelAccountV2Abi_js_1 = require("./kernel/v2/abi/KernelAccountV2Abi.js");
+Object.defineProperty(exports, "KernelAccountV2Abi", { enumerable: true, get: function () { return KernelAccountV2Abi_js_1.KernelAccountV2Abi; } });
+var KernelFactoryV2Abi_js_1 = require("./kernel/v2/abi/KernelFactoryV2Abi.js");
+Object.defineProperty(exports, "KernelFactoryV2Abi", { enumerable: true, get: function () { return KernelFactoryV2Abi_js_1.KernelFactoryV2Abi; } });
+var EIP1271Abi_js_1 = require("./kernel/abi/EIP1271Abi.js");
+Object.defineProperty(exports, "EIP1271Abi", { enumerable: true, get: function () { return EIP1271Abi_js_1.EIP1271Abi; } });
 var addressToEmptyAccount_js_1 = require("./addressToEmptyAccount.js");
 Object.defineProperty(exports, "addressToEmptyAccount", { enumerable: true, get: function () { return addressToEmptyAccount_js_1.addressToEmptyAccount; } });
 tslib_1.__exportStar(require("./utils/index.js"), exports);

package/_cjs/accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":";;;;AAAA,0EAKwC;AAJpC,6HAAA,mBAAmB,OAAA;AAEnB,0HAAA,gBAAgB,OAAA;AAChB,oHAAA,UAAU,OAAA;AAEd,iFAA4E;AAAnE,iIAAA,qBAAqB,OAAA;AAC9B,uEAAkE;AAAzD,iIAAA,qBAAqB,OAAA;AAC9B,2DAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":";;;;AAAA,0EAIwC;AAHpC,6HAAA,mBAAmB,OAAA;AAEnB,0HAAA,gBAAgB,OAAA;AAEpB,iFAA4E;AAAnE,iIAAA,qBAAqB,OAAA;AAC9B,iFAA4E;AAAnE,iIAAA,qBAAqB,OAAA;AAC9B,+EAA0E;AAAjE,2HAAA,kBAAkB,OAAA;AAC3B,+EAA0E;AAAjE,2HAAA,kBAAkB,OAAA;AAC3B,4DAAuD;AAA9C,2GAAA,UAAU,OAAA;AACnB,uEAAkE;AAAzD,iIAAA,qBAAqB,OAAA;AAC9B,2DAAgC"}

package/_cjs/accounts/kernel/abi/EIP1271Abi.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EIP1271Abi = void 0;
+exports.EIP1271Abi = [
+    {
+        type: "function",
+        name: "eip712Domain",
+        inputs: [],
+        outputs: [
+            { name: "fields", type: "bytes1", internalType: "bytes1" },
+            { name: "name", type: "string", internalType: "string" },
+            { name: "version", type: "string", internalType: "string" },
+            { name: "chainId", type: "uint256", internalType: "uint256" },
+            {
+                name: "verifyingContract",
+                type: "address",
+                internalType: "address"
+            },
+            { name: "salt", type: "bytes32", internalType: "bytes32" },
+            { name: "extensions", type: "uint256[]", internalType: "uint256[]" }
+        ],
+        stateMutability: "view"
+    },
+    {
+        type: "function",
+        name: "isValidSignature",
+        inputs: [
+            { name: "data", type: "bytes32", internalType: "bytes32" },
+            { name: "signature", type: "bytes", internalType: "bytes" }
+        ],
+        outputs: [
+            { name: "magicValue", type: "bytes4", internalType: "bytes4" }
+        ],
+        stateMutability: "view"
+    }
+];
+//# sourceMappingURL=EIP1271Abi.js.map

package/_cjs/accounts/kernel/abi/EIP1271Abi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EIP1271Abi.js","sourceRoot":"","sources":["../../../../accounts/kernel/abi/EIP1271Abi.ts"],"names":[],"mappings":";;;AAAa,QAAA,UAAU,GAAG;IACtB;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE;YAC1D,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE;YACxD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE;YAC3D,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC7D;gBACI,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,SAAS;aAC1B;YACD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC1D,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE;SACvE;QACD,eAAe,EAAE,MAAM;KAC1B;IACD;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,kBAAkB;QACxB,MAAM,EAAE;YACJ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;YAC1D,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;SAC9D;QACD,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE;SACjE;QACD,eAAe,EAAE,MAAM;KAC1B;CACK,CAAA"}

package/_cjs/accounts/kernel/abi/SafeCreateCallAbi.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SafeCreateCallAbi = void 0;
+const viem_1 = require("viem");
+exports.SafeCreateCallAbi = (0, viem_1.parseAbi)([
+    "function performCreate(uint256 value, bytes memory deploymentData) public returns (address newContract)",
+    "function performCreate2(uint256 value, bytes memory deploymentData, bytes32 salt) public returns (address newContract)"
+]);
+//# sourceMappingURL=SafeCreateCallAbi.js.map

package/_cjs/accounts/kernel/abi/SafeCreateCallAbi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SafeCreateCallAbi.js","sourceRoot":"","sources":["../../../../accounts/kernel/abi/SafeCreateCallAbi.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAElB,QAAA,iBAAiB,GAAG,IAAA,eAAQ,EAAC;IACtC,yGAAyG;IACzG,wHAAwH;CAC3H,CAAC,CAAA"}

package/_cjs/accounts/kernel/createKernelAccount.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createKernelAccount = exports.KERNEL_ADDRESSES = exports.EIP1271ABI = void 0;
+exports.createKernelAccount = exports.KERNEL_ADDRESSES = void 0;
 const permissionless_1 = require("permissionless");
 const accounts_1 = require("permissionless/accounts");
 const viem_1 = require("viem");
-const accounts_2 = require("viem/accounts");
-const constants_js_1 = require("../../constants.js");
 const utils_js_1 = require("../../utils.js");
-const _6492_js_1 = require("../utils/6492.js");
 const index_js_1 = require("../utils/index.js");
 const toKernelPluginManager_js_1 = require("../utils/toKernelPluginManager.js");
 const KernelAccountAbi_js_1 = require("./abi/KernelAccountAbi.js");
 const KernelAccountAbi_js_2 = require("./abi/kernel_v_3_0_0/KernelAccountAbi.js");
+const encodeCallData_js_1 = require("./utils/account/ep0_6/encodeCallData.js");
+const encodeDeployCallData_js_1 = require("./utils/account/ep0_6/encodeDeployCallData.js");
+const encodeCallData_js_2 = require("./utils/account/ep0_7/encodeCallData.js");
+const encodeDeployCallData_js_2 = require("./utils/account/ep0_7/encodeDeployCallData.js");
+const accountMetadata_js_1 = require("./utils/common/accountMetadata.js");
+const eip712WrapHash_js_1 = require("./utils/common/eip712WrapHash.js");
 const createAccountAbi = [
     {
         inputs: [
@@ -43,52 +46,15 @@ const createAccountAbi = [
         type: "function"
     }
 ];
-const createCallAddress = "0x9b35Af71d77eaf8d7e40252370304687390A1A52";
-const createCallAbi = (0, viem_1.parseAbi)([
-    "function performCreate(uint256 value, bytes memory deploymentData) public returns (address newContract)",
-    "function performCreate2(uint256 value, bytes memory deploymentData, bytes32 salt) public returns (address newContract)"
-]);
-exports.EIP1271ABI = [
-    {
-        type: "function",
-        name: "eip712Domain",
-        inputs: [],
-        outputs: [
-            { name: "fields", type: "bytes1", internalType: "bytes1" },
-            { name: "name", type: "string", internalType: "string" },
-            { name: "version", type: "string", internalType: "string" },
-            { name: "chainId", type: "uint256", internalType: "uint256" },
-            {
-                name: "verifyingContract",
-                type: "address",
-                internalType: "address"
-            },
-            { name: "salt", type: "bytes32", internalType: "bytes32" },
-            { name: "extensions", type: "uint256[]", internalType: "uint256[]" }
-        ],
-        stateMutability: "view"
-    },
-    {
-        type: "function",
-        name: "isValidSignature",
-        inputs: [
-            { name: "data", type: "bytes32", internalType: "bytes32" },
-            { name: "signature", type: "bytes", internalType: "bytes" }
-        ],
-        outputs: [
-            { name: "magicValue", type: "bytes4", internalType: "bytes4" }
-        ],
-        stateMutability: "view"
-    }
-];
 exports.KERNEL_ADDRESSES = {
     ACCOUNT_LOGIC_V0_6: "0xd3082872F8B06073A021b4602e022d5A070d7cfC",
     ACCOUNT_LOGIC_V0_7: "0x079D5D8A3275A230AF743cB59c341Ff74B82488D",
     FACTORY_ADDRESS: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
     ENTRYPOINT_V0_6: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
 };
-const getKernelInitData = ({ validatorAddress, enableData, entryPoint: entryPointAddress }) => {
+const getKernelInitData = async ({ entryPoint: entryPointAddress, kernelPluginManager }) => {
     const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPointAddress);
+    const { enableData, validatorAddress } = await kernelPluginManager.getValidatorInitData();
     if (entryPointVersion === "v0.6") {
         return (0, viem_1.encodeFunctionData)({
             abi: KernelAccountAbi_js_1.KernelInitAbi,
@@ -100,21 +66,17 @@ const getKernelInitData = ({ validatorAddress, enableData, entryPoint: entryPoin
         abi: KernelAccountAbi_js_2.KernelV3InitAbi,
         functionName: "initialize",
         args: [
-            (0, viem_1.pad)((0, viem_1.concatHex)(["0x1", validatorAddress]), {
-                size: 21,
-                dir: "left"
-            }),
+            kernelPluginManager.getValidationId(true),
             viem_1.zeroAddress,
             enableData,
             "0x"
         ]
     });
 };
-const getAccountInitCode = async ({ index, factoryAddress, accountLogicAddress, validatorAddress, enableData, entryPoint: entryPointAddress }) => {
-    const initialisationData = getKernelInitData({
-        validatorAddress,
-        enableData,
-        entryPoint: entryPointAddress
+const getAccountInitCode = async ({ index, factoryAddress, accountLogicAddress, entryPoint: entryPointAddress, kernelPluginManager }) => {
+    const initialisationData = await getKernelInitData({
+        entryPoint: entryPointAddress,
+        kernelPluginManager
     });
     return (0, viem_1.concatHex)([
         factoryAddress,
@@ -156,14 +118,12 @@ async function createKernelAccount(client, { plugins, entryPoint: entryPointAddr
             entryPoint: entryPointAddress
         });
     const generateInitCode = async () => {
-        const validatorInitData = await kernelPluginManager.getValidatorInitData();
         return getAccountInitCode({
             index,
             factoryAddress,
             accountLogicAddress,
-            validatorAddress: validatorInitData.validatorAddress,
-            enableData: validatorInitData.enableData,
-            entryPoint: entryPointAddress
+            entryPoint: entryPointAddress,
+            kernelPluginManager
         });
     };
     const accountAddress = deployedAccountAddress ??
@@ -175,340 +135,126 @@ async function createKernelAccount(client, { plugins, entryPoint: entryPointAddr
     if (!accountAddress)
         throw new Error("Account address not found");
     let smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
-    const signHashedMessage = async (messageHash) => {
-        const kernelImplAddr = await (0, _6492_js_1.getKernelImplementationAddress)(client, accountAddress);
-        const kernelVersion = (0, utils_js_1.getKernelVersion)(entryPointAddress, kernelImplAddr);
-        if (!(0, utils_js_1.hasKernelFeature)(utils_js_1.KERNEL_FEATURES.ERC1271_SIG_WRAPPER, kernelVersion)) {
-            return kernelPluginManager.signMessage({
-                message: {
-                    raw: messageHash
-                }
-            });
-        }
-        const domain = await client.request({
-            method: "eth_call",
-            params: [
-                {
-                    to: accountAddress,
-                    data: (0, viem_1.encodeFunctionData)({
-                        abi: exports.EIP1271ABI,
-                        functionName: "eip712Domain"
-                    })
-                },
-                "latest"
-            ]
-        });
-        let name;
-        let version;
-        let chainId;
-        if (domain !== "0x") {
-            const decoded = (0, viem_1.decodeFunctionResult)({
-                abi: [...exports.EIP1271ABI],
-                functionName: "eip712Domain",
-                data: domain
-            });
-            name = decoded[1];
-            version = decoded[2];
-            chainId = decoded[3];
-        }
-        else {
-            name = constants_js_1.KERNEL_NAME;
-            version = kernelVersion;
-            chainId = client.chain
-                ? BigInt(client.chain.id)
-                : BigInt(await client.extend(viem_1.publicActions).getChainId());
-        }
-        const encoded = (0, viem_1.encodeAbiParameters)([
-            { type: "bytes32" },
-            { type: "bytes32" },
-            { type: "bytes32" },
-            { type: "uint256" },
-            { type: "address" }
-        ], [
-            (0, viem_1.keccak256)((0, viem_1.stringToHex)("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)")),
-            (0, viem_1.keccak256)((0, viem_1.stringToHex)(name)),
-            (0, viem_1.keccak256)((0, viem_1.stringToHex)(version)),
-            BigInt(chainId),
-            accountAddress
-        ]);
-        const domainSeparator = (0, viem_1.keccak256)(encoded);
-        let finalMessageHash = messageHash;
-        if ((0, utils_js_1.hasKernelFeature)(utils_js_1.KERNEL_FEATURES.ERC1271_SIG_WRAPPER_WITH_WRAPPED_HASH, kernelVersion)) {
-            finalMessageHash = (0, viem_1.keccak256)((0, viem_1.encodeAbiParameters)([{ type: "bytes32" }, { type: "bytes32" }], [
-                (0, viem_1.keccak256)((0, viem_1.stringToHex)("Kernel(bytes32 hash)")),
-                messageHash
-            ]));
-        }
-        const digest = (0, viem_1.keccak256)((0, viem_1.concatHex)(["0x1901", domainSeparator, finalMessageHash]));
-        return kernelPluginManager.signMessage({
-            message: {
-                raw: digest
-            }
-        });
-    };
-    const account = (0, accounts_2.toAccount)({
-        address: accountAddress,
-        async signMessage({ message }) {
-            const messageHash = (0, viem_1.hashMessage)(message);
-            const [isDeployed, signature] = await Promise.all([
-                (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress),
-                signHashedMessage(messageHash)
-            ]);
-            const kernelImplAddr = await (0, _6492_js_1.getKernelImplementationAddress)(client, accountAddress);
-            const kernelVersion = (0, utils_js_1.getKernelVersion)(entryPointAddress, kernelImplAddr);
-            if (!(0, utils_js_1.hasKernelFeature)(utils_js_1.KERNEL_FEATURES.ERC1271_WITH_VALIDATOR, kernelVersion)) {
-                return create6492Signature(isDeployed, signature);
-            }
-            const validatorInitData = await kernelPluginManager.getValidatorInitData();
-            return create6492Signature(isDeployed, (0, viem_1.concatHex)([
-                (0, viem_1.pad)((0, viem_1.concatHex)(["0x1", validatorInitData.validatorAddress]), {
-                    size: 21,
-                    dir: "left"
-                }),
-                signature
-            ]));
-        },
-        async signTransaction(_, __) {
-            throw new accounts_1.SignTransactionNotSupportedBySmartAccount();
-        },
-        async signTypedData(typedData) {
-            const kernelImplAddr = await (0, _6492_js_1.getKernelImplementationAddress)(client, accountAddress);
-            const kernelVersion = (0, utils_js_1.getKernelVersion)(entryPointAddress, kernelImplAddr);
-            const types = {
-                EIP712Domain: (0, viem_1.getTypesForEIP712Domain)({
-                    domain: typedData.domain
-                }),
-                ...typedData.types
-            };
-            (0, viem_1.validateTypedData)({
-                domain: typedData.domain,
-                message: typedData.message,
-                primaryType: typedData.primaryType,
-                types: types
-            });
-            const typedHash = (0, viem_1.hashTypedData)(typedData);
-            const [isDeployed, signature] = await Promise.all([
-                (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress),
-                signHashedMessage(typedHash)
-            ]);
-            if (!(0, utils_js_1.hasKernelFeature)(utils_js_1.KERNEL_FEATURES.ERC1271_WITH_VALIDATOR, kernelVersion)) {
-                return create6492Signature(isDeployed, signature);
-            }
-            const validatorInitData = await kernelPluginManager.getValidatorInitData();
-            return create6492Signature(isDeployed, (0, viem_1.concatHex)([
-                (0, viem_1.pad)((0, viem_1.concatHex)(["0x1", validatorInitData.validatorAddress]), {
-                    size: 21,
-                    dir: "left"
-                }),
-                signature
-            ]));
-        }
-    });
-    const create6492Signature = async (isDeployed, signature) => {
-        if (isDeployed) {
-            return signature;
-        }
-        const [factoryAddress, factoryCalldata] = (0, index_js_1.parseFactoryAddressAndCallDataFromAccountInitCode)(await generateInitCode());
-        return (0, _6492_js_1.wrapSignatureWith6492)({
-            factoryAddress,
-            factoryCalldata,
-            signature
-        });
-    };
     return {
-        ...account,
-        client: client,
-        publicKey: accountAddress,
-        entryPoint: entryPointAddress,
-        source: "kernelSmartAccount",
         kernelPluginManager,
-        generateInitCode,
-        async getFactory() {
-            if (smartAccountDeployed)
-                return undefined;
-            smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
-            if (smartAccountDeployed)
-                return undefined;
-            return factoryAddress;
-        },
-        async getFactoryData() {
-            if (smartAccountDeployed)
-                return undefined;
-            smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
-            if (smartAccountDeployed)
-                return undefined;
-            return (0, index_js_1.parseFactoryAddressAndCallDataFromAccountInitCode)(await generateInitCode())[1];
-        },
-        async getNonce() {
-            const key = await kernelPluginManager.getNonceKey(accountAddress);
-            return (0, permissionless_1.getAccountNonce)(client, {
-                sender: accountAddress,
-                entryPoint: entryPointAddress,
-                key
-            });
-        },
-        async signUserOperation(userOperation) {
-            return kernelPluginManager.signUserOperation(userOperation);
-        },
-        async getInitCode() {
-            if (smartAccountDeployed)
-                return "0x";
-            smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
-            if (smartAccountDeployed)
-                return "0x";
-            return generateInitCode();
-        },
-        async encodeDeployCallData(_tx) {
-            if (entryPointVersion === "v0.6") {
-                return (0, viem_1.encodeFunctionData)({
-                    abi: KernelAccountAbi_js_1.KernelExecuteAbi,
-                    functionName: "executeDelegateCall",
-                    args: [
-                        createCallAddress,
-                        (0, viem_1.encodeFunctionData)({
-                            abi: createCallAbi,
-                            functionName: "performCreate",
-                            args: [
-                                0n,
-                                (0, viem_1.encodeDeployData)({
-                                    abi: _tx.abi,
-                                    bytecode: _tx.bytecode,
-                                    args: _tx.args
-                                })
-                            ]
-                        })
-                    ]
-                });
-            }
-            return (0, viem_1.encodeFunctionData)({
-                abi: KernelAccountAbi_js_2.KernelV3ExecuteAbi,
-                functionName: "execute",
-                args: [
-                    (0, utils_js_1.getExecMode)(constants_js_1.CALL_TYPE.DELEGATE_CALL, constants_js_1.EXEC_TYPE.DEFAULT),
-                    (0, viem_1.concatHex)([
-                        createCallAddress,
-                        (0, viem_1.encodeFunctionData)({
-                            abi: createCallAbi,
-                            functionName: "performCreate",
-                            args: [
-                                0n,
-                                (0, viem_1.encodeDeployData)({
-                                    abi: _tx.abi,
-                                    bytecode: _tx.bytecode,
-                                    args: _tx.args
-                                })
-                            ]
-                        })
-                    ])
-                ]
-            });
-        },
-        async encodeCallData(_tx) {
-            const tx = _tx;
-            if (Array.isArray(tx)) {
+        ...(0, accounts_1.toSmartAccount)({
+            address: accountAddress,
+            publicKey: accountAddress,
+            source: "kernelSmartAccount",
+            client,
+            entryPoint: entryPointAddress,
+            async encodeDeployCallData(_tx) {
                 if (entryPointVersion === "v0.6") {
-                    return (0, viem_1.encodeFunctionData)({
-                        abi: KernelAccountAbi_js_1.KernelExecuteAbi,
-                        functionName: "executeBatch",
-                        args: [
-                            tx.map((txn) => {
-                                if (txn.callType === "delegatecall") {
-                                    throw new Error("Cannot batch delegatecall");
-                                }
-                                return {
-                                    to: txn.to,
-                                    value: txn.value,
-                                    data: txn.data
-                                };
-                            })
-                        ]
-                    });
+                    return (0, encodeDeployCallData_js_1.encodeDeployCallData)(_tx);
                 }
-                return (0, viem_1.encodeFunctionData)({
-                    abi: KernelAccountAbi_js_2.KernelV3ExecuteAbi,
-                    functionName: "execute",
-                    args: [
-                        (0, utils_js_1.getExecMode)(constants_js_1.CALL_TYPE.BATCH, constants_js_1.EXEC_TYPE.DEFAULT),
-                        (0, viem_1.encodeAbiParameters)([
-                            {
-                                name: "executionBatch",
-                                type: "tuple[]",
-                                components: [
-                                    {
-                                        name: "target",
-                                        type: "address"
-                                    },
-                                    {
-                                        name: "value",
-                                        type: "uint256"
-                                    },
-                                    {
-                                        name: "callData",
-                                        type: "bytes"
-                                    }
-                                ]
-                            }
-                        ], [
-                            tx.map((txn) => {
-                                if (txn.callType === "delegatecall") {
-                                    throw new Error("Cannot batch delegatecall");
-                                }
-                                return {
-                                    target: txn.to,
-                                    value: txn.value,
-                                    callData: txn.data
-                                };
-                            })
-                        ])
-                    ]
-                });
-            }
-            if (!tx.callType || tx.callType === "call") {
-                if (tx.to.toLowerCase() === accountAddress.toLowerCase()) {
+                return (0, encodeDeployCallData_js_2.encodeDeployCallData)(_tx);
+            },
+            async encodeCallData(_tx) {
+                const tx = _tx;
+                if (!Array.isArray(tx) &&
+                    tx.callType === "call" &&
+                    tx.to.toLowerCase() === accountAddress.toLowerCase()) {
                     return tx.data;
                 }
                 if (entryPointVersion === "v0.6") {
-                    return (0, viem_1.encodeFunctionData)({
-                        abi: KernelAccountAbi_js_1.KernelExecuteAbi,
-                        functionName: "execute",
-                        args: [tx.to, tx.value, tx.data, 0]
-                    });
+                    return (0, encodeCallData_js_1.encodeCallData)(tx);
                 }
-                return (0, viem_1.encodeFunctionData)({
-                    abi: KernelAccountAbi_js_2.KernelV3ExecuteAbi,
-                    functionName: "execute",
-                    args: [
-                        (0, utils_js_1.getExecMode)(constants_js_1.CALL_TYPE.SINGLE, constants_js_1.EXEC_TYPE.DEFAULT),
-                        (0, viem_1.concatHex)([
-                            tx.to,
-                            (0, viem_1.pad)((0, viem_1.toHex)(tx.value), { size: 32 }),
-                            tx.data
-                        ])
-                    ]
+                return (0, encodeCallData_js_2.encodeCallData)(tx);
+            },
+            async getFactory() {
+                if (smartAccountDeployed)
+                    return undefined;
+                smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
+                if (smartAccountDeployed)
+                    return undefined;
+                return factoryAddress;
+            },
+            async getFactoryData() {
+                if (smartAccountDeployed)
+                    return undefined;
+                smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
+                if (smartAccountDeployed)
+                    return undefined;
+                return (0, index_js_1.parseFactoryAddressAndCallDataFromAccountInitCode)(await generateInitCode())[1];
+            },
+            async signMessage({ message }) {
+                const messageHash = (0, viem_1.hashMessage)(message);
+                const { name, chainId, version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, entryPointAddress);
+                const wrappedMessageHash = await (0, eip712WrapHash_js_1.eip712WrapHash)(messageHash, {
+                    name,
+                    chainId: Number(chainId),
+                    version,
+                    verifyingContract: accountAddress
                 });
-            }
-            if (tx.callType === "delegatecall") {
-                if (entryPointVersion === "v0.6") {
-                    return (0, viem_1.encodeFunctionData)({
-                        abi: KernelAccountAbi_js_1.KernelExecuteAbi,
-                        functionName: "executeDelegateCall",
-                        args: [tx.to, tx.data]
-                    });
+                const signature = await kernelPluginManager.signMessage({
+                    message: { raw: wrappedMessageHash }
+                });
+                if (!(0, utils_js_1.hasKernelFeature)(utils_js_1.KERNEL_FEATURES.ERC1271_WITH_VALIDATOR, version)) {
+                    return signature;
                 }
-                return (0, viem_1.encodeFunctionData)({
-                    abi: KernelAccountAbi_js_2.KernelV3ExecuteAbi,
-                    functionName: "execute",
-                    args: [
-                        (0, utils_js_1.getExecMode)(constants_js_1.CALL_TYPE.DELEGATE_CALL, constants_js_1.EXEC_TYPE.DEFAULT),
-                        (0, viem_1.concatHex)([tx.to, tx.data])
-                    ]
+                return (0, viem_1.concatHex)([
+                    kernelPluginManager.getValidationId(),
+                    signature
+                ]);
+            },
+            async signTransaction(_, __) {
+                throw new accounts_1.SignTransactionNotSupportedBySmartAccount();
+            },
+            async signTypedData(typedData) {
+                const types = {
+                    EIP712Domain: (0, viem_1.getTypesForEIP712Domain)({
+                        domain: typedData.domain
+                    }),
+                    ...typedData.types
+                };
+                (0, viem_1.validateTypedData)({
+                    domain: typedData.domain,
+                    message: typedData.message,
+                    primaryType: typedData.primaryType,
+                    types: types
                 });
+                const typedHash = (0, viem_1.hashTypedData)(typedData);
+                const { name, chainId, version } = await (0, accountMetadata_js_1.accountMetadata)(client, accountAddress, entryPointAddress);
+                const wrappedMessageHash = await (0, eip712WrapHash_js_1.eip712WrapHash)(typedHash, {
+                    name,
+                    chainId: Number(chainId),
+                    version,
+                    verifyingContract: accountAddress
+                });
+                const signature = await kernelPluginManager.signMessage({
+                    message: { raw: wrappedMessageHash }
+                });
+                if (!(0, utils_js_1.hasKernelFeature)(utils_js_1.KERNEL_FEATURES.ERC1271_WITH_VALIDATOR, version)) {
+                    return signature;
+                }
+                return (0, viem_1.concatHex)([
+                    kernelPluginManager.getValidationId(),
+                    signature
+                ]);
+            },
+            async getNonce() {
+                const key = await kernelPluginManager.getNonceKey(accountAddress);
+                return (0, permissionless_1.getAccountNonce)(client, {
+                    sender: accountAddress,
+                    entryPoint: entryPointAddress,
+                    key
+                });
+            },
+            async signUserOperation(userOperation) {
+                return kernelPluginManager.signUserOperation(userOperation);
+            },
+            async getDummySignature(userOperation) {
+                return kernelPluginManager.getDummySignature(userOperation);
+            },
+            async getInitCode() {
+                if (smartAccountDeployed)
+                    return "0x";
+                smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
+                if (smartAccountDeployed)
+                    return "0x";
+                return generateInitCode();
             }
-            throw new Error("Invalid call type");
-        },
-        async getDummySignature(userOperation) {
-            return kernelPluginManager.getDummySignature(userOperation);
-        }
+        })
     };
 }
 exports.createKernelAccount = createKernelAccount;