permissionless 0.1.19 → 0.1.20

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # permissionless
 
+## 0.1.20
+
+### Patch Changes
+
+- 00ecd59fc5915d0667e8f597f9b9537307b6da59: Added Kernel v0.3.0 smart account implementation which is ERC-7579 and EntryPoint v0.7 compliant including relevant testcases
+
 ## 0.1.19
 
 ### Patch Changes

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

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KernelV3ExecuteAbi = exports.KernelV3InitAbi = void 0;
+exports.KernelV3InitAbi = [
+    {
+        type: "function",
+        name: "initialize",
+        inputs: [
+            {
+                name: "_rootValidator",
+                type: "bytes21",
+                internalType: "ValidationId"
+            },
+            { name: "hook", type: "address", internalType: "contract IHook" },
+            { name: "validatorData", type: "bytes", internalType: "bytes" },
+            { name: "hookData", type: "bytes", internalType: "bytes" }
+        ],
+        outputs: [],
+        stateMutability: "nonpayable"
+    }
+];
+exports.KernelV3ExecuteAbi = [
+    {
+        type: "function",
+        name: "execute",
+        inputs: [
+            { name: "execMode", type: "bytes32", internalType: "ExecMode" },
+            { name: "executionCalldata", type: "bytes", internalType: "bytes" }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "executeFromExecutor",
+        inputs: [
+            { name: "execMode", type: "bytes32", internalType: "ExecMode" },
+            { name: "executionCalldata", type: "bytes", internalType: "bytes" }
+        ],
+        outputs: [
+            { name: "returnData", type: "bytes[]", internalType: "bytes[]" }
+        ],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "executeUserOp",
+        inputs: [
+            {
+                name: "userOp",
+                type: "tuple",
+                internalType: "struct PackedUserOperation",
+                components: [
+                    {
+                        name: "sender",
+                        type: "address",
+                        internalType: "address"
+                    },
+                    { name: "nonce", type: "uint256", internalType: "uint256" },
+                    { name: "initCode", type: "bytes", internalType: "bytes" },
+                    { name: "callData", type: "bytes", internalType: "bytes" },
+                    {
+                        name: "accountGasLimits",
+                        type: "bytes32",
+                        internalType: "bytes32"
+                    },
+                    {
+                        name: "preVerificationGas",
+                        type: "uint256",
+                        internalType: "uint256"
+                    },
+                    {
+                        name: "gasFees",
+                        type: "bytes32",
+                        internalType: "bytes32"
+                    },
+                    {
+                        name: "paymasterAndData",
+                        type: "bytes",
+                        internalType: "bytes"
+                    },
+                    { name: "signature", type: "bytes", internalType: "bytes" }
+                ]
+            },
+            { name: "userOpHash", type: "bytes32", internalType: "bytes32" }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    }
+];
+//# sourceMappingURL=KernelV3AccountAbi.js.map

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

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

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KernelV3MetaFactoryDeployWithFactoryAbi = void 0;
+exports.KernelV3MetaFactoryDeployWithFactoryAbi = [
+    {
+        type: "function",
+        name: "deployWithFactory",
+        inputs: [
+            {
+                name: "factory",
+                type: "address",
+                internalType: "contract KernelFactory"
+            },
+            { name: "createData", type: "bytes", internalType: "bytes" },
+            { name: "salt", type: "bytes32", internalType: "bytes32" }
+        ],
+        outputs: [{ name: "", type: "address", internalType: "address" }],
+        stateMutability: "payable"
+    }
+];
+//# sourceMappingURL=KernelV3MetaFactoryAbi.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"KernelV3MetaFactoryAbi.js","sourceRoot":"","sources":["../../../../accounts/kernel/abi/KernelV3MetaFactoryAbi.ts"],"names":[],"mappings":";;;AAAa,QAAA,uCAAuC,GAAG;IACnD;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE;YACJ;gBACI,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,wBAAwB;aACzC;YACD,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;YAC5D,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE;SAC7D;QACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,SAAS;KAC7B;CACK,CAAA"}

package/_cjs/accounts/kernel/constants.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VALIDATOR_MODE = exports.VALIDATOR_TYPE = exports.EXEC_TYPE = exports.CALL_TYPE = exports.ROOT_MODE_KERNEL_V2 = exports.DUMMY_ECDSA_SIGNATURE = void 0;
+exports.DUMMY_ECDSA_SIGNATURE = "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
+exports.ROOT_MODE_KERNEL_V2 = "0x00000000";
+var CALL_TYPE;
+(function (CALL_TYPE) {
+    CALL_TYPE["SINGLE"] = "0x00";
+    CALL_TYPE["BATCH"] = "0x01";
+    CALL_TYPE["DELEGATE_CALL"] = "0xFF";
+})(CALL_TYPE || (exports.CALL_TYPE = CALL_TYPE = {}));
+var EXEC_TYPE;
+(function (EXEC_TYPE) {
+    EXEC_TYPE["DEFAULT"] = "0x00";
+    EXEC_TYPE["TRY_EXEC"] = "0x01";
+})(EXEC_TYPE || (exports.EXEC_TYPE = EXEC_TYPE = {}));
+exports.VALIDATOR_TYPE = {
+    ROOT: "0x00",
+    VALIDATOR: "0x01",
+    PERMISSION: "0x02"
+};
+var VALIDATOR_MODE;
+(function (VALIDATOR_MODE) {
+    VALIDATOR_MODE["DEFAULT"] = "0x00";
+    VALIDATOR_MODE["ENABLE"] = "0x01";
+})(VALIDATOR_MODE || (exports.VALIDATOR_MODE = VALIDATOR_MODE = {}));
+//# sourceMappingURL=constants.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../accounts/kernel/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,qBAAqB,GAC9B,sIAAsI,CAAA;AAC7H,QAAA,mBAAmB,GAAG,YAAY,CAAA;AAC/C,IAAY,SAIX;AAJD,WAAY,SAAS;IACjB,4BAAe,CAAA;IACf,2BAAc,CAAA;IACd,mCAAsB,CAAA;AAC1B,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB;AACD,IAAY,SAGX;AAHD,WAAY,SAAS;IACjB,6BAAgB,CAAA;IAChB,8BAAiB,CAAA;AACrB,CAAC,EAHW,SAAS,yBAAT,SAAS,QAGpB;AACY,QAAA,cAAc,GAAG;IAC1B,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,MAAM;IACjB,UAAU,EAAE,MAAM;CACZ,CAAA;AACV,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,kCAAgB,CAAA;IAChB,iCAAe,CAAA;AACnB,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB"}

package/_cjs/accounts/kernel/signerToEcdsaKernelSmartAccount.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signerToEcdsaKernelSmartAccount = void 0;
+exports.signerToEcdsaKernelSmartAccount = exports.getEcdsaRootIdentifierForKernelV3 = exports.KERNEL_VERSION_TO_ADDRESSES_MAP = void 0;
 const viem_1 = require("viem");
 const actions_1 = require("viem/actions");
 const getAccountNonce_1 = require("../../actions/public/getAccountNonce.js");
@@ -11,6 +11,13 @@ const isSmartAccountDeployed_1 = require("../../utils/isSmartAccountDeployed.js"
 const toSmartAccount_1 = require("../toSmartAccount.js");
 const types_1 = require("../types.js");
 const KernelAccountAbi_1 = require("./abi/KernelAccountAbi.js");
+const KernelV3AccountAbi_1 = require("./abi/KernelV3AccountAbi.js");
+const KernelV3MetaFactoryAbi_1 = require("./abi/KernelV3MetaFactoryAbi.js");
+const constants_1 = require("./constants.js");
+const encodeCallData_1 = require("./utils/encodeCallData.js");
+const getNonceKey_1 = require("./utils/getNonceKey.js");
+const signMessage_1 = require("./utils/signMessage.js");
+const signTypedData_1 = require("./utils/signTypedData.js");
 const createAccountAbi = [
     {
         inputs: [
@@ -42,23 +49,80 @@ const createAccountAbi = [
         type: "function"
     }
 ];
-const KERNEL_ADDRESSES = {
-    ECDSA_VALIDATOR: "0xd9AB5096a832b9ce79914329DAEE236f8Eea0390",
-    ACCOUNT_V2_2_LOGIC: "0x0DA6a956B9488eD4dd761E59f52FDc6c8068E6B5",
-    FACTORY_ADDRESS: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3"
+exports.KERNEL_VERSION_TO_ADDRESSES_MAP = {
+    "0.2.2": {
+        ECDSA_VALIDATOR: "0xd9AB5096a832b9ce79914329DAEE236f8Eea0390",
+        ACCOUNT_LOGIC: "0x0DA6a956B9488eD4dd761E59f52FDc6c8068E6B5",
+        FACTORY_ADDRESS: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3"
+    },
+    "0.3.0-beta": {
+        ECDSA_VALIDATOR: "0x8104e3Ad430EA6d354d013A6789fDFc71E671c43",
+        ACCOUNT_LOGIC: "0x94F097E1ebEB4ecA3AAE54cabb08905B239A7D27",
+        FACTORY_ADDRESS: "0x6723b44Abeec4E71eBE3232BD5B455805baDD22f",
+        META_FACTORY_ADDRESS: "0xd703aaE79538628d27099B8c4f621bE4CCd142d5"
+    }
+};
+const getKernelVersion = (entryPoint) => {
+    return entryPoint === utils_1.ENTRYPOINT_ADDRESS_V06 ? "0.2.2" : "0.3.0-beta";
+};
+const getDefaultAddresses = (entryPointAddress, { ecdsaValidatorAddress: _ecdsaValidatorAddress, accountLogicAddress: _accountLogicAddress, factoryAddress: _factoryAddress, metaFactoryAddress: _metaFactoryAddress }) => {
+    const kernelVersion = getKernelVersion(entryPointAddress);
+    const addresses = exports.KERNEL_VERSION_TO_ADDRESSES_MAP[kernelVersion];
+    const ecdsaValidatorAddress = _ecdsaValidatorAddress ?? addresses.ECDSA_VALIDATOR;
+    const accountLogicAddress = _accountLogicAddress ?? addresses.ACCOUNT_LOGIC;
+    const factoryAddress = _factoryAddress ?? addresses.FACTORY_ADDRESS;
+    const metaFactoryAddress = _metaFactoryAddress ?? addresses?.META_FACTORY_ADDRESS ?? viem_1.zeroAddress;
+    return {
+        ecdsaValidatorAddress,
+        accountLogicAddress,
+        factoryAddress,
+        metaFactoryAddress
+    };
+};
+const getEcdsaRootIdentifierForKernelV3 = (validatorAddress) => {
+    return (0, viem_1.concatHex)([constants_1.VALIDATOR_TYPE.VALIDATOR, validatorAddress]);
+};
+exports.getEcdsaRootIdentifierForKernelV3 = getEcdsaRootIdentifierForKernelV3;
+const getInitialisationData = ({ entryPoint: entryPointAddress, owner, ecdsaValidatorAddress }) => {
+    const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
+    if (entryPointVersion === "v0.6") {
+        return (0, viem_1.encodeFunctionData)({
+            abi: KernelAccountAbi_1.KernelInitAbi,
+            functionName: "initialize",
+            args: [ecdsaValidatorAddress, owner]
+        });
+    }
+    return (0, viem_1.encodeFunctionData)({
+        abi: KernelV3AccountAbi_1.KernelV3InitAbi,
+        functionName: "initialize",
+        args: [
+            (0, exports.getEcdsaRootIdentifierForKernelV3)(ecdsaValidatorAddress),
+            viem_1.zeroAddress,
+            owner,
+            "0x"
+        ]
+    });
 };
-const getAccountInitCode = async ({ owner, index, accountLogicAddress, ecdsaValidatorAddress }) => {
+const getAccountInitCode = async ({ entryPoint: entryPointAddress, owner, index, factoryAddress, accountLogicAddress, ecdsaValidatorAddress }) => {
     if (!owner)
         throw new Error("Owner account not found");
-    const initialisationData = (0, viem_1.encodeFunctionData)({
-        abi: KernelAccountAbi_1.KernelInitAbi,
-        functionName: "initialize",
-        args: [ecdsaValidatorAddress, owner]
+    const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
+    const initialisationData = getInitialisationData({
+        entryPoint: entryPointAddress,
+        ecdsaValidatorAddress,
+        owner
     });
+    if (entryPointVersion === "v0.6") {
+        return (0, viem_1.encodeFunctionData)({
+            abi: createAccountAbi,
+            functionName: "createAccount",
+            args: [accountLogicAddress, initialisationData, index]
+        });
+    }
     return (0, viem_1.encodeFunctionData)({
-        abi: createAccountAbi,
-        functionName: "createAccount",
-        args: [accountLogicAddress, initialisationData, index]
+        abi: KernelV3MetaFactoryAbi_1.KernelV3MetaFactoryDeployWithFactoryAbi,
+        functionName: "deployWithFactory",
+        args: [factoryAddress, initialisationData, (0, viem_1.toHex)(index, { size: 32 })]
     });
 };
 const getAccountAddress = async ({ client, owner, entryPoint: entryPointAddress, initCodeProvider, ecdsaValidatorAddress, deployedAccountAddress, factoryAddress }) => {
@@ -95,16 +159,28 @@ const getAccountAddress = async ({ client, owner, entryPoint: entryPointAddress,
         return deployedAccountAddress;
     }
     const factoryData = await initCodeProvider();
+    const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
+    if (entryPointVersion === "v0.6") {
+        return (0, getSenderAddress_1.getSenderAddress)(client, {
+            initCode: (0, viem_1.concatHex)([factoryAddress, factoryData]),
+            entryPoint: entryPointAddress
+        });
+    }
     return (0, getSenderAddress_1.getSenderAddress)(client, {
-        initCode: (0, viem_1.concatHex)([factoryAddress, factoryData]),
+        factory: factoryAddress,
+        factoryData: factoryData,
         entryPoint: entryPointAddress
     });
 };
-async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryPoint: entryPointAddress, index = BigInt(0), factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS, accountLogicAddress = KERNEL_ADDRESSES.ACCOUNT_V2_2_LOGIC, ecdsaValidatorAddress = KERNEL_ADDRESSES.ECDSA_VALIDATOR, deployedAccountAddress }) {
+async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryPoint: entryPointAddress, index = BigInt(0), factoryAddress: _factoryAddress, metaFactoryAddress: _metaFactoryAddress, accountLogicAddress: _accountLogicAddress, ecdsaValidatorAddress: _ecdsaValidatorAddress, deployedAccountAddress }) {
     const entryPointVersion = (0, utils_1.getEntryPointVersion)(entryPointAddress);
-    if (entryPointVersion !== "v0.6") {
-        throw new Error("Only EntryPoint 0.6 is supported");
-    }
+    const kernelVersion = getKernelVersion(entryPointAddress);
+    const { accountLogicAddress, ecdsaValidatorAddress, factoryAddress, metaFactoryAddress } = getDefaultAddresses(entryPointAddress, {
+        ecdsaValidatorAddress: _ecdsaValidatorAddress,
+        accountLogicAddress: _accountLogicAddress,
+        factoryAddress: _factoryAddress,
+        metaFactoryAddress: _metaFactoryAddress
+    });
     const viemSigner = {
         ...signer,
         signTransaction: (_, __) => {
@@ -112,8 +188,10 @@ async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryP
         }
     };
     const generateInitCode = () => getAccountInitCode({
+        entryPoint: entryPointAddress,
         owner: viemSigner.address,
         index,
+        factoryAddress,
         accountLogicAddress,
         ecdsaValidatorAddress
     });
@@ -126,7 +204,9 @@ async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryP
                 ecdsaValidatorAddress,
                 initCodeProvider: generateInitCode,
                 deployedAccountAddress,
-                factoryAddress
+                factoryAddress: entryPointVersion === "v0.6"
+                    ? factoryAddress
+                    : metaFactoryAddress
             }),
         client.chain?.id ?? (0, actions_1.getChainId)(client)
     ]);
@@ -136,25 +216,44 @@ async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryP
     return (0, toSmartAccount_1.toSmartAccount)({
         address: accountAddress,
         async signMessage({ message }) {
-            return (0, actions_1.signMessage)(client, { account: viemSigner, message });
+            const signature = await (0, signMessage_1.signMessage)(client, {
+                account: viemSigner,
+                message,
+                accountAddress,
+                accountVersion: kernelVersion,
+                chainId
+            });
+            return (0, viem_1.concatHex)([
+                (0, exports.getEcdsaRootIdentifierForKernelV3)(ecdsaValidatorAddress),
+                signature
+            ]);
         },
         async signTransaction(_, __) {
             throw new types_1.SignTransactionNotSupportedBySmartAccount();
         },
         async signTypedData(typedData) {
-            return (0, actions_1.signTypedData)(client, {
+            const signature = await (0, signTypedData_1.signTypedData)(client, {
                 account: viemSigner,
-                ...typedData
+                ...typedData,
+                accountAddress,
+                accountVersion: kernelVersion,
+                chainId
             });
+            return (0, viem_1.concatHex)([
+                (0, exports.getEcdsaRootIdentifierForKernelV3)(ecdsaValidatorAddress),
+                signature
+            ]);
         },
         client: client,
         publicKey: accountAddress,
         entryPoint: entryPointAddress,
         source: "kernelEcdsaSmartAccount",
         async getNonce() {
+            const key = (0, getNonceKey_1.getNonceKeyWithEncoding)(kernelVersion, ecdsaValidatorAddress);
             return (0, getAccountNonce_1.getAccountNonce)(client, {
                 sender: accountAddress,
-                entryPoint: entryPointAddress
+                entryPoint: entryPointAddress,
+                key
             });
         },
         async signUserOperation(userOperation) {
@@ -170,7 +269,10 @@ async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryP
                 account: viemSigner,
                 message: { raw: hash }
             });
-            return (0, viem_1.concatHex)(["0x00000000", signature]);
+            if (kernelVersion === "0.2.2") {
+                return (0, viem_1.concatHex)(["0x00000000", signature]);
+            }
+            return signature;
         },
         async getInitCode() {
             if (smartAccountDeployed)
@@ -178,7 +280,10 @@ async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryP
             smartAccountDeployed = await (0, isSmartAccountDeployed_1.isSmartAccountDeployed)(client, accountAddress);
             if (smartAccountDeployed)
                 return "0x";
-            return (0, viem_1.concatHex)([factoryAddress, await generateInitCode()]);
+            const _factoryAddress = entryPointVersion === "v0.6"
+                ? factoryAddress
+                : metaFactoryAddress;
+            return (0, viem_1.concatHex)([_factoryAddress, await generateInitCode()]);
         },
         async getFactory() {
             if (smartAccountDeployed)
@@ -186,7 +291,9 @@ async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryP
             smartAccountDeployed = await (0, isSmartAccountDeployed_1.isSmartAccountDeployed)(client, accountAddress);
             if (smartAccountDeployed)
                 return undefined;
-            return factoryAddress;
+            return entryPointVersion === "v0.6"
+                ? factoryAddress
+                : metaFactoryAddress;
         },
         async getFactoryData() {
             if (smartAccountDeployed)
@@ -200,27 +307,13 @@ async function signerToEcdsaKernelSmartAccount(client, { signer, address, entryP
             throw new Error("Simple account doesn't support account deployment");
         },
         async encodeCallData(_tx) {
-            if (Array.isArray(_tx)) {
-                return (0, viem_1.encodeFunctionData)({
-                    abi: KernelAccountAbi_1.KernelExecuteAbi,
-                    functionName: "executeBatch",
-                    args: [
-                        _tx.map((tx) => ({
-                            to: tx.to,
-                            value: tx.value,
-                            data: tx.data
-                        }))
-                    ]
-                });
-            }
-            return (0, viem_1.encodeFunctionData)({
-                abi: KernelAccountAbi_1.KernelExecuteAbi,
-                functionName: "execute",
-                args: [_tx.to, _tx.value, _tx.data, 0]
-            });
+            return (0, encodeCallData_1.encodeCallData)(_tx, kernelVersion);
         },
         async getDummySignature(_userOperation) {
-            return "0x00000000fffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
+            if (kernelVersion === "0.2.2") {
+                return (0, viem_1.concatHex)([constants_1.ROOT_MODE_KERNEL_V2, constants_1.DUMMY_ECDSA_SIGNATURE]);
+            }
+            return constants_1.DUMMY_ECDSA_SIGNATURE;
         }
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"signerToEcdsaKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/signerToEcdsaKernelSmartAccount.ts"],"names":[],"mappings":";;;AACA,+BAWa;AACb,0CAKqB;AACrB,0EAAsE;AACtE,4EAAwE;AAGxE,uCAAkD;AAClD,2EAAuE;AACvE,+EAA2E;AAC3E,sDAAkD;AAElD,oCAGiB;AACjB,6DAAwE;AAWxE,MAAM,gBAAgB,GAAG;IACrB;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE;YACL;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAKV,MAAM,gBAAgB,GAIlB;IACA,eAAe,EAAE,4CAA4C;IAC7D,kBAAkB,EAAE,4CAA4C;IAChE,eAAe,EAAE,4CAA4C;CAChE,CAAA;AAUD,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAC9B,KAAK,EACL,KAAK,EACL,mBAAmB,EACnB,qBAAqB,EAMxB,EAAgB,EAAE;IACf,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAGtD,MAAM,kBAAkB,GAAG,IAAA,yBAAkB,EAAC;QAC1C,GAAG,EAAE,gCAAa;QAClB,YAAY,EAAE,YAAY;QAC1B,IAAI,EAAE,CAAC,qBAAqB,EAAE,KAAK,CAAC;KACvC,CAAC,CAAA;IAGF,OAAO,IAAA,yBAAkB,EAAC;QACtB,GAAG,EAAE,gBAAgB;QACrB,YAAY,EAAE,eAAe;QAC7B,IAAI,EAAE,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,KAAK,CAAC;KACzD,CAAC,CAAA;AACN,CAAC,CAAA;AAWD,MAAM,iBAAiB,GAAG,KAAK,EAI7B,EACE,MAAM,EACN,KAAK,EACL,UAAU,EAAE,iBAAiB,EAC7B,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,cAAc,EASjB,EAAoB,EAAE;IAEnB,IAAI,sBAAsB,KAAK,SAAS,EAAE,CAAC;QAEvC,MAAM,oBAAoB,GAAG,MAAM,IAAA,sBAAY,EAAC,MAAM,EAAE;YACpD,OAAO,EAAE,qBAAqB;YAC9B,GAAG,EAAE;gBACD;oBACI,MAAM,EAAE;wBACJ;4BACI,YAAY,EAAE,SAAS;4BACvB,IAAI,EAAE,EAAE;4BACR,IAAI,EAAE,SAAS;yBAClB;qBACJ;oBACD,IAAI,EAAE,uBAAuB;oBAC7B,OAAO,EAAE;wBACL;4BACI,YAAY,EAAE,SAAS;4BACvB,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,SAAS;yBAClB;qBACJ;oBACD,eAAe,EAAE,MAAM;oBACvB,IAAI,EAAE,UAAU;iBACnB;aACJ;YACD,YAAY,EAAE,uBAAuB;YACrC,IAAI,EAAE,CAAC,sBAAsB,CAAC;SACjC,CAAC,CAAA;QAGF,IAAI,CAAC,IAAA,qBAAc,EAAC,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;QACrE,CAAC;QAGD,OAAO,sBAAsB,CAAA;IACjC,CAAC;IAGD,MAAM,WAAW,GAAG,MAAM,gBAAgB,EAAE,CAAA;IAE5C,OAAO,IAAA,mCAAgB,EAA8B,MAAM,EAAE;QACzD,QAAQ,EAAE,IAAA,gBAAS,EAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAClD,UAAU,EAAE,iBAAgD;KAC/D,CAAC,CAAA;AACN,CAAC,CAAA;AA2BM,KAAK,UAAU,+BAA+B,CAOjD,MAA6C,EAC7C,EACI,MAAM,EACN,OAAO,EACP,UAAU,EAAE,iBAAiB,EAC7B,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EACjB,cAAc,GAAG,gBAAgB,CAAC,eAAe,EACjD,mBAAmB,GAAG,gBAAgB,CAAC,kBAAkB,EACzD,qBAAqB,GAAG,gBAAgB,CAAC,eAAe,EACxD,sBAAsB,EACiD;IAE3E,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAAC,iBAAiB,CAAC,CAAA;IAEjE,IAAI,iBAAiB,KAAK,MAAM,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IACvD,CAAC;IAGD,MAAM,UAAU,GAAiB;QAC7B,GAAG,MAAM;QACT,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;YACvB,MAAM,IAAI,iDAAyC,EAAE,CAAA;QACzD,CAAC;KACY,CAAA;IAGjB,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAC1B,kBAAkB,CAAC;QACf,KAAK,EAAE,UAAU,CAAC,OAAO;QACzB,KAAK;QACL,mBAAmB;QACnB,qBAAqB;KACxB,CAAC,CAAA;IAGN,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,OAAO;YACH,iBAAiB,CAAiC;gBAC9C,MAAM;gBACN,UAAU,EAAE,iBAAiB;gBAC7B,KAAK,EAAE,UAAU,CAAC,OAAO;gBACzB,qBAAqB;gBACrB,gBAAgB,EAAE,gBAAgB;gBAClC,sBAAsB;gBACtB,cAAc;aACjB,CAAC;QACN,MAAM,CAAC,KAAK,EAAE,EAAE,IAAI,IAAA,oBAAU,EAAC,MAAM,CAAC;KACzC,CAAC,CAAA;IAEF,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;IAEjE,IAAI,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EACnD,MAAM,EACN,cAAc,CACjB,CAAA;IAED,OAAO,IAAA,+BAAc,EAAC;QAClB,OAAO,EAAE,cAAc;QACvB,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YACzB,OAAO,IAAA,qBAAW,EAAC,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAA;QAChE,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,CAAC,EAAE,EAAE;YACvB,MAAM,IAAI,iDAAyC,EAAE,CAAA;QACzD,CAAC;QACD,KAAK,CAAC,aAAa,CAKjB,SAAwD;YACtD,OAAO,IAAA,uBAAa,EAChB,MAAM,EACN;gBACI,OAAO,EAAE,UAAU;gBACnB,GAAG,SAAS;aACf,CACJ,CAAA;QACL,CAAC;QACD,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,cAAc;QACzB,UAAU,EAAE,iBAAiB;QAC7B,MAAM,EAAE,yBAAyB;QAGjC,KAAK,CAAC,QAAQ;YACV,OAAO,IAAA,iCAAe,EAAC,MAAM,EAAE;gBAC3B,MAAM,EAAE,cAAc;gBACtB,UAAU,EAAE,iBAAiB;aAChC,CAAC,CAAA;QACN,CAAC;QAGD,KAAK,CAAC,iBAAiB,CAAC,aAAa;YACjC,MAAM,IAAI,GAAG,IAAA,2CAAoB,EAAC;gBAC9B,aAAa,EAAE;oBACX,GAAG,aAAa;oBAChB,SAAS,EAAE,IAAI;iBAClB;gBACD,UAAU,EAAE,iBAAiB;gBAC7B,OAAO,EAAE,OAAO;aACnB,CAAC,CAAA;YACF,MAAM,SAAS,GAAG,MAAM,IAAA,qBAAW,EAAC,MAAM,EAAE;gBACxC,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;aACzB,CAAC,CAAA;YAEF,OAAO,IAAA,gBAAS,EAAC,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAA;QAC/C,CAAC;QAGD,KAAK,CAAC,WAAW;YACb,IAAI,oBAAoB;gBAAE,OAAO,IAAI,CAAA;YAErC,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EAC/C,MAAM,EACN,cAAc,CACjB,CAAA;YAED,IAAI,oBAAoB;gBAAE,OAAO,IAAI,CAAA;YAErC,OAAO,IAAA,gBAAS,EAAC,CAAC,cAAc,EAAE,MAAM,gBAAgB,EAAE,CAAC,CAAC,CAAA;QAChE,CAAC;QAED,KAAK,CAAC,UAAU;YACZ,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAE1C,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EAC/C,MAAM,EACN,cAAc,CACjB,CAAA;YAED,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAE1C,OAAO,cAAc,CAAA;QACzB,CAAC;QAED,KAAK,CAAC,cAAc;YAChB,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAE1C,oBAAoB,GAAG,MAAM,IAAA,+CAAsB,EAC/C,MAAM,EACN,cAAc,CACjB,CAAA;YAED,IAAI,oBAAoB;gBAAE,OAAO,SAAS,CAAA;YAE1C,OAAO,gBAAgB,EAAE,CAAA;QAC7B,CAAC;QAGD,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;QACxE,CAAC;QAGD,KAAK,CAAC,cAAc,CAAC,GAAG;YACpB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBAErB,OAAO,IAAA,yBAAkB,EAAC;oBACtB,GAAG,EAAE,mCAAgB;oBACrB,YAAY,EAAE,cAAc;oBAC5B,IAAI,EAAE;wBACF,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;4BACb,EAAE,EAAE,EAAE,CAAC,EAAE;4BACT,KAAK,EAAE,EAAE,CAAC,KAAK;4BACf,IAAI,EAAE,EAAE,CAAC,IAAI;yBAChB,CAAC,CAAC;qBACN;iBACJ,CAAC,CAAA;YACN,CAAC;YAED,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE,mCAAgB;gBACrB,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;aACzC,CAAC,CAAA;QACN,CAAC;QAGD,KAAK,CAAC,iBAAiB,CAAC,cAAc;YAClC,OAAO,8IAA8I,CAAA;QACzJ,CAAC;KACJ,CAAC,CAAA;AACN,CAAC;AA/LD,0EA+LC"}
+{"version":3,"file":"signerToEcdsaKernelSmartAccount.js","sourceRoot":"","sources":["../../../accounts/kernel/signerToEcdsaKernelSmartAccount.ts"],"names":[],"mappings":"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"}

package/_cjs/accounts/kernel/utils/encodeCallData.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeCallData = void 0;
+const viem_1 = require("viem");
+const KernelAccountAbi_1 = require("../abi/KernelAccountAbi.js");
+const KernelV3AccountAbi_1 = require("../abi/KernelV3AccountAbi.js");
+const constants_1 = require("../constants.js");
+const getExecMode_1 = require("./getExecMode.js");
+const encodeCallData = (_tx, accountVersion) => {
+    if (accountVersion === "0.2.2") {
+        if (Array.isArray(_tx)) {
+            return (0, viem_1.encodeFunctionData)({
+                abi: KernelAccountAbi_1.KernelExecuteAbi,
+                functionName: "executeBatch",
+                args: [
+                    _tx.map((tx) => ({
+                        to: tx.to,
+                        value: tx.value,
+                        data: tx.data
+                    }))
+                ]
+            });
+        }
+        return (0, viem_1.encodeFunctionData)({
+            abi: KernelAccountAbi_1.KernelExecuteAbi,
+            functionName: "execute",
+            args: [_tx.to, _tx.value, _tx.data, 0]
+        });
+    }
+    if (Array.isArray(_tx)) {
+        const calldata = (0, viem_1.encodeAbiParameters)([
+            {
+                name: "executionBatch",
+                type: "tuple[]",
+                components: [
+                    {
+                        name: "target",
+                        type: "address"
+                    },
+                    {
+                        name: "value",
+                        type: "uint256"
+                    },
+                    {
+                        name: "callData",
+                        type: "bytes"
+                    }
+                ]
+            }
+        ], [
+            _tx.map((arg) => {
+                return {
+                    target: arg.to,
+                    value: arg.value,
+                    callData: arg.data
+                };
+            })
+        ]);
+        return (0, viem_1.encodeFunctionData)({
+            abi: KernelV3AccountAbi_1.KernelV3ExecuteAbi,
+            functionName: "execute",
+            args: [
+                (0, getExecMode_1.getExecMode)({
+                    callType: constants_1.CALL_TYPE.BATCH,
+                    execType: constants_1.EXEC_TYPE.DEFAULT
+                }),
+                calldata
+            ]
+        });
+    }
+    const calldata = (0, viem_1.concatHex)([
+        _tx.to,
+        (0, viem_1.toHex)(_tx.value, { size: 32 }),
+        _tx.data
+    ]);
+    return (0, viem_1.encodeFunctionData)({
+        abi: KernelV3AccountAbi_1.KernelV3ExecuteAbi,
+        functionName: "execute",
+        args: [
+            (0, getExecMode_1.getExecMode)({
+                callType: constants_1.CALL_TYPE.SINGLE,
+                execType: constants_1.EXEC_TYPE.DEFAULT
+            }),
+            calldata
+        ]
+    });
+};
+exports.encodeCallData = encodeCallData;
+//# sourceMappingURL=encodeCallData.js.map

package/_cjs/accounts/kernel/utils/encodeCallData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"encodeCallData.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/encodeCallData.ts"],"names":[],"mappings":";;;AAAA,+BAOa;AACb,8DAA0D;AAC1D,kEAA8D;AAC9D,4CAAmD;AAEnD,+CAA2C;AAEpC,MAAM,cAAc,GAAG,CAC1B,GAUS,EACT,cAA6B,EAC/B,EAAE;IACA,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;QAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAErB,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE,mCAAgB;gBACrB,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE;oBACF,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;wBACb,EAAE,EAAE,EAAE,CAAC,EAAE;wBACT,KAAK,EAAE,EAAE,CAAC,KAAK;wBACf,IAAI,EAAE,EAAE,CAAC,IAAI;qBAChB,CAAC,CAAC;iBACN;aACJ,CAAC,CAAA;QACN,CAAC;QAED,OAAO,IAAA,yBAAkB,EAAC;YACtB,GAAG,EAAE,mCAAgB;YACrB,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;SACzC,CAAC,CAAA;IACN,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAErB,MAAM,QAAQ,GAAG,IAAA,0BAAmB,EAChC;YACI;gBACI,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,SAAS;gBACf,UAAU,EAAE;oBACR;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,OAAO;qBAChB;iBACJ;aACJ;SACJ,EACD;YACI,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACZ,OAAO;oBACH,MAAM,EAAE,GAAG,CAAC,EAAE;oBACd,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,QAAQ,EAAE,GAAG,CAAC,IAAI;iBACrB,CAAA;YACL,CAAC,CAAC;SACL,CACJ,CAAA;QACD,OAAO,IAAA,yBAAkB,EAAC;YACtB,GAAG,EAAE,uCAAkB;YACvB,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE;gBACF,IAAA,yBAAW,EAAC;oBACR,QAAQ,EAAE,qBAAS,CAAC,KAAK;oBACzB,QAAQ,EAAE,qBAAS,CAAC,OAAO;iBAC9B,CAAC;gBACF,QAAQ;aACX;SACJ,CAAC,CAAA;IACN,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,gBAAS,EAAC;QACvB,GAAG,CAAC,EAAE;QACN,IAAA,YAAK,EAAC,GAAG,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI;KACX,CAAC,CAAA;IAEF,OAAO,IAAA,yBAAkB,EAAC;QACtB,GAAG,EAAE,uCAAkB;QACvB,YAAY,EAAE,SAAS;QACvB,IAAI,EAAE;YACF,IAAA,yBAAW,EAAC;gBACR,QAAQ,EAAE,qBAAS,CAAC,MAAM;gBAC1B,QAAQ,EAAE,qBAAS,CAAC,OAAO;aAC9B,CAAC;YACF,QAAQ;SACX;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAnGY,QAAA,cAAc,kBAmG1B"}

package/_cjs/accounts/kernel/utils/getExecMode.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getExecMode = void 0;
+const viem_1 = require("viem");
+const getExecMode = ({ callType, execType }) => {
+    return (0, viem_1.concatHex)([
+        callType,
+        execType,
+        "0x00000000",
+        "0x00000000",
+        (0, viem_1.pad)("0x00000000", { size: 22 })
+    ]);
+};
+exports.getExecMode = getExecMode;
+//# sourceMappingURL=getExecMode.js.map

package/_cjs/accounts/kernel/utils/getExecMode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getExecMode.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/getExecMode.ts"],"names":[],"mappings":";;;AAAA,+BAA+C;AAGxC,MAAM,WAAW,GAAG,CAAC,EACxB,QAAQ,EACR,QAAQ,EAIX,EAAO,EAAE;IACN,OAAO,IAAA,gBAAS,EAAC;QACb,QAAQ;QACR,QAAQ;QACR,YAAY;QACZ,YAAY;QACZ,IAAA,UAAG,EAAC,YAAY,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;KAClC,CAAC,CAAA;AACN,CAAC,CAAA;AAdY,QAAA,WAAW,eAcvB"}

package/_cjs/accounts/kernel/utils/getNonceKey.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNonceKeyWithEncoding = void 0;
+const viem_1 = require("viem");
+const constants_1 = require("../constants.js");
+const getNonceKeyWithEncoding = (accountVerion, validatorAddress, nonceKey = 0n) => {
+    if (accountVerion === "0.2.2") {
+        return nonceKey;
+    }
+    if (nonceKey > viem_1.maxUint16)
+        throw new Error(`nonce key must be equal or less than 2 bytes(maxUint16) for Kernel version ${accountVerion}`);
+    const validatorMode = constants_1.VALIDATOR_MODE.DEFAULT;
+    const validatorType = constants_1.VALIDATOR_TYPE.ROOT;
+    const encoding = (0, viem_1.pad)((0, viem_1.concatHex)([
+        validatorMode,
+        validatorType,
+        validatorAddress,
+        (0, viem_1.toHex)(nonceKey, { size: 2 })
+    ]), { size: 24 });
+    const encodedNonceKey = BigInt(encoding);
+    return encodedNonceKey;
+};
+exports.getNonceKeyWithEncoding = getNonceKeyWithEncoding;
+//# sourceMappingURL=getNonceKey.js.map

package/_cjs/accounts/kernel/utils/getNonceKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getNonceKey.js","sourceRoot":"","sources":["../../../../accounts/kernel/utils/getNonceKey.ts"],"names":[],"mappings":";;;AAAA,+BAAqE;AACrE,4CAA6D;AAGtD,MAAM,uBAAuB,GAAG,CACnC,aAA4B,EAC5B,gBAAyB,EACzB,QAAQ,GAAG,EAAE,EACf,EAAE;IACA,IAAI,aAAa,KAAK,OAAO,EAAE,CAAC;QAC5B,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,IAAI,QAAQ,GAAG,gBAAS;QACpB,MAAM,IAAI,KAAK,CACX,8EAA8E,aAAa,EAAE,CAChG,CAAA;IAEL,MAAM,aAAa,GAAG,0BAAc,CAAC,OAAO,CAAA;IAC5C,MAAM,aAAa,GAAG,0BAAc,CAAC,IAAI,CAAA;IACzC,MAAM,QAAQ,GAAG,IAAA,UAAG,EAChB,IAAA,gBAAS,EAAC;QACN,aAAa;QACb,aAAa;QACb,gBAAgB;QAChB,IAAA,YAAK,EAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;KAC/B,CAAC,EACF,EAAE,IAAI,EAAE,EAAE,EAAE,CACf,CAAA;IACD,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IACxC,OAAO,eAAe,CAAA;AAC1B,CAAC,CAAA;AA3BY,QAAA,uBAAuB,2BA2BnC"}