@zerodev/sdk 5.1.12 → 5.2.0-alpha-0

package/_cjs/accounts/kernel/v1/createKernelV1Account.js

@@ -45,8 +45,8 @@ const KERNEL_V1_ADDRESSES = {
     FACTORY_ADDRESS: "0x4E4946298614FC299B50c947289F4aD0572CB9ce",
     ENTRYPOINT_V0_6: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
 };
-async function createKernelV1Account(client, { signer, entrypoint = KERNEL_V1_ADDRESSES.ENTRYPOINT_V0_6, index = 0n }) {
-    if (entrypoint !== KERNEL_V1_ADDRESSES.ENTRYPOINT_V0_6) {
+async function createKernelV1Account(client, { signer, entrypoint: entryPointAddress = permissionless_1.ENTRYPOINT_ADDRESS_V06, index = 0n }) {
+    if (entryPointAddress !== permissionless_1.ENTRYPOINT_ADDRESS_V06) {
         throw new Error("Only EntryPoint 0.6 is supported");
     }
     const viemSigner = {
@@ -69,15 +69,16 @@ async function createKernelV1Account(client, { signer, entrypoint = KERNEL_V1_AD
     const initCode = await generateInitCode();
     const accountAddress = await (0, permissionless_1.getSenderAddress)(client, {
         initCode,
-        entryPoint: entrypoint
+        entryPoint: entryPointAddress
     });
     if (!accountAddress)
         throw new Error("Account address not found");
+    let smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
     const account = (0, accounts_2.toAccount)({
         address: accountAddress,
         async signMessage({ message }) {
             const [isDeployed, signature] = await Promise.all([
-                isAccountDeployed(),
+                (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress),
                 signer.signMessage({ message })
             ]);
             return create6492Signature(isDeployed, signature);
@@ -92,12 +93,6 @@ async function createKernelV1Account(client, { signer, entrypoint = KERNEL_V1_AD
             });
         }
     });
-    const isAccountDeployed = async () => {
-        const contractCode = await (0, actions_1.getBytecode)(client, {
-            address: accountAddress
-        });
-        return (contractCode?.length ?? 0) > 2;
-    };
     const create6492Signature = async (isDeployed, signature) => {
         if (isDeployed) {
             return signature;
@@ -113,13 +108,29 @@ async function createKernelV1Account(client, { signer, entrypoint = KERNEL_V1_AD
         ...account,
         client: client,
         publicKey: accountAddress,
-        entryPoint: entrypoint,
+        entryPoint: entryPointAddress,
         source: "kernelSmartAccount",
         generateInitCode,
+        async getFactory() {
+            if (smartAccountDeployed)
+                return undefined;
+            smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
+            if (smartAccountDeployed)
+                return undefined;
+            return KERNEL_V1_ADDRESSES.FACTORY_ADDRESS;
+        },
+        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() {
             return (0, permissionless_1.getAccountNonce)(client, {
                 sender: accountAddress,
-                entryPoint: entrypoint
+                entryPoint: entryPointAddress
             });
         },
         async signUserOperation(userOperation) {
@@ -128,7 +139,7 @@ async function createKernelV1Account(client, { signer, entrypoint = KERNEL_V1_AD
                     ...userOperation,
                     signature: "0x"
                 },
-                entryPoint: entrypoint,
+                entryPoint: entryPointAddress,
                 chainId: chainId
             });
             const signature = await (0, actions_1.signMessage)(client, {
@@ -138,12 +149,12 @@ async function createKernelV1Account(client, { signer, entrypoint = KERNEL_V1_AD
             return signature;
         },
         async getInitCode() {
-            if (await isAccountDeployed()) {
+            if (smartAccountDeployed)
                 return "0x";
-            }
-            else {
-                return generateInitCode();
-            }
+            smartAccountDeployed = await (0, permissionless_1.isSmartAccountDeployed)(client, accountAddress);
+            if (smartAccountDeployed)
+                return "0x";
+            return generateInitCode();
         },
         async encodeCallData(_tx) {
             const tx = _tx;

package/_cjs/accounts/kernel/v1/createKernelV1Account.js.map

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

package/_cjs/accounts/utils/6492.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyEIP6492Signature = exports.wrapSignatureWith6492 = void 0;
+exports.getKernelImplementationAddress = exports.verifyEIP6492Signature = exports.universalValidatorByteCode = exports.wrapSignatureWith6492 = void 0;
+const permissionless_1 = require("permissionless");
 const viem_1 = require("viem");
+const actions_1 = require("viem/actions");
 const wrapSignatureWith6492 = ({ factoryAddress, factoryCalldata, signature }) => {
     return (0, viem_1.concat)([
         (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, bytes, bytes"), [
@@ -13,11 +15,11 @@ const wrapSignatureWith6492 = ({ factoryAddress, factoryCalldata, signature }) =
     ]);
 };
 exports.wrapSignatureWith6492 = wrapSignatureWith6492;
-const universalValidatorByteCode = "0x60806040523480156200001157600080fd5b50604051620007003803806200070083398101604081905262000034916200056f565b6000620000438484846200004f565b9050806000526001601ff35b600080846001600160a01b0316803b806020016040519081016040528181526000908060200190933c90507f6492649264926492649264926492649264926492649264926492649264926492620000a68462000451565b036200021f57600060608085806020019051810190620000c79190620005ce565b8651929550909350915060000362000192576000836001600160a01b031683604051620000f5919062000643565b6000604051808303816000865af19150503d806000811462000134576040519150601f19603f3d011682016040523d82523d6000602084013e62000139565b606091505b5050905080620001905760405162461bcd60e51b815260206004820152601e60248201527f5369676e617475726556616c696461746f723a206465706c6f796d656e74000060448201526064015b60405180910390fd5b505b604051630b135d3f60e11b808252906001600160a01b038a1690631626ba7e90620001c4908b90869060040162000661565b602060405180830381865afa158015620001e2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200020891906200069d565b6001600160e01b031916149450505050506200044a565b805115620002b157604051630b135d3f60e11b808252906001600160a01b03871690631626ba7e9062000259908890889060040162000661565b602060405180830381865afa15801562000277573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200029d91906200069d565b6001600160e01b031916149150506200044a565b8251604114620003195760405162461bcd60e51b815260206004820152603a6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e6174757265206c656e677468000000000000606482015260840162000187565b620003236200046b565b506020830151604080850151855186939260009185919081106200034b576200034b620006c9565b016020015160f81c9050601b81148015906200036b57508060ff16601c14155b15620003cf5760405162461bcd60e51b815260206004820152603b6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e617475726520762076616c75650000000000606482015260840162000187565b6040805160008152602081018083528a905260ff83169181019190915260608101849052608081018390526001600160a01b038a169060019060a0016020604051602081039080840390855afa1580156200042e573d6000803e3d6000fd5b505050602060405103516001600160a01b031614955050505050505b9392505050565b60006020825110156200046357600080fd5b508051015190565b60405180606001604052806003906020820280368337509192915050565b6001600160a01b03811681146200049f57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620004d5578181015183820152602001620004bb565b50506000910152565b600082601f830112620004f057600080fd5b81516001600160401b03808211156200050d576200050d620004a2565b604051601f8301601f19908116603f01168101908282118183101715620005385762000538620004a2565b816040528381528660208588010111156200055257600080fd5b62000565846020830160208901620004b8565b9695505050505050565b6000806000606084860312156200058557600080fd5b8351620005928162000489565b6020850151604086015191945092506001600160401b03811115620005b657600080fd5b620005c486828701620004de565b9150509250925092565b600080600060608486031215620005e457600080fd5b8351620005f18162000489565b60208501519093506001600160401b03808211156200060f57600080fd5b6200061d87838801620004de565b935060408601519150808211156200063457600080fd5b50620005c486828701620004de565b6000825162000657818460208701620004b8565b9190910192915050565b828152604060208201526000825180604084015262000688816060850160208701620004b8565b601f01601f1916919091016060019392505050565b600060208284031215620006b057600080fd5b81516001600160e01b0319811681146200044a57600080fd5b634e487b7160e01b600052603260045260246000fdfe5369676e617475726556616c696461746f72237265636f7665725369676e6572";
+exports.universalValidatorByteCode = "0x60806040523480156200001157600080fd5b50604051620007003803806200070083398101604081905262000034916200056f565b6000620000438484846200004f565b9050806000526001601ff35b600080846001600160a01b0316803b806020016040519081016040528181526000908060200190933c90507f6492649264926492649264926492649264926492649264926492649264926492620000a68462000451565b036200021f57600060608085806020019051810190620000c79190620005ce565b8651929550909350915060000362000192576000836001600160a01b031683604051620000f5919062000643565b6000604051808303816000865af19150503d806000811462000134576040519150601f19603f3d011682016040523d82523d6000602084013e62000139565b606091505b5050905080620001905760405162461bcd60e51b815260206004820152601e60248201527f5369676e617475726556616c696461746f723a206465706c6f796d656e74000060448201526064015b60405180910390fd5b505b604051630b135d3f60e11b808252906001600160a01b038a1690631626ba7e90620001c4908b90869060040162000661565b602060405180830381865afa158015620001e2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200020891906200069d565b6001600160e01b031916149450505050506200044a565b805115620002b157604051630b135d3f60e11b808252906001600160a01b03871690631626ba7e9062000259908890889060040162000661565b602060405180830381865afa15801562000277573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200029d91906200069d565b6001600160e01b031916149150506200044a565b8251604114620003195760405162461bcd60e51b815260206004820152603a6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e6174757265206c656e677468000000000000606482015260840162000187565b620003236200046b565b506020830151604080850151855186939260009185919081106200034b576200034b620006c9565b016020015160f81c9050601b81148015906200036b57508060ff16601c14155b15620003cf5760405162461bcd60e51b815260206004820152603b6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e617475726520762076616c75650000000000606482015260840162000187565b6040805160008152602081018083528a905260ff83169181019190915260608101849052608081018390526001600160a01b038a169060019060a0016020604051602081039080840390855afa1580156200042e573d6000803e3d6000fd5b505050602060405103516001600160a01b031614955050505050505b9392505050565b60006020825110156200046357600080fd5b508051015190565b60405180606001604052806003906020820280368337509192915050565b6001600160a01b03811681146200049f57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620004d5578181015183820152602001620004bb565b50506000910152565b600082601f830112620004f057600080fd5b81516001600160401b03808211156200050d576200050d620004a2565b604051601f8301601f19908116603f01168101908282118183101715620005385762000538620004a2565b816040528381528660208588010111156200055257600080fd5b62000565846020830160208901620004b8565b9695505050505050565b6000806000606084860312156200058557600080fd5b8351620005928162000489565b6020850151604086015191945092506001600160401b03811115620005b657600080fd5b620005c486828701620004de565b9150509250925092565b600080600060608486031215620005e457600080fd5b8351620005f18162000489565b60208501519093506001600160401b03808211156200060f57600080fd5b6200061d87838801620004de565b935060408601519150808211156200063457600080fd5b50620005c486828701620004de565b6000825162000657818460208701620004b8565b9190910192915050565b828152604060208201526000825180604084015262000688816060850160208701620004b8565b601f01601f1916919091016060019392505050565b600060208284031215620006b057600080fd5b81516001600160e01b0319811681146200044a57600080fd5b634e487b7160e01b600052603260045260246000fdfe5369676e617475726556616c696461746f72237265636f7665725369676e6572";
 const verifyEIP6492Signature = async ({ signer, hash, signature, client }) => {
     const result = await client.call({
         data: (0, viem_1.concat)([
-            universalValidatorByteCode,
+            exports.universalValidatorByteCode,
             (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("address, bytes32, bytes"), [
                 signer,
                 hash,
@@ -28,4 +30,18 @@ const verifyEIP6492Signature = async ({ signer, hash, signature, client }) => {
     return result.data === "0x01";
 };
 exports.verifyEIP6492Signature = verifyEIP6492Signature;
+const getKernelImplementationAddress = async (client, accountAddress) => {
+    let kernelImplAddr;
+    try {
+        const strgAddr = await (0, permissionless_1.getAction)(client, actions_1.getStorageAt)({
+            address: accountAddress,
+            slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
+        });
+        if (strgAddr)
+            kernelImplAddr = `0x${strgAddr.slice(26)}`;
+    }
+    catch (error) { }
+    return kernelImplAddr;
+};
+exports.getKernelImplementationAddress = getKernelImplementationAddress;
 //# sourceMappingURL=6492.js.map

package/_cjs/accounts/utils/6492.js.map

@@ -1 +1 @@
-{"version":3,"file":"6492.js","sourceRoot":"","sources":["../../../accounts/utils/6492.ts"],"names":[],"mappings":";;;AAEA,+BAQa;AAeN,MAAM,qBAAqB,GAAG,CAAC,EAClC,cAAc,EACd,eAAe,EACf,SAAS,EACQ,EAAQ,EAAE;IAQ3B,OAAO,IAAA,aAAM,EAAC;QACV,IAAA,0BAAmB,EAAC,IAAA,yBAAkB,EAAC,uBAAuB,CAAC,EAAE;YAC7D,cAAc;YACd,eAAe;YACf,SAAS;SACZ,CAAC;QACF,oEAAoE;KACvE,CAAC,CAAA;AACN,CAAC,CAAA;AApBY,QAAA,qBAAqB,yBAoBjC;AAGD,MAAM,0BAA0B,GAC5B,ogHAAogH,CAAA;AAEjgH,MAAM,sBAAsB,GAAG,KAAK,EAAE,EACzC,MAAM,EACN,IAAI,EACJ,SAAS,EACT,MAAM,EACqB,EAAoB,EAAE;IACjD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC;QAC7B,IAAI,EAAE,IAAA,aAAM,EAAC;YACT,0BAA0B;YAC1B,IAAA,0BAAmB,EAAC,IAAA,yBAAkB,EAAC,yBAAyB,CAAC,EAAE;gBAC/D,MAAM;gBACN,IAAI;gBACJ,SAAS;aACZ,CAAC;SACL,CAAC;KACL,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,IAAI,KAAK,MAAM,CAAA;AACjC,CAAC,CAAA;AAlBY,QAAA,sBAAsB,0BAkBlC"}
+{"version":3,"file":"6492.js","sourceRoot":"","sources":["../../../accounts/utils/6492.ts"],"names":[],"mappings":";;;AAEA,mDAA0C;AAC1C,+BAWa;AACb,0CAA2C;AAepC,MAAM,qBAAqB,GAAG,CAAC,EAClC,cAAc,EACd,eAAe,EACf,SAAS,EACQ,EAAQ,EAAE;IAQ3B,OAAO,IAAA,aAAM,EAAC;QACV,IAAA,0BAAmB,EAAC,IAAA,yBAAkB,EAAC,uBAAuB,CAAC,EAAE;YAC7D,cAAc;YACd,eAAe;YACf,SAAS;SACZ,CAAC;QACF,oEAAoE;KACvE,CAAC,CAAA;AACN,CAAC,CAAA;AApBY,QAAA,qBAAqB,yBAoBjC;AAGY,QAAA,0BAA0B,GACnC,ogHAAogH,CAAA;AAEjgH,MAAM,sBAAsB,GAAG,KAAK,EAAE,EACzC,MAAM,EACN,IAAI,EACJ,SAAS,EACT,MAAM,EACqB,EAAoB,EAAE;IACjD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC;QAC7B,IAAI,EAAE,IAAA,aAAM,EAAC;YACT,kCAA0B;YAC1B,IAAA,0BAAmB,EAAC,IAAA,yBAAkB,EAAC,yBAAyB,CAAC,EAAE;gBAC/D,MAAM;gBACN,IAAI;gBACJ,SAAS;aACZ,CAAC;SACL,CAAC;KACL,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,IAAI,KAAK,MAAM,CAAA;AACjC,CAAC,CAAA;AAlBY,QAAA,sBAAsB,0BAkBlC;AAEM,MAAM,8BAA8B,GAAG,KAAK,EAI/C,MAA6C,EAC7C,cAAuB,EACK,EAAE;IAC9B,IAAI,cAAmC,CAAA;IACvC,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAS,EAC5B,MAAM,EACN,sBAAY,CACf,CAAC;YACE,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,oEAAoE;SAC7E,CAAC,CAAA;QACF,IAAI,QAAQ;YAAE,cAAc,GAAG,KAAK,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAS,CAAA;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;IAClB,OAAO,cAAc,CAAA;AACzB,CAAC,CAAA;AAnBY,QAAA,8BAA8B,kCAmB1C"}

package/_cjs/accounts/utils/index.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFactoryAddressAndCallDataFromAccountInitCode = exports.verifyEIP6492Signature = exports.toKernelPluginManager = void 0;
-const toKernelPluginManager_js_1 = require("./toKernelPluginManager.js");
+exports.parseFactoryAddressAndCallDataFromAccountInitCode = exports.universalValidatorByteCode = exports.verifyEIP6492Signature = exports.toKernelPluginManager = void 0;
+var toKernelPluginManager_js_1 = require("./toKernelPluginManager.js");
 Object.defineProperty(exports, "toKernelPluginManager", { enumerable: true, get: function () { return toKernelPluginManager_js_1.toKernelPluginManager; } });
-const _6492_js_1 = require("./6492.js");
+var _6492_js_1 = require("./6492.js");
 Object.defineProperty(exports, "verifyEIP6492Signature", { enumerable: true, get: function () { return _6492_js_1.verifyEIP6492Signature; } });
+Object.defineProperty(exports, "universalValidatorByteCode", { enumerable: true, get: function () { return _6492_js_1.universalValidatorByteCode; } });
 const parseFactoryAddressAndCallDataFromAccountInitCode = (initCode) => {
     const factoryAddress = `0x${initCode.substring(2, 42)}`;
     const factoryCalldata = `0x${initCode.substring(42)}`;

package/_cjs/accounts/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../accounts/utils/index.ts"],"names":[],"mappings":";;;AAAA,yEAAkE;AACzD,sGADA,gDAAqB,OACA;AAG9B,wCAAkD;AACzC,uGADA,iCAAsB,OACA;AAExB,MAAM,iDAAiD,GAAG,CAC7D,QAAa,EACC,EAAE;IAChB,MAAM,cAAc,GAAG,KAAK,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAa,CAAA;IAClE,MAAM,eAAe,GAAG,KAAK,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,EAAS,CAAA;IAC5D,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAA;AAC5C,CAAC,CAAA;AANY,QAAA,iDAAiD,qDAM7D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../accounts/utils/index.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAAzD,iIAAA,qBAAqB,OAAA;AAG9B,sCAA8E;AAArE,kHAAA,sBAAsB,OAAA;AAAE,sHAAA,0BAA0B,OAAA;AAEpD,MAAM,iDAAiD,GAAG,CAC7D,QAAa,EACC,EAAE;IAChB,MAAM,cAAc,GAAG,KAAK,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAa,CAAA;IAClE,MAAM,eAAe,GAAG,KAAK,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,EAAS,CAAA;IAC5D,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAA;AAC5C,CAAC,CAAA;AANY,QAAA,iDAAiD,qDAM7D"}

package/_cjs/accounts/utils/toKernelPluginManager.js

@@ -7,6 +7,9 @@ const actions_1 = require("viem/actions");
 const constants_js_1 = require("../../constants.js");
 const kernel_js_1 = require("../../types/kernel.js");
 const utils_js_1 = require("../../utils.js");
+const KernelAccountAbi_js_1 = require("../kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js");
+const KernelModuleAbi_js_1 = require("../kernel/abi/kernel_v_3_0_0/KernelModuleAbi.js");
+const _6492_js_1 = require("./6492.js");
 function isKernelPluginManager(plugin) {
     return plugin.getPluginEnableSignature !== undefined;
 }
@@ -14,38 +17,86 @@ exports.isKernelPluginManager = isKernelPluginManager;
 async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignature, validatorInitData, executorData = {
     executor: viem_1.zeroAddress,
     selector: (0, viem_1.toFunctionSelector)("execute(address, uint256, bytes, uint8)")
-}, validAfter = 0, validUntil = 0 }) {
+}, validAfter = 0, validUntil = 0, entryPoint: entryPointAddress }) {
+    const entryPointVersion = (0, permissionless_1.getEntryPointVersion)(entryPointAddress);
     const chainId = await (0, actions_1.getChainId)(client);
-    const getValidatorSignature = async (accountAddress, selector) => {
+    const activeValidator = regular || sudo;
+    if (!activeValidator) {
+        throw new Error("One of `sudo` or `regular` validator must be set");
+    }
+    const getValidatorSignature = async (accountAddress, selector, sig) => {
+        if (entryPointVersion === "v0.6") {
+            if (regular) {
+                if (await regular.isEnabled(accountAddress, selector)) {
+                    return kernel_js_1.ValidatorMode.plugin;
+                }
+                const enableSignature = await getPluginEnableSignature(accountAddress);
+                const enableData = await regular.getEnableData(accountAddress);
+                const enableDataLength = enableData.length / 2 - 1;
+                if (!enableSignature) {
+                    throw new Error("Enable signature not set");
+                }
+                return (0, viem_1.concat)([
+                    kernel_js_1.ValidatorMode.enable,
+                    (0, viem_1.pad)((0, viem_1.toHex)(validUntil), { size: 6 }),
+                    (0, viem_1.pad)((0, viem_1.toHex)(validAfter), { size: 6 }),
+                    (0, viem_1.pad)(regular.address, { size: 20 }),
+                    (0, viem_1.pad)(executorData.executor, { size: 20 }),
+                    (0, viem_1.pad)((0, viem_1.toHex)(enableDataLength), { size: 32 }),
+                    enableData,
+                    (0, viem_1.pad)((0, viem_1.toHex)(enableSignature.length / 2 - 1), { size: 32 }),
+                    enableSignature
+                ]);
+            }
+            else if (sudo) {
+                return kernel_js_1.ValidatorMode.sudo;
+            }
+            else {
+                throw new Error("One of `sudo` or `regular` validator must be set");
+            }
+        }
         if (regular) {
-            if (await regular.isEnabled(accountAddress, selector)) {
-                return kernel_js_1.ValidatorMode.plugin;
+            if ((await isPluginInitialized_7579(accountAddress)) ||
+                (await regular.isEnabled(accountAddress, selector))) {
+                return sig ?? "0x";
             }
-            const enableSignature = await getPluginEnableSignature(accountAddress);
             const enableData = await regular.getEnableData(accountAddress);
-            const enableDataLength = enableData.length / 2 - 1;
-            if (!enableSignature) {
-                throw new Error("Enable signature not set");
-            }
+            const enableSignature = await getPluginEnableSignature(accountAddress);
             return (0, viem_1.concat)([
-                kernel_js_1.ValidatorMode.enable,
-                (0, viem_1.pad)((0, viem_1.toHex)(validUntil), { size: 6 }),
-                (0, viem_1.pad)((0, viem_1.toHex)(validAfter), { size: 6 }),
-                (0, viem_1.pad)(regular.address, { size: 20 }),
-                (0, viem_1.pad)(executorData.executor, { size: 20 }),
-                (0, viem_1.pad)((0, viem_1.toHex)(enableDataLength), { size: 32 }),
-                enableData,
-                (0, viem_1.pad)((0, viem_1.toHex)(enableSignature.length / 2 - 1), { size: 32 }),
-                enableSignature
+                viem_1.zeroAddress,
+                (0, viem_1.encodeAbiParameters)((0, viem_1.parseAbiParameters)("bytes validatorData, bytes hookData, bytes selectorData, bytes enableSig, bytes userOpSig"), [
+                    enableData,
+                    "0x",
+                    (0, viem_1.concat)([
+                        executorData.selector,
+                        executorData.executor,
+                        viem_1.zeroAddress,
+                        "0x"
+                    ]),
+                    enableSignature,
+                    sig ?? "0x"
+                ])
             ]);
         }
         else if (sudo) {
-            return kernel_js_1.ValidatorMode.sudo;
+            return sig ?? "0x";
         }
         else {
             throw new Error("One of `sudo` or `regular` validator must be set");
         }
     };
+    const isPluginInitialized_7579 = async (accountAddress) => {
+        try {
+            return await (0, permissionless_1.getAction)(client, actions_1.readContract)({
+                abi: KernelModuleAbi_js_1.KernelModuleIsInitializedAbi,
+                address: activeValidator.address,
+                functionName: "isInitialized",
+                args: [accountAddress]
+            });
+        }
+        catch (error) { }
+        return false;
+    };
     const getPluginEnableSignature = async (accountAddress) => {
         if (pluginEnableSignature)
             return pluginEnableSignature;
@@ -53,63 +104,114 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
             throw new Error("sudo validator not set -- need it to enable the validator");
         if (!regular)
             throw new Error("regular validator not set");
-        let kernelImplAddr;
-        try {
-            const strgAddr = await (0, permissionless_1.getAction)(client, actions_1.getStorageAt)({
-                address: accountAddress,
-                slot: "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc"
+        const kernelImplAddr = await (0, _6492_js_1.getKernelImplementationAddress)(client, accountAddress);
+        const kernelVersion = (0, utils_js_1.getKernelVersion)(entryPointAddress, kernelImplAddr);
+        let ownerSig;
+        if (entryPointVersion === "v0.6") {
+            ownerSig = await sudo.signTypedData({
+                domain: {
+                    name: "Kernel",
+                    version: kernelVersion,
+                    chainId,
+                    verifyingContract: accountAddress
+                },
+                types: {
+                    ValidatorApproved: [
+                        { name: "sig", type: "bytes4" },
+                        { name: "validatorData", type: "uint256" },
+                        { name: "executor", type: "address" },
+                        { name: "enableData", type: "bytes" }
+                    ]
+                },
+                message: {
+                    sig: executorData.selector,
+                    validatorData: (0, viem_1.hexToBigInt)((0, viem_1.concatHex)([
+                        (0, viem_1.pad)((0, viem_1.toHex)(validUntil ?? 0), {
+                            size: 6
+                        }),
+                        (0, viem_1.pad)((0, viem_1.toHex)(validAfter ?? 0), {
+                            size: 6
+                        }),
+                        regular.address
+                    ]), { size: 32 }),
+                    executor: executorData.executor,
+                    enableData: await regular.getEnableData(accountAddress)
+                },
+                primaryType: "ValidatorApproved"
             });
-            if (strgAddr)
-                kernelImplAddr = `0x${strgAddr.slice(26)}`;
+            pluginEnableSignature = ownerSig;
+            return ownerSig;
         }
-        catch (error) { }
-        const ownerSig = await sudo.signTypedData({
+        ownerSig = await sudo.signTypedData({
             domain: {
                 name: "Kernel",
-                version: kernelImplAddr
-                    ? (0, utils_js_1.getKernelVersion)(kernelImplAddr)
-                    : constants_js_1.LATEST_KERNEL_VERSION,
+                version: kernelVersion,
                 chainId,
                 verifyingContract: accountAddress
             },
             types: {
-                ValidatorApproved: [
-                    { name: "sig", type: "bytes4" },
-                    { name: "validatorData", type: "uint256" },
-                    { name: "executor", type: "address" },
-                    { name: "enableData", type: "bytes" }
+                Enable: [
+                    { name: "validationId", type: "bytes21" },
+                    { name: "nonce", type: "uint32" },
+                    { name: "hook", type: "address" },
+                    { name: "validatorData", type: "bytes" },
+                    { name: "hookData", type: "bytes" },
+                    { name: "selectorData", type: "bytes" }
                 ]
             },
             message: {
-                sig: executorData.selector,
-                validatorData: (0, viem_1.hexToBigInt)((0, viem_1.concatHex)([
-                    (0, viem_1.pad)((0, viem_1.toHex)(validUntil ?? 0), {
-                        size: 6
-                    }),
-                    (0, viem_1.pad)((0, viem_1.toHex)(validAfter ?? 0), {
-                        size: 6
-                    }),
-                    regular.address
-                ]), { size: 32 }),
-                executor: executorData.executor,
-                enableData: await regular.getEnableData(accountAddress)
+                validationId: (0, viem_1.concat)([
+                    activeValidator.isPermissionValidator
+                        ? constants_js_1.VALIDATOR_TYPE.PERMISSION
+                        : constants_js_1.VALIDATOR_TYPE.SECONDARY,
+                    activeValidator?.isPermissionValidator
+                        ?
+                            (0, viem_1.pad)(regular.getPermissionId(), {
+                                size: 20,
+                                dir: "right"
+                            })
+                        : activeValidator.address
+                ]),
+                nonce: await getKernelV3Nonce(accountAddress),
+                hook: viem_1.zeroAddress,
+                validatorData: await regular.getEnableData(accountAddress),
+                hookData: "0x",
+                selectorData: (0, viem_1.concat)([
+                    executorData.selector,
+                    executorData.executor,
+                    viem_1.zeroAddress,
+                    "0x"
+                ])
             },
-            primaryType: "ValidatorApproved"
+            primaryType: "Enable"
         });
-        pluginEnableSignature = ownerSig;
         return ownerSig;
     };
-    const activeValidator = regular || sudo;
-    if (!activeValidator) {
-        throw new Error("One of `sudo` or `regular` validator must be set");
-    }
+    const getKernelV3Nonce = async (accountAddress) => {
+        try {
+            const nonce = await (0, permissionless_1.getAction)(client, actions_1.readContract)({
+                abi: KernelAccountAbi_js_1.KernelV3AccountAbi,
+                address: accountAddress,
+                functionName: "currentNonce",
+                args: []
+            });
+            return nonce;
+        }
+        catch (error) {
+            return 2;
+        }
+    };
     return {
         ...activeValidator,
         signUserOperation: async (userOperation) => {
-            return (0, viem_1.concatHex)([
-                await getValidatorSignature(userOperation.sender, userOperation.callData.toString().slice(0, 10)),
-                await activeValidator.signUserOperation(userOperation)
-            ]);
+            const userOpSig = await activeValidator.signUserOperation(userOperation);
+            if (entryPointVersion === "v0.6") {
+                return (0, viem_1.concatHex)([
+                    await getValidatorSignature(userOperation.sender, userOperation.callData.toString().slice(0, 10)),
+                    userOpSig
+                ]);
+            }
+            return await getValidatorSignature(userOperation.sender, userOperation.callData.toString().slice(0, 10), userOpSig);
         },
         getExecutorData: () => executorData,
         getValidityData: () => ({
@@ -117,10 +219,40 @@ async function toKernelPluginManager(client, { sudo, regular, pluginEnableSignat
             validUntil
         }),
         getDummySignature: async (userOperation) => {
-            return (0, viem_1.concatHex)([
-                await getValidatorSignature(userOperation.sender, userOperation.callData.toString().slice(0, 10)),
-                await activeValidator.getDummySignature(userOperation)
-            ]);
+            const userOpSig = await activeValidator.getDummySignature(userOperation);
+            if (entryPointVersion === "v0.6") {
+                return (0, viem_1.concatHex)([
+                    await getValidatorSignature(userOperation.sender, userOperation.callData.toString().slice(0, 10)),
+                    userOpSig
+                ]);
+            }
+            return await getValidatorSignature(userOperation.sender, userOperation.callData.toString().slice(0, 10), userOpSig);
+        },
+        getNonceKey: async (accountAddress = viem_1.zeroAddress) => {
+            if (entryPointVersion === "v0.6")
+                return await activeValidator.getNonceKey();
+            return BigInt((0, viem_1.pad)((0, viem_1.concatHex)([
+                !regular ||
+                    (await regular.isEnabled(accountAddress, executorData.selector)) ||
+                    (await isPluginInitialized_7579(accountAddress))
+                    ? constants_js_1.VALIDATOR_MODE.DEFAULT
+                    : constants_js_1.VALIDATOR_MODE.ENABLE,
+                regular
+                    ? regular.isPermissionValidator
+                        ? constants_js_1.VALIDATOR_TYPE.PERMISSION
+                        : constants_js_1.VALIDATOR_TYPE.SECONDARY
+                    : constants_js_1.VALIDATOR_TYPE.SUDO,
+                regular?.isPermissionValidator
+                    ?
+                        (0, viem_1.pad)(regular.getPermissionId(), {
+                            size: 20,
+                            dir: "right"
+                        })
+                    : activeValidator.address,
+                (0, viem_1.pad)((0, viem_1.toHex)(await activeValidator.getNonceKey()), {
+                    size: 2
+                })
+            ]), { size: 24 }));
         },
         getPluginEnableSignature,
         getValidatorInitData: async () => {

package/_cjs/accounts/utils/toKernelPluginManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":";;;AAAA,mDAA0C;AAC1C,+BAaa;AACb,0CAAuD;AACvD,qDAA0D;AAC1D,qDAI8B;AAC9B,6CAAiD;AAEjD,SAAgB,qBAAqB,CAEjC,MAAW;IAEX,OAAO,MAAM,CAAC,wBAAwB,KAAK,SAAS,CAAA;AACxD,CAAC;AALD,sDAKC;AAEM,KAAK,UAAU,qBAAqB,CAIvC,MAAkC,EAClC,EACI,IAAI,EACJ,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EACjB,YAAY,GAAG;IACX,QAAQ,EAAE,kBAAW;IACrB,QAAQ,EAAE,IAAA,yBAAkB,EACxB,yCAAyC,CAC5C;CACJ,EACD,UAAU,GAAG,CAAC,EACd,UAAU,GAAG,CAAC,EACU;IAE5B,MAAM,OAAO,GAAG,MAAM,IAAA,oBAAU,EAAC,MAAM,CAAC,CAAA;IACxC,MAAM,qBAAqB,GAAG,KAAK,EAC/B,cAAuB,EACvB,QAAa,EACD,EAAE;QACd,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,MAAM,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACpD,OAAO,yBAAa,CAAC,MAAM,CAAA;YAC/B,CAAC;YAED,MAAM,eAAe,GACjB,MAAM,wBAAwB,CAAC,cAAc,CAAC,CAAA;YAClD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;YAC9D,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAA;YAClD,IAAI,CAAC,eAAe,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;YAC/C,CAAC;YAED,OAAO,IAAA,aAAM,EAAC;gBACV,yBAAa,CAAC,MAAM;gBACpB,IAAA,UAAG,EAAC,IAAA,YAAK,EAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;gBACnC,IAAA,UAAG,EAAC,IAAA,YAAK,EAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;gBACnC,IAAA,UAAG,EAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;gBAClC,IAAA,UAAG,EAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;gBACxC,IAAA,UAAG,EAAC,IAAA,YAAK,EAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;gBAC1C,UAAU;gBACV,IAAA,UAAG,EAAC,IAAA,YAAK,EAAC,eAAe,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;gBACxD,eAAe;aAClB,CAAC,CAAA;QACN,CAAC;aAAM,IAAI,IAAI,EAAE,CAAC;YACd,OAAO,yBAAa,CAAC,IAAI,CAAA;QAC7B,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;QACvE,CAAC;IACL,CAAC,CAAA;IAED,MAAM,wBAAwB,GAAG,KAAK,EAAE,cAAuB,EAAE,EAAE;QAC/D,IAAI,qBAAqB;YAAE,OAAO,qBAAqB,CAAA;QACvD,IAAI,CAAC,IAAI;YACL,MAAM,IAAI,KAAK,CACX,2DAA2D,CAC9D,CAAA;QACL,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;QAC1D,IAAI,cAAmC,CAAA;QACvC,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAA,0BAAS,EAC5B,MAAM,EACN,sBAAY,CACf,CAAC;gBACE,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,oEAAoE;aAC7E,CAAC,CAAA;YACF,IAAI,QAAQ;gBAAE,cAAc,GAAG,KAAK,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAS,CAAA;QACnE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC,CAAA,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC;YACtC,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,cAAc;oBACnB,CAAC,CAAC,IAAA,2BAAgB,EAAC,cAAc,CAAC;oBAClC,CAAC,CAAC,oCAAqB;gBAC3B,OAAO;gBACP,iBAAiB,EAAE,cAAc;aACpC;YACD,KAAK,EAAE;gBACH,iBAAiB,EAAE;oBACf,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC/B,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC1C,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;oBACrC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE;iBACxC;aACJ;YACD,OAAO,EAAE;gBACL,GAAG,EAAE,YAAY,CAAC,QAAQ;gBAC1B,aAAa,EAAE,IAAA,kBAAW,EACtB,IAAA,gBAAS,EAAC;oBACN,IAAA,UAAG,EAAC,IAAA,YAAK,EAAC,UAAU,IAAI,CAAC,CAAC,EAAE;wBACxB,IAAI,EAAE,CAAC;qBACV,CAAC;oBACF,IAAA,UAAG,EAAC,IAAA,YAAK,EAAC,UAAU,IAAI,CAAC,CAAC,EAAE;wBACxB,IAAI,EAAE,CAAC;qBACV,CAAC;oBACF,OAAO,CAAC,OAAO;iBAClB,CAAC,EACF,EAAE,IAAI,EAAE,EAAE,EAAE,CACf;gBACD,QAAQ,EAAE,YAAY,CAAC,QAAmB;gBAC1C,UAAU,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC;aAC1D;YACD,WAAW,EAAE,mBAAmB;SACnC,CAAC,CAAA;QACF,qBAAqB,GAAG,QAAQ,CAAA;QAChC,OAAO,QAAQ,CAAA;IACnB,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,OAAO,IAAI,IAAI,CAAA;IACvC,IAAI,CAAC,eAAe,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;IACvE,CAAC;IAED,OAAO;QACH,GAAG,eAAe;QAClB,iBAAiB,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE;YACvC,OAAO,IAAA,gBAAS,EAAC;gBACb,MAAM,qBAAqB,CACvB,aAAa,CAAC,MAAM,EACpB,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAQ,CACxD;gBACD,MAAM,eAAe,CAAC,iBAAiB,CAAC,aAAa,CAAC;aACzD,CAAC,CAAA;QACN,CAAC;QACD,eAAe,EAAE,GAAG,EAAE,CAAC,YAAY;QACnC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;YACpB,UAAU;YACV,UAAU;SACb,CAAC;QACF,iBAAiB,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE;YACvC,OAAO,IAAA,gBAAS,EAAC;gBACb,MAAM,qBAAqB,CACvB,aAAa,CAAC,MAAM,EACpB,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAQ,CACxD;gBACD,MAAM,eAAe,CAAC,iBAAiB,CAAC,aAAa,CAAC;aACzD,CAAC,CAAA;QACN,CAAC;QACD,wBAAwB;QACxB,oBAAoB,EAAE,KAAK,IAAI,EAAE;YAC7B,IAAI,iBAAiB;gBAAE,OAAO,iBAAiB,CAAA;YAC/C,OAAO;gBACH,gBAAgB,EAAE,IAAI,EAAE,OAAO,IAAI,eAAe,CAAC,OAAO;gBAE1D,UAAU,EACN,CAAC,MAAM,IAAI,EAAE,aAAa,EAAE,CAAC;oBAC7B,CAAC,MAAM,eAAe,CAAC,aAAa,EAAE,CAAC;aAC9C,CAAA;QACL,CAAC;KACJ,CAAA;AACL,CAAC;AA5JD,sDA4JC"}
+{"version":3,"file":"toKernelPluginManager.js","sourceRoot":"","sources":["../../../accounts/utils/toKernelPluginManager.ts"],"names":[],"mappings":"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"}

package/_cjs/actions/account-client/signUserOperation.js

@@ -8,7 +8,7 @@ async function signUserOperation(client, args) {
     if (!account_)
         throw new utils_1.AccountOrClientNotFoundError();
     const account = (0, utils_1.parseAccount)(account_);
-    const userOperation = await (0, utils_1.getAction)(client, smartAccount_1.prepareUserOperationRequest)(args);
+    const userOperation = await (0, utils_1.getAction)(client, (smartAccount_1.prepareUserOperationRequest))(args);
     userOperation.signature = await account.signUserOperation(userOperation);
     return userOperation;
 }

package/_cjs/actions/account-client/signUserOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"signUserOperation.js","sourceRoot":"","sources":["../../../actions/account-client/signUserOperation.ts"],"names":[],"mappings":";;;AAEA,sEAAiF;AAOjF,gDAI6B;AAwBtB,KAAK,UAAU,iBAAiB,CAKnC,MAA4C,EAC5C,IAAqD;IAErD,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAA;IACnD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,oCAA4B,EAAE,CAAA;IAEvD,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IAEtD,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAS,EACjC,MAAM,EACN,0CAA2B,CAC9B,CAAC,IAAI,CAAC,CAAA;IAEP,aAAa,CAAC,SAAS,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA;IAExE,OAAO,aAAa,CAAA;AACxB,CAAC;AArBD,8CAqBC"}
+{"version":3,"file":"signUserOperation.js","sourceRoot":"","sources":["../../../actions/account-client/signUserOperation.ts"],"names":[],"mappings":";;;AACA,sEAG4C;AAS5C,gDAI6B;AA2BtB,KAAK,UAAU,iBAAiB,CAQnC,MAA4C,EAC5C,IAAiE;IAEjE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAA;IACnD,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,oCAA4B,EAAE,CAAA;IAEvD,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAA6B,CAAA;IAElE,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAS,EACjC,MAAM,EACN,CAAA,0CAAqE,CAAA,CACxE,CAAC,IAAI,CAAC,CAAA;IAEP,aAAa,CAAC,SAAS,GAAG,MAAM,OAAO,CAAC,iBAAiB,CACrD,aAAgE,CACnE,CAAA;IAED,OAAO,aAA4C,CAAA;AACvD,CAAC;AA1BD,8CA0BC"}

package/_cjs/actions/paymaster/estimateGasInERC20.js.map

@@ -1 +1 @@
-{"version":3,"file":"estimateGasInERC20.js","sourceRoot":"","sources":["../../../actions/paymaster/estimateGasInERC20.ts"],"names":[],"mappings":";;;AAIA,gDAAkD;AAElD,sDAA0D;AAsBnD,MAAM,kBAAkB,GAAG,KAAK,EACnC,MAA8B,EAC9B,IAAkC,EACG,EAAE;IACvC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,6BAA6B;QACrC,MAAM,EAAE;YACJ;gBACI,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,EAAY;gBACnC,MAAM,EAAE,IAAA,mBAAW,EACf,IAAI,CAAC,aAAa,CACW;gBACjC,YAAY,EAAE,IAAI,CAAC,eAAe;gBAClC,iBAAiB,EACb,IAAI,CAAC,UAAU,IAAI,2BAAgB,CAAC,eAAe;aAC1D;SACJ;KACJ,CAAC,CAAA;IAEF,MAAM,MAAM,GAAkC;QAC1C,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,aAAa,EAAE,QAAQ,CAAC,aAAa;KACxC,CAAA;IAED,MAAM,MAAM,GACR,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAEvE,OAAO,EAAE,MAAM,EAAE,CAAA;AACrB,CAAC,CAAA;AA5BY,QAAA,kBAAkB,sBA4B9B"}
+{"version":3,"file":"estimateGasInERC20.js","sourceRoot":"","sources":["../../../actions/paymaster/estimateGasInERC20.ts"],"names":[],"mappings":";;;AAKA,gDAAkD;AAElD,sDAA0D;AAsBnD,MAAM,kBAAkB,GAAG,KAAK,EACnC,MAA0C,EAC1C,IAAkC,EACG,EAAE;IACvC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,6BAA6B;QACrC,MAAM,EAAE;YACJ;gBACI,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,EAAY;gBACnC,MAAM,EAAE,IAAA,mBAAW,EACf,IAAI,CAAC,aAAa,CACmB;gBACzC,YAAY,EAAE,IAAI,CAAC,eAAe;gBAClC,iBAAiB,EACb,IAAI,CAAC,UAAU,IAAI,2BAAgB,CAAC,eAAe;aAC1D;SACJ;KACJ,CAAC,CAAA;IAEF,MAAM,MAAM,GAAkC;QAC1C,eAAe,EAAE,QAAQ,CAAC,eAAe;QACzC,aAAa,EAAE,QAAQ,CAAC,aAAa;KACxC,CAAA;IAED,MAAM,MAAM,GACR,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAEvE,OAAO,EAAE,MAAM,EAAE,CAAA;AACrB,CAAC,CAAA;AA5BY,QAAA,kBAAkB,sBA4B9B"}