permissionless 0.0.12 → 0.0.14

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # permissionless
 
+## 0.0.14
+
+### Patch Changes
+
+- 4d6f01f: Add sponsorship policies option to pimlicoPaymasterClient
+  Update Safe 4337 module version to 0.2.0
+- 5fe172d: Introduce a simpel version of Kernel SmartAccount (by ZeroDev), using their ECDSA Validator
+
+## 0.0.13
+
+### Patch Changes
+
+- 69a7b4b: Added support to enable extra modules and transactions during setup for Safe account
+- 639775d: Added support for passing in custom signers
+- 0254c24: Enable batch calls for Safe account
+- b95e9e5: Enable setting custom nonce for user operations
+- 39164f7: Added support for Safe account management
+
 ## 0.0.12
 
 ### Patch Changes

package/_cjs/accounts/index.js

@@ -1,7 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.privateKeyToSimpleSmartAccount = exports.SignTransactionNotSupportedBySmartAccount = void 0;
+exports.signerToEcdsaKernelSmartAccount = exports.privateKeyToSafeSmartAccount = exports.privateKeyToSimpleSmartAccount = exports.SignTransactionNotSupportedBySmartAccount = exports.signerToSimpleSmartAccount = exports.signerToSafeSmartAccount = void 0;
 const privateKeyToSimpleSmartAccount_js_1 = require("./privateKeyToSimpleSmartAccount.js");
-Object.defineProperty(exports, "SignTransactionNotSupportedBySmartAccount", { enumerable: true, get: function () { return privateKeyToSimpleSmartAccount_js_1.SignTransactionNotSupportedBySmartAccount; } });
 Object.defineProperty(exports, "privateKeyToSimpleSmartAccount", { enumerable: true, get: function () { return privateKeyToSimpleSmartAccount_js_1.privateKeyToSimpleSmartAccount; } });
+const signerToSimpleSmartAccount_js_1 = require("./signerToSimpleSmartAccount.js");
+Object.defineProperty(exports, "signerToSimpleSmartAccount", { enumerable: true, get: function () { return signerToSimpleSmartAccount_js_1.signerToSimpleSmartAccount; } });
+const privateKeyToSafeSmartAccount_js_1 = require("./privateKeyToSafeSmartAccount.js");
+Object.defineProperty(exports, "privateKeyToSafeSmartAccount", { enumerable: true, get: function () { return privateKeyToSafeSmartAccount_js_1.privateKeyToSafeSmartAccount; } });
+const signerToSafeSmartAccount_js_1 = require("./signerToSafeSmartAccount.js");
+Object.defineProperty(exports, "signerToSafeSmartAccount", { enumerable: true, get: function () { return signerToSafeSmartAccount_js_1.signerToSafeSmartAccount; } });
+const signerToEcdsaKernelSmartAccount_js_1 = require("./kernel/signerToEcdsaKernelSmartAccount.js");
+Object.defineProperty(exports, "signerToEcdsaKernelSmartAccount", { enumerable: true, get: function () { return signerToEcdsaKernelSmartAccount_js_1.signerToEcdsaKernelSmartAccount; } });
+const types_js_1 = require("./types.js");
+Object.defineProperty(exports, "SignTransactionNotSupportedBySmartAccount", { enumerable: true, get: function () { return types_js_1.SignTransactionNotSupportedBySmartAccount; } });
 //# sourceMappingURL=index.js.map

package/_cjs/accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":";;;AAAA,2FAI4C;AAKxC,0HAPA,6EAAyC,OAOA;AAEzC,+GARA,kEAA8B,OAQA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../accounts/index.ts"],"names":[],"mappings":";;;AAAA,2FAAoF;AAkChF,+GAlCK,kEAA8B,OAkCL;AAhClC,mFAGwC;AA2BpC,2GA5BA,0DAA0B,OA4BA;AAzB9B,uFAAgF;AA6B5E,6GA7BK,8DAA4B,OA6BL;AA3BhC,+EAIsC;AAiBlC,yGAlBA,sDAAwB,OAkBA;AAf5B,oGAGoD;AAoBhD,gHArBA,oEAA+B,OAqBA;AAlBnC,yCAImB;AASf,0HAZA,oDAAyC,OAYA"}

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

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KernelInitAbi = exports.KernelExecuteAbi = void 0;
+exports.KernelExecuteAbi = [
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "to",
+                type: "address"
+            },
+            {
+                internalType: "uint256",
+                name: "value",
+                type: "uint256"
+            },
+            {
+                internalType: "bytes",
+                name: "data",
+                type: "bytes"
+            },
+            {
+                internalType: "enum Operation",
+                name: "",
+                type: "uint8"
+            }
+        ],
+        name: "execute",
+        outputs: [],
+        stateMutability: "payable",
+        type: "function"
+    },
+    {
+        inputs: [
+            {
+                components: [
+                    {
+                        internalType: "address",
+                        name: "to",
+                        type: "address"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "value",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "bytes",
+                        name: "data",
+                        type: "bytes"
+                    }
+                ],
+                internalType: "struct Call[]",
+                name: "calls",
+                type: "tuple[]"
+            }
+        ],
+        name: "executeBatch",
+        outputs: [],
+        stateMutability: "payable",
+        type: "function"
+    }
+];
+exports.KernelInitAbi = [
+    {
+        inputs: [
+            {
+                internalType: "contract IKernelValidator",
+                name: "_defaultValidator",
+                type: "address"
+            },
+            {
+                internalType: "bytes",
+                name: "_data",
+                type: "bytes"
+            }
+        ],
+        name: "initialize",
+        outputs: [],
+        stateMutability: "payable",
+        type: "function"
+    }
+];
+//# sourceMappingURL=KernelAccountAbi.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"KernelAccountAbi.js","sourceRoot":"","sources":["../../../../accounts/kernel/abi/KernelAccountAbi.ts"],"names":[],"mappings":";;;AAGa,QAAA,gBAAgB,GAAG;IAC5B;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,gBAAgB;gBAC9B,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,OAAO;aAChB;SACJ;QACD,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACnB;IACD;QACI,MAAM,EAAE;YACJ;gBACI,UAAU,EAAE;oBACR;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,OAAO;wBACrB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,OAAO;qBAChB;iBACJ;gBACD,YAAY,EAAE,eAAe;gBAC7B,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAKG,QAAA,aAAa,GAAG;IACzB;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,2BAA2B;gBACzC,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;aAChB;SACJ;QACD,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA"}

package/_cjs/accounts/kernel/signerToEcdsaKernelSmartAccount.js

@@ -0,0 +1,211 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signerToEcdsaKernelSmartAccount = void 0;
+const viem_1 = require("viem");
+const accounts_1 = require("viem/accounts");
+const actions_1 = require("viem/actions");
+const getAccountNonce_js_1 = require("../../actions/public/getAccountNonce.js");
+const getSenderAddress_js_1 = require("../../actions/public/getSenderAddress.js");
+const getUserOperationHash_js_1 = require("../../utils/getUserOperationHash.js");
+const types_js_1 = require("../types.js");
+const KernelAccountAbi_js_1 = require("./abi/KernelAccountAbi.js");
+const createAccountAbi = [
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_implementation",
+                type: "address"
+            },
+            {
+                internalType: "bytes",
+                name: "_data",
+                type: "bytes"
+            },
+            {
+                internalType: "uint256",
+                name: "_index",
+                type: "uint256"
+            }
+        ],
+        name: "createAccount",
+        outputs: [
+            {
+                internalType: "address",
+                name: "proxy",
+                type: "address"
+            }
+        ],
+        stateMutability: "payable",
+        type: "function"
+    }
+];
+const KERNEL_ADDRESSES = {
+    ECDSA_VALIDATOR: "0xd9AB5096a832b9ce79914329DAEE236f8Eea0390",
+    ACCOUNT_V2_2_LOGIC: "0x0DA6a956B9488eD4dd761E59f52FDc6c8068E6B5",
+    FACTORY_ADDRESS: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3"
+};
+const getAccountInitCode = async ({ owner, index, factoryAddress, accountLogicAddress, ecdsaValidatorAddress }) => {
+    if (!owner)
+        throw new Error("Owner account not found");
+    const initialisationData = (0, viem_1.encodeFunctionData)({
+        abi: KernelAccountAbi_js_1.KernelInitAbi,
+        functionName: "initialize",
+        args: [ecdsaValidatorAddress, owner]
+    });
+    return (0, viem_1.concatHex)([
+        factoryAddress,
+        (0, viem_1.encodeFunctionData)({
+            abi: createAccountAbi,
+            functionName: "createAccount",
+            args: [accountLogicAddress, initialisationData, index]
+        })
+    ]);
+};
+const getAccountAddress = async ({ client, owner, entryPoint, initCodeProvider, ecdsaValidatorAddress, deployedAccountAddress }) => {
+    if (deployedAccountAddress !== undefined) {
+        const deployedAccountOwner = await (0, actions_1.readContract)(client, {
+            address: ecdsaValidatorAddress,
+            abi: [
+                {
+                    inputs: [
+                        {
+                            internalType: "address",
+                            name: "",
+                            type: "address"
+                        }
+                    ],
+                    name: "ecdsaValidatorStorage",
+                    outputs: [
+                        {
+                            internalType: "address",
+                            name: "owner",
+                            type: "address"
+                        }
+                    ],
+                    stateMutability: "view",
+                    type: "function"
+                }
+            ],
+            functionName: "ecdsaValidatorStorage",
+            args: [deployedAccountAddress]
+        });
+        if (!(0, viem_1.isAddressEqual)(deployedAccountOwner, owner)) {
+            throw new Error("Invalid owner for the already deployed account");
+        }
+        return deployedAccountAddress;
+    }
+    const initCode = await initCodeProvider();
+    return (0, getSenderAddress_js_1.getSenderAddress)(client, {
+        initCode,
+        entryPoint
+    });
+};
+async function signerToEcdsaKernelSmartAccount(client, { signer, entryPoint, index = 0n, factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS, accountLogicAddress = KERNEL_ADDRESSES.ACCOUNT_V2_2_LOGIC, ecdsaValidatorAddress = KERNEL_ADDRESSES.ECDSA_VALIDATOR, deployedAccountAddress }) {
+    const viemSigner = signer.type === "local"
+        ? {
+            ...signer,
+            signTransaction: (_, __) => {
+                throw new types_js_1.SignTransactionNotSupportedBySmartAccount();
+            }
+        }
+        : signer;
+    const generateInitCode = () => getAccountInitCode({
+        owner: viemSigner.address,
+        index,
+        factoryAddress,
+        accountLogicAddress,
+        ecdsaValidatorAddress
+    });
+    const [accountAddress, chainId] = await Promise.all([
+        getAccountAddress({
+            client,
+            entryPoint,
+            owner: viemSigner.address,
+            ecdsaValidatorAddress,
+            initCodeProvider: generateInitCode,
+            deployedAccountAddress
+        }),
+        (0, actions_1.getChainId)(client)
+    ]);
+    if (!accountAddress)
+        throw new Error("Account address not found");
+    const account = (0, accounts_1.toAccount)({
+        address: accountAddress,
+        async signMessage({ message }) {
+            return (0, actions_1.signMessage)(client, { account: viemSigner, message });
+        },
+        async signTransaction(_, __) {
+            throw new types_js_1.SignTransactionNotSupportedBySmartAccount();
+        },
+        async signTypedData(typedData) {
+            return (0, actions_1.signTypedData)(client, { account: viemSigner, ...typedData });
+        }
+    });
+    return {
+        ...account,
+        client: client,
+        publicKey: accountAddress,
+        entryPoint: entryPoint,
+        source: "kernelEcdsaSmartAccount",
+        async getNonce() {
+            return (0, getAccountNonce_js_1.getAccountNonce)(client, {
+                sender: accountAddress,
+                entryPoint: entryPoint
+            });
+        },
+        async signUserOperation(userOperation) {
+            const hash = (0, getUserOperationHash_js_1.getUserOperationHash)({
+                userOperation: {
+                    ...userOperation,
+                    signature: "0x"
+                },
+                entryPoint: entryPoint,
+                chainId: chainId
+            });
+            const signature = await (0, actions_1.signMessage)(client, {
+                account: viemSigner,
+                message: { raw: hash }
+            });
+            return (0, viem_1.concatHex)(["0x00000000", signature]);
+        },
+        async getInitCode() {
+            const contractCode = await (0, actions_1.getBytecode)(client, {
+                address: accountAddress
+            });
+            if ((contractCode?.length ?? 0) > 2)
+                return "0x";
+            return generateInitCode();
+        },
+        async encodeDeployCallData(_) {
+            throw new Error("Simple account doesn't support account deployment");
+        },
+        async encodeCallData(_tx) {
+            if (Array.isArray(_tx)) {
+                return (0, viem_1.encodeFunctionData)({
+                    abi: KernelAccountAbi_js_1.KernelExecuteAbi,
+                    functionName: "executeBatch",
+                    args: [
+                        _tx.map((tx) => ({
+                            to: tx.to,
+                            value: tx.value,
+                            data: tx.data
+                        }))
+                    ]
+                });
+            }
+            else {
+                return (0, viem_1.encodeFunctionData)({
+                    abi: KernelAccountAbi_js_1.KernelExecuteAbi,
+                    functionName: "execute",
+                    args: [_tx.to, _tx.value, _tx.data, 0]
+                });
+            }
+        },
+        async getDummySignature() {
+            return "0x00000000fffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
+        }
+    };
+}
+exports.signerToEcdsaKernelSmartAccount = signerToEcdsaKernelSmartAccount;
+//# sourceMappingURL=signerToEcdsaKernelSmartAccount.js.map

package/_cjs/accounts/kernel/signerToEcdsaKernelSmartAccount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signerToEcdsaKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/signerToEcdsaKernelSmartAccount.ts"],"names":[],"mappings":"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"}

package/_cjs/accounts/privateKeyToSafeSmartAccount.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.privateKeyToSafeSmartAccount = void 0;
+const accounts_1 = require("viem/accounts");
+const signerToSafeSmartAccount_js_1 = require("./signerToSafeSmartAccount.js");
+async function privateKeyToSafeSmartAccount(client, { privateKey, safeVersion, entryPoint, addModuleLibAddress: _addModuleLibAddress, safe4337ModuleAddress: _safe4337ModuleAddress, safeProxyFactoryAddress: _safeProxyFactoryAddress, safeSingletonAddress: _safeSingletonAddress, multiSendAddress: _multiSendAddress, multiSendCallOnlyAddress: _multiSendCallOnlyAddress, saltNonce = 0n, safeModules = [], setupTransactions = [] }) {
+    const privateKeyAccount = (0, accounts_1.privateKeyToAccount)(privateKey);
+    return (0, signerToSafeSmartAccount_js_1.signerToSafeSmartAccount)(client, {
+        signer: privateKeyAccount,
+        safeVersion,
+        entryPoint,
+        addModuleLibAddress: _addModuleLibAddress,
+        safe4337ModuleAddress: _safe4337ModuleAddress,
+        safeProxyFactoryAddress: _safeProxyFactoryAddress,
+        safeSingletonAddress: _safeSingletonAddress,
+        multiSendAddress: _multiSendAddress,
+        multiSendCallOnlyAddress: _multiSendCallOnlyAddress,
+        saltNonce,
+        safeModules,
+        setupTransactions
+    });
+}
+exports.privateKeyToSafeSmartAccount = privateKeyToSafeSmartAccount;
+//# sourceMappingURL=privateKeyToSafeSmartAccount.js.map

package/_cjs/accounts/privateKeyToSafeSmartAccount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"privateKeyToSafeSmartAccount.js","sourceRoot":"","sources":["../../accounts/privateKeyToSafeSmartAccount.ts"],"names":[],"mappings":";;;AAOA,4CAAmD;AACnD,+EAIsC;AAO/B,KAAK,UAAU,4BAA4B,CAI9C,MAAkC,EAClC,EACI,UAAU,EACV,WAAW,EACX,UAAU,EACV,mBAAmB,EAAE,oBAAoB,EACzC,qBAAqB,EAAE,sBAAsB,EAC7C,uBAAuB,EAAE,wBAAwB,EACjD,oBAAoB,EAAE,qBAAqB,EAC3C,gBAAgB,EAAE,iBAAiB,EACnC,wBAAwB,EAAE,yBAAyB,EACnD,SAAS,GAAG,EAAE,EACd,WAAW,GAAG,EAAE,EAChB,iBAAiB,GAAG,EAAE,EAkBzB;IAED,MAAM,iBAAiB,GAAG,IAAA,8BAAmB,EAAC,UAAU,CAAC,CAAA;IAEzD,OAAO,IAAA,sDAAwB,EAAC,MAAM,EAAE;QACpC,MAAM,EAAE,iBAAiB;QACzB,WAAW;QACX,UAAU;QACV,mBAAmB,EAAE,oBAAoB;QACzC,qBAAqB,EAAE,sBAAsB;QAC7C,uBAAuB,EAAE,wBAAwB;QACjD,oBAAoB,EAAE,qBAAqB;QAC3C,gBAAgB,EAAE,iBAAiB;QACnC,wBAAwB,EAAE,yBAAyB;QACnD,SAAS;QACT,WAAW;QACX,iBAAiB;KACpB,CAAC,CAAA;AACN,CAAC;AArDD,oEAqDC"}

package/_cjs/accounts/privateKeyToSimpleSmartAccount.js

@@ -1,168 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.privateKeyToSimpleSmartAccount = exports.SignTransactionNotSupportedBySmartAccount = void 0;
-const viem_1 = require("viem");
+exports.privateKeyToSimpleSmartAccount = void 0;
 const accounts_1 = require("viem/accounts");
-const actions_1 = require("viem/actions");
-const getAccountNonce_js_1 = require("../actions/public/getAccountNonce.js");
-const getSenderAddress_js_1 = require("../actions/public/getSenderAddress.js");
-const getUserOperationHash_js_1 = require("../utils/getUserOperationHash.js");
-class SignTransactionNotSupportedBySmartAccount extends viem_1.BaseError {
-    constructor({ docsPath } = {}) {
-        super([
-            "A smart account cannot sign or send transaction, it can only sign message or userOperation.",
-            "Please send user operation instead."
-        ].join("\n"), {
-            docsPath,
-            docsSlug: "account"
-        });
-        Object.defineProperty(this, "name", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: "SignTransactionNotSupportedBySmartAccount"
-        });
-    }
-}
-exports.SignTransactionNotSupportedBySmartAccount = SignTransactionNotSupportedBySmartAccount;
-const getAccountInitCode = async (factoryAddress, owner, index = 0n) => {
-    if (!owner)
-        throw new Error("Owner account not found");
-    return (0, viem_1.concatHex)([
-        factoryAddress,
-        (0, viem_1.encodeFunctionData)({
-            abi: [
-                {
-                    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"
-                }
-            ],
-            functionName: "createAccount",
-            args: [owner, index]
-        })
-    ]);
-};
-const getAccountAddress = async ({ client, factoryAddress, entryPoint, owner }) => {
-    const initCode = await getAccountInitCode(factoryAddress, owner);
-    return (0, getSenderAddress_js_1.getSenderAddress)(client, {
-        initCode,
-        entryPoint
-    });
-};
-async function privateKeyToSimpleSmartAccount(client, { privateKey, factoryAddress, entryPoint }) {
+const signerToSimpleSmartAccount_js_1 = require("./signerToSimpleSmartAccount.js");
+async function privateKeyToSimpleSmartAccount(client, { privateKey, factoryAddress, entryPoint, index = 0n }) {
     const privateKeyAccount = (0, accounts_1.privateKeyToAccount)(privateKey);
-    const [accountAddress, chainId] = await Promise.all([
-        getAccountAddress({
-            client,
-            factoryAddress,
-            entryPoint,
-            owner: privateKeyAccount.address
-        }),
-        (0, actions_1.getChainId)(client)
-    ]);
-    if (!accountAddress)
-        throw new Error("Account address not found");
-    const account = (0, accounts_1.toAccount)({
-        address: accountAddress,
-        async signMessage({ message }) {
-            return privateKeyAccount.signMessage({ message });
-        },
-        async signTransaction(_, __) {
-            throw new SignTransactionNotSupportedBySmartAccount();
-        },
-        async signTypedData(typedData) {
-            return privateKeyAccount.signTypedData({ ...typedData, privateKey });
-        }
+    return (0, signerToSimpleSmartAccount_js_1.signerToSimpleSmartAccount)(client, {
+        signer: privateKeyAccount,
+        factoryAddress,
+        entryPoint,
+        index
     });
-    return {
-        ...account,
-        client: client,
-        publicKey: accountAddress,
-        entryPoint: entryPoint,
-        source: "privateKeySimpleSmartAccount",
-        async getNonce() {
-            return (0, getAccountNonce_js_1.getAccountNonce)(client, {
-                sender: accountAddress,
-                entryPoint: entryPoint
-            });
-        },
-        async signUserOperation(userOperation) {
-            return account.signMessage({
-                message: {
-                    raw: (0, getUserOperationHash_js_1.getUserOperationHash)({
-                        userOperation,
-                        entryPoint: entryPoint,
-                        chainId: chainId
-                    })
-                }
-            });
-        },
-        async getInitCode() {
-            const contractCode = await (0, actions_1.getBytecode)(client, {
-                address: accountAddress
-            });
-            if ((contractCode?.length ?? 0) > 2)
-                return "0x";
-            return getAccountInitCode(factoryAddress, privateKeyAccount.address);
-        },
-        async encodeDeployCallData(_) {
-            throw new Error("Simple account doesn't support account deployment");
-        },
-        async encodeCallData({ to, value, data }) {
-            return (0, viem_1.encodeFunctionData)({
-                abi: [
-                    {
-                        inputs: [
-                            {
-                                internalType: "address",
-                                name: "dest",
-                                type: "address"
-                            },
-                            {
-                                internalType: "uint256",
-                                name: "value",
-                                type: "uint256"
-                            },
-                            {
-                                internalType: "bytes",
-                                name: "func",
-                                type: "bytes"
-                            }
-                        ],
-                        name: "execute",
-                        outputs: [],
-                        stateMutability: "nonpayable",
-                        type: "function"
-                    }
-                ],
-                functionName: "execute",
-                args: [to, value, data]
-            });
-        },
-        async getDummySignature() {
-            return "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
-        }
-    };
 }
 exports.privateKeyToSimpleSmartAccount = privateKeyToSimpleSmartAccount;
 //# sourceMappingURL=privateKeyToSimpleSmartAccount.js.map

package/_cjs/accounts/privateKeyToSimpleSmartAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"privateKeyToSimpleSmartAccount.js","sourceRoot":"","sources":["../../accounts/privateKeyToSimpleSmartAccount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"privateKeyToSimpleSmartAccount.js","sourceRoot":"","sources":["../../accounts/privateKeyToSimpleSmartAccount.ts"],"names":[],"mappings":";;;AAOA,4CAAmD;AACnD,mFAGwC;AAOjC,KAAK,UAAU,8BAA8B,CAIhD,MAAkC,EAClC,EACI,UAAU,EACV,cAAc,EACd,UAAU,EACV,KAAK,GAAG,EAAE,EAMb;IAED,MAAM,iBAAiB,GAAG,IAAA,8BAAmB,EAAC,UAAU,CAAC,CAAA;IAEzD,OAAO,IAAA,0DAA0B,EAAC,MAAM,EAAE;QACtC,MAAM,EAAE,iBAAiB;QACzB,cAAc;QACd,UAAU;QACV,KAAK;KACR,CAAC,CAAA;AACN,CAAC;AAzBD,wEAyBC"}