@zerodev/sdk 5.2.1-alpha-4 → 5.2.1-alpha-6

package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js

@@ -0,0 +1,36 @@
+export const KernelV3FactoryAbi = [
+    {
+        type: "constructor",
+        inputs: [{ name: "_impl", type: "address", internalType: "address" }],
+        stateMutability: "nonpayable"
+    },
+    {
+        type: "function",
+        name: "createAccount",
+        inputs: [
+            { name: "data", type: "bytes", internalType: "bytes" },
+            { name: "salt", type: "bytes32", internalType: "bytes32" }
+        ],
+        outputs: [{ name: "", type: "address", internalType: "address" }],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "getAddress",
+        inputs: [
+            { name: "data", type: "bytes", internalType: "bytes" },
+            { name: "salt", type: "bytes32", internalType: "bytes32" }
+        ],
+        outputs: [{ name: "", type: "address", internalType: "address" }],
+        stateMutability: "view"
+    },
+    {
+        type: "function",
+        name: "implementation",
+        inputs: [],
+        outputs: [{ name: "", type: "address", internalType: "address" }],
+        stateMutability: "view"
+    },
+    { type: "error", name: "InitializeError", inputs: [] }
+];
+//# sourceMappingURL=KernelFactoryAbi.js.map

package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"KernelFactoryAbi.js","sourceRoot":"","sources":["../../../../../accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B;QACI,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACrE,eAAe,EAAE,YAAY;KAChC;IACD;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE;YACJ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;YACtD,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;IACD;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE;YACJ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE;YACtD,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,MAAM;KAC1B;IACD;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,gBAAgB;QACtB,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;QACjE,eAAe,EAAE,MAAM;KAC1B;IACD,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,EAAE,EAAE;CAChD,CAAA"}

package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js

@@ -0,0 +1,200 @@
+export const KernelFactoryStakerAbi = [
+    {
+        type: "constructor",
+        inputs: [{ name: "_owner", type: "address", internalType: "address" }],
+        stateMutability: "nonpayable"
+    },
+    {
+        type: "function",
+        name: "approveFactory",
+        inputs: [
+            {
+                name: "factory",
+                type: "address",
+                internalType: "contract KernelFactory"
+            },
+            { name: "approval", type: "bool", internalType: "bool" }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "approved",
+        inputs: [
+            {
+                name: "",
+                type: "address",
+                internalType: "contract KernelFactory"
+            }
+        ],
+        outputs: [{ name: "", type: "bool", internalType: "bool" }],
+        stateMutability: "view"
+    },
+    {
+        type: "function",
+        name: "cancelOwnershipHandover",
+        inputs: [],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "completeOwnershipHandover",
+        inputs: [
+            { name: "pendingOwner", type: "address", internalType: "address" }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        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"
+    },
+    {
+        type: "function",
+        name: "owner",
+        inputs: [],
+        outputs: [{ name: "result", type: "address", internalType: "address" }],
+        stateMutability: "view"
+    },
+    {
+        type: "function",
+        name: "ownershipHandoverExpiresAt",
+        inputs: [
+            { name: "pendingOwner", type: "address", internalType: "address" }
+        ],
+        outputs: [{ name: "result", type: "uint256", internalType: "uint256" }],
+        stateMutability: "view"
+    },
+    {
+        type: "function",
+        name: "renounceOwnership",
+        inputs: [],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "requestOwnershipHandover",
+        inputs: [],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "stake",
+        inputs: [
+            {
+                name: "entryPoint",
+                type: "address",
+                internalType: "contract IEntryPoint"
+            },
+            { name: "unstakeDelay", type: "uint32", internalType: "uint32" }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "transferOwnership",
+        inputs: [
+            { name: "newOwner", type: "address", internalType: "address" }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "unlockStake",
+        inputs: [
+            {
+                name: "entryPoint",
+                type: "address",
+                internalType: "contract IEntryPoint"
+            }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "function",
+        name: "withdrawStake",
+        inputs: [
+            {
+                name: "entryPoint",
+                type: "address",
+                internalType: "contract IEntryPoint"
+            },
+            {
+                name: "recipient",
+                type: "address",
+                internalType: "address payable"
+            }
+        ],
+        outputs: [],
+        stateMutability: "payable"
+    },
+    {
+        type: "event",
+        name: "OwnershipHandoverCanceled",
+        inputs: [
+            {
+                name: "pendingOwner",
+                type: "address",
+                indexed: true,
+                internalType: "address"
+            }
+        ],
+        anonymous: false
+    },
+    {
+        type: "event",
+        name: "OwnershipHandoverRequested",
+        inputs: [
+            {
+                name: "pendingOwner",
+                type: "address",
+                indexed: true,
+                internalType: "address"
+            }
+        ],
+        anonymous: false
+    },
+    {
+        type: "event",
+        name: "OwnershipTransferred",
+        inputs: [
+            {
+                name: "oldOwner",
+                type: "address",
+                indexed: true,
+                internalType: "address"
+            },
+            {
+                name: "newOwner",
+                type: "address",
+                indexed: true,
+                internalType: "address"
+            }
+        ],
+        anonymous: false
+    },
+    { type: "error", name: "AlreadyInitialized", inputs: [] },
+    { type: "error", name: "NewOwnerIsZeroAddress", inputs: [] },
+    { type: "error", name: "NoHandoverRequest", inputs: [] },
+    { type: "error", name: "NotApprovedFactory", inputs: [] },
+    { type: "error", name: "Unauthorized", inputs: [] }
+];
+//# sourceMappingURL=KernelFactoryStakerAbi.js.map

package/_esm/accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js.map

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

package/_esm/accounts/kernel/createKernelAccount.js

@@ -1,11 +1,12 @@
 import { getAccountNonce, getEntryPointVersion, getSenderAddress, isSmartAccountDeployed } from "permissionless";
 import { SignTransactionNotSupportedBySmartAccount, toSmartAccount } from "permissionless/accounts";
-import { concatHex, encodeFunctionData, getTypesForEIP712Domain, hashMessage, hashTypedData, validateTypedData, zeroAddress } from "viem";
+import { concatHex, encodeFunctionData, getTypesForEIP712Domain, hashMessage, hashTypedData, toHex, validateTypedData, zeroAddress } from "viem";
 import { KERNEL_FEATURES, hasKernelFeature } from "../../utils.js";
 import { parseFactoryAddressAndCallDataFromAccountInitCode } from "../utils/index.js";
 import { isKernelPluginManager, toKernelPluginManager } from "../utils/toKernelPluginManager.js";
 import { KernelInitAbi } from "./abi/KernelAccountAbi.js";
 import { KernelV3InitAbi } from "./abi/kernel_v_3_0_0/KernelAccountAbi.js";
+import { KernelFactoryStakerAbi } from "./abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js";
 import { encodeCallData as encodeCallDataEpV06 } from "./utils/account/ep0_6/encodeCallData.js";
 import { encodeDeployCallData as encodeDeployCallDataV06 } from "./utils/account/ep0_6/encodeDeployCallData.js";
 import { encodeCallData as encodeCallDataEpV07 } from "./utils/account/ep0_7/encodeCallData.js";
@@ -51,9 +52,10 @@ const createAccountAbi = [
  */
 export const KERNEL_ADDRESSES = {
     ACCOUNT_LOGIC_V0_6: "0xd3082872F8B06073A021b4602e022d5A070d7cfC",
-    ACCOUNT_LOGIC_V0_7: "0x541E811D24A54745619a5B9f0c1d4B08D5740144",
-    FACTORY_ADDRESS: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
-    ENTRYPOINT_V0_6: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+    ACCOUNT_LOGIC_V0_7: "0xe59cffb45AFFB215e3823F7D1a207a71C1aa09c3",
+    FACTORY_ADDRESS_V0_6: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
+    FACTORY_ADDRESS_V0_7: "0x17B6697d81844518365484323e810Be08EaA3A6a",
+    FACTORY_STAKER: "0xd703aaE79538628d27099B8c4f621bE4CCd142d5"
 };
 const getKernelInitData = async ({ entryPoint: entryPointAddress, kernelPluginManager }) => {
     const entryPointVersion = getEntryPointVersion(entryPointAddress);
@@ -78,19 +80,34 @@ const getKernelInitData = async ({ entryPoint: entryPointAddress, kernelPluginMa
  * @param accountLogicAddress
  * @param ecdsaValidatorAddress
  */
-const getAccountInitCode = async ({ index, factoryAddress, accountLogicAddress, entryPoint: entryPointAddress, kernelPluginManager }) => {
+const getAccountInitCode = async ({ index, factoryAddress, accountLogicAddress, factoryStakerAddress, entryPoint: entryPointAddress, kernelPluginManager }) => {
     // Build the account initialization data
     const initialisationData = await getKernelInitData({
         entryPoint: entryPointAddress,
         kernelPluginManager
     });
+    const entryPointVersion = getEntryPointVersion(entryPointAddress);
     // Build the account init code
+    if (entryPointVersion === "v0.6") {
+        return concatHex([
+            factoryAddress,
+            encodeFunctionData({
+                abi: createAccountAbi,
+                functionName: "createAccount",
+                args: [accountLogicAddress, initialisationData, index]
+            })
+        ]);
+    }
     return concatHex([
-        factoryAddress,
+        factoryStakerAddress,
         encodeFunctionData({
-            abi: createAccountAbi,
-            functionName: "createAccount",
-            args: [accountLogicAddress, initialisationData, index]
+            abi: KernelFactoryStakerAbi,
+            functionName: "deployWithFactory",
+            args: [
+                factoryAddress,
+                initialisationData,
+                toHex(index, { size: 32 })
+            ]
         })
     ]);
 };
@@ -128,12 +145,16 @@ const getAccountAddress = async ({ client, entryPoint: entryPointAddress, initCo
  * @param ecdsaValidatorAddress
  * @param deployedAccountAddress
  */
-export async function createKernelAccount(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS, accountLogicAddress = KERNEL_ADDRESSES.ACCOUNT_LOGIC_V0_6, deployedAccountAddress }) {
+export async function createKernelAccount(client, { plugins, entryPoint: entryPointAddress, index = 0n, factoryAddress = KERNEL_ADDRESSES.FACTORY_ADDRESS_V0_6, accountLogicAddress = KERNEL_ADDRESSES.ACCOUNT_LOGIC_V0_6, factoryStakerAddress = KERNEL_ADDRESSES.FACTORY_STAKER, deployedAccountAddress }) {
     const entryPointVersion = getEntryPointVersion(entryPointAddress);
     accountLogicAddress =
         entryPointVersion === "v0.6"
             ? KERNEL_ADDRESSES.ACCOUNT_LOGIC_V0_6
             : KERNEL_ADDRESSES.ACCOUNT_LOGIC_V0_7;
+    factoryAddress =
+        entryPointVersion === "v0.6"
+            ? KERNEL_ADDRESSES.FACTORY_ADDRESS_V0_6
+            : KERNEL_ADDRESSES.FACTORY_ADDRESS_V0_7;
     const kernelPluginManager = isKernelPluginManager(plugins)
         ? plugins
         : await toKernelPluginManager(client, {
@@ -149,6 +170,7 @@ export async function createKernelAccount(client, { plugins, entryPoint: entryPo
             index,
             factoryAddress,
             accountLogicAddress,
+            factoryStakerAddress,
             entryPoint: entryPointAddress,
             kernelPluginManager
         });
@@ -197,7 +219,10 @@ export async function createKernelAccount(client, { plugins, entryPoint: entryPo
                 smartAccountDeployed = await isSmartAccountDeployed(client, accountAddress);
                 if (smartAccountDeployed)
                     return undefined;
-                return factoryAddress;
+                const entryPointVersion = getEntryPointVersion(entryPointAddress);
+                return entryPointVersion === "v0.6"
+                    ? factoryAddress
+                    : factoryStakerAddress;
             },
             async getFactoryData() {
                 if (smartAccountDeployed)

package/_esm/accounts/kernel/createKernelAccount.js.map

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

package/_esm/actions/account-client/getUserOperationGasPrice.js

@@ -0,0 +1,11 @@
+export const getUserOperationGasPrice = async (client) => {
+    const gasPrice = await client.request({
+        method: "zd_getUserOperationGasPrice",
+        params: []
+    });
+    return {
+        maxFeePerGas: BigInt(gasPrice.standard.maxFeePerGas),
+        maxPriorityFeePerGas: BigInt(gasPrice.standard.maxPriorityFeePerGas)
+    };
+};
+//# sourceMappingURL=getUserOperationGasPrice.js.map

package/_esm/actions/account-client/getUserOperationGasPrice.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getUserOperationGasPrice.js","sourceRoot":"","sources":["../../../actions/account-client/getUserOperationGasPrice.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAKzC,MAA2E,EACtB,EAAE;IACvD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,6BAA6B;QACrC,MAAM,EAAE,EAAE;KACb,CAAC,CAAA;IAEF,OAAO;QACH,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;QACpD,oBAAoB,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC;KACvE,CAAA;AACL,CAAC,CAAA"}

package/_esm/actions/index.js

@@ -1,4 +1,5 @@
 export { sponsorUserOperation } from "./paymaster/sponsorUserOperation.js";
 export { signUserOperation } from "./account-client/signUserOperation.js";
+export { getUserOperationGasPrice } from "./account-client/getUserOperationGasPrice.js";
 export { estimateGasInERC20 } from "./paymaster/estimateGasInERC20.js";
 //# sourceMappingURL=index.js.map

package/_esm/actions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../actions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EAGvB,MAAM,qCAAqC,CAAA;AAE5C,OAAO,EACH,iBAAiB,EAGpB,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EACH,kBAAkB,EAGrB,MAAM,mCAAmC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../actions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EAGvB,MAAM,qCAAqC,CAAA;AAE5C,OAAO,EACH,iBAAiB,EAGpB,MAAM,uCAAuC,CAAA;AAE9C,OAAO,EACH,wBAAwB,EAE3B,MAAM,8CAA8C,CAAA;AAErD,OAAO,EACH,kBAAkB,EAGrB,MAAM,mCAAmC,CAAA"}

package/_esm/actions/paymaster/estimateGasInERC20.js

@@ -1,5 +1,5 @@
+import { ENTRYPOINT_ADDRESS_V06 } from "permissionless";
 import { deepHexlify } from "permissionless/utils";
-import { KERNEL_ADDRESSES } from "../../accounts/index.js";
 /**
  * Returns paymasterAndData & updated gas parameters required to sponsor a userOperation.
  */
@@ -11,7 +11,7 @@ export const estimateGasInERC20 = async (client, args) => {
                 chainId: client.chain?.id,
                 userOp: deepHexlify(args.userOperation),
                 tokenAddress: args.gasTokenAddress,
-                entryPointAddress: args.entryPoint ?? KERNEL_ADDRESSES.ENTRYPOINT_V0_6
+                entryPointAddress: args.entryPoint ?? ENTRYPOINT_ADDRESS_V06
             }
         ]
     });

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

@@ -1 +1 @@
-{"version":3,"file":"estimateGasInERC20.js","sourceRoot":"","sources":["../../../actions/paymaster/estimateGasInERC20.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAkB1D;;GAEG;AAEH,MAAM,CAAC,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,WAAW,CACf,IAAI,CAAC,aAAa,CACmB;gBACzC,YAAY,EAAE,IAAI,CAAC,eAAe;gBAClC,iBAAiB,EACb,IAAI,CAAC,UAAU,IAAI,gBAAgB,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"}
+{"version":3,"file":"estimateGasInERC20.js","sourceRoot":"","sources":["../../../actions/paymaster/estimateGasInERC20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAmBlD;;GAEG;AAEH,MAAM,CAAC,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,WAAW,CACf,IAAI,CAAC,aAAa,CACmB;gBACzC,YAAY,EAAE,IAAI,CAAC,eAAe;gBAClC,iBAAiB,EAAE,IAAI,CAAC,UAAU,IAAI,sBAAsB;aAC/D;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"}

package/_esm/clients/decorators/kernel.js

@@ -1,5 +1,6 @@
 import { smartAccountActions } from "permissionless";
 import {} from "permissionless/actions/smartAccount";
+import { getUserOperationGasPrice } from "../../actions/account-client/getUserOperationGasPrice.js";
 import { signUserOperation } from "../../actions/index.js";
 import { estimateGasInERC20 } from "../../actions/paymaster/estimateGasInERC20.js";
 import { sponsorUserOperation } from "../../actions/paymaster/sponsorUserOperation.js";
@@ -15,6 +16,7 @@ export const kernelAccountClientActions = ({ middleware }) => (client) => ({
     signUserOperation: (args) => signUserOperation(client, {
         ...args,
         middleware
-    })
+    }),
+    getUserOperationGasPrice: async () => getUserOperationGasPrice(client)
 });
 //# sourceMappingURL=kernel.js.map

package/_esm/clients/decorators/kernel.js.map

@@ -1 +1 @@
-{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../clients/decorators/kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAE9E,OAAO,EAAmB,MAAM,qCAAqC,CAAA;AAOrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAGH,kBAAkB,EACrB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAGH,oBAAoB,EACvB,MAAM,iDAAiD,CAAA;AAexD,MAAM,CAAC,MAAM,uBAAuB,GAChC,CAAgC,iBAA6B,EAAE,EAAE,CACjE,CAAC,MAAc,EAA6C,EAAE,CAAC,CAAC;IAC5D,oBAAoB,EAAE,KAAK,EACvB,IAAoE,EACtE,EAAE,CACA,oBAAoB,CAAC,MAA4C,EAAE;QAC/D,GAAG,IAAI;QACP,UAAU,EAAE,iBAAiB;KAChC,CAAC;IACN,kBAAkB,EAAE,KAAK,EAAE,IAAkC,EAAE,EAAE,CAC7D,kBAAkB,CACd,MAA4C,EAC5C,IAAI,CACP;CACR,CAAC,CAAA;AA2BN,MAAM,CAAC,MAAM,0BAA0B,GACnC,CAAgC,EAAE,UAAU,EAA0B,EAAE,EAAE,CAC1E,CAOI,MAAiD,EACY,EAAE,CAAC,CAAC;IACjE,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC;IAC9C,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CACxB,iBAAiB,CACb,MAAM,EACN;QACI,GAAG,IAAI;QACP,UAAU;KAC6C,CAC9D;CACR,CAAC,CAAA"}
+{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../clients/decorators/kernel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAE9E,OAAO,EAAmB,MAAM,qCAAqC,CAAA;AAGrE,OAAO,EAEH,wBAAwB,EAC3B,MAAM,0DAA0D,CAAA;AAKjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAGH,kBAAkB,EACrB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAGH,oBAAoB,EACvB,MAAM,iDAAiD,CAAA;AAexD,MAAM,CAAC,MAAM,uBAAuB,GAChC,CAAgC,iBAA6B,EAAE,EAAE,CACjE,CAAC,MAAc,EAA6C,EAAE,CAAC,CAAC;IAC5D,oBAAoB,EAAE,KAAK,EACvB,IAAoE,EACtE,EAAE,CACA,oBAAoB,CAAC,MAA4C,EAAE;QAC/D,GAAG,IAAI;QACP,UAAU,EAAE,iBAAiB;KAChC,CAAC;IACN,kBAAkB,EAAE,KAAK,EAAE,IAAkC,EAAE,EAAE,CAC7D,kBAAkB,CACd,MAA4C,EAC5C,IAAI,CACP;CACR,CAAC,CAAA;AAmCN,MAAM,CAAC,MAAM,0BAA0B,GACnC,CAAgC,EAAE,UAAU,EAA0B,EAAE,EAAE,CAC1E,CAOI,MAAiD,EACY,EAAE,CAAC,CAAC;IACjE,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC;IAC9C,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CACxB,iBAAiB,CACb,MAAM,EACN;QACI,GAAG,IAAI;QACP,UAAU;KAC6C,CAC9D;IACL,wBAAwB,EAAE,KAAK,IAAI,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;CACzE,CAAC,CAAA"}

package/_esm/clients/kernelAccountClient.js

@@ -1,5 +1,7 @@
+import { ENTRYPOINT_ADDRESS_V07 } from "permissionless";
 import { createClient } from "viem";
 import {} from "../accounts/index.js";
+import { getUserOperationGasPrice } from "../actions/account-client/getUserOperationGasPrice.js";
 import { kernelAccountClientActions } from "./decorators/kernel.js";
 export const createKernelAccountClient = (parameters) => {
     const { key = "Account", name = "Kernel Account Client", bundlerTransport } = parameters;
@@ -10,8 +12,18 @@ export const createKernelAccountClient = (parameters) => {
         transport: (opts) => bundlerTransport({ ...opts, retryCount: 0 }),
         type: "kernelAccountClient"
     });
+    let middleware = parameters.middleware;
+    if ((!middleware ||
+        (typeof middleware !== "function" && !middleware.gasPrice)) &&
+        parameters.entryPoint === ENTRYPOINT_ADDRESS_V07) {
+        const gasPrice = () => getUserOperationGasPrice(client);
+        middleware = {
+            ...middleware,
+            gasPrice
+        };
+    }
     return client.extend(kernelAccountClientActions({
-        middleware: parameters.middleware
+        middleware
     }));
 };
 //# sourceMappingURL=kernelAccountClient.js.map

package/_esm/clients/kernelAccountClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"kernelAccountClient.js","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":"AAIA,OAAO,EAKH,YAAY,EACf,MAAM,MAAM,CAAA;AACb,OAAO,EAA2B,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAEH,0BAA0B,EAC7B,MAAM,wBAAwB,CAAA;AAsC/B,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAQrC,UAKC,EACiE,EAAE;IACpE,MAAM,EACF,GAAG,GAAG,SAAS,EACf,IAAI,GAAG,uBAAuB,EAC9B,gBAAgB,EACnB,GAAG,UAAU,CAAA;IACd,MAAM,MAAM,GAAG,YAAY,CAAC;QACxB,GAAG,UAAU;QACb,GAAG;QACH,IAAI;QACJ,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;QACjE,IAAI,EAAE,qBAAqB;KAC9B,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,MAAM,CAChB,0BAA0B,CAAC;QACvB,UAAU,EAAE,UAAU,CAAC,UAAU;KACpC,CAAC,CACiE,CAAA;AAC3E,CAAC,CAAA"}
+{"version":3,"file":"kernelAccountClient.js","sourceRoot":"","sources":["../../clients/kernelAccountClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AAKvD,OAAO,EAKH,YAAY,EACf,MAAM,MAAM,CAAA;AACb,OAAO,EAA2B,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAA;AAChG,OAAO,EAEH,0BAA0B,EAC7B,MAAM,wBAAwB,CAAA;AAsC/B,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAQrC,UAKC,EACiE,EAAE;IACpE,MAAM,EACF,GAAG,GAAG,SAAS,EACf,IAAI,GAAG,uBAAuB,EAC9B,gBAAgB,EACnB,GAAG,UAAU,CAAA;IACd,MAAM,MAAM,GAAG,YAAY,CAAC;QACxB,GAAG,UAAU;QACb,GAAG;QACH,IAAI;QACJ,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;QACjE,IAAI,EAAE,qBAAqB;KAC9B,CAAC,CAAA;IAEF,IAAI,UAAU,GAAG,UAAU,CAAC,UAAU,CAAA;IAEtC,IACI,CAAC,CAAC,UAAU;QACR,CAAC,OAAO,UAAU,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/D,UAAU,CAAC,UAAU,KAAK,sBAAsB,EAClD,CAAC;QACC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAA;QACvD,UAAU,GAAG;YACT,GAAG,UAAU;YACb,QAAQ;SACX,CAAA;IACL,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAChB,0BAA0B,CAAC;QACvB,UAAU;KACb,CAAC,CACiE,CAAA;AAC3E,CAAC,CAAA"}

package/_esm/constants.js

@@ -6,7 +6,7 @@ export const KernelImplToVersionMap = {
     "0xD3F582F6B4814E989Ee8E96bc3175320B5A540ab": "0.2.3",
     "0x5FC0236D6c88a65beD32EECDC5D60a5CAb377717": "0.2.3",
     "0xd3082872F8B06073A021b4602e022d5A070d7cfC": "0.2.4",
-    "0x541E811D24A54745619a5B9f0c1d4B08D5740144": "0.3.0-beta"
+    "0xe59cffb45AFFB215e3823F7D1a207a71C1aa09c3": "0.3.0-beta"
 };
 export const TOKEN_ACTION = "0x2087C7FfD0d0DAE80a00EE74325aBF3449e0eaf1";
 export const KERNEL_NAME = "Kernel";

package/_esm/index.js

@@ -7,6 +7,8 @@ export {} from "./types/kernel.js";
 export { KernelAccountAbi } from "./accounts/kernel/abi/KernelAccountAbi.js";
 export { KernelFactoryAbi } from "./accounts/kernel/abi/KernelFactoryAbi.js";
 export { KernelV3AccountAbi, KernelV3ExecuteAbi, KernelV3InitAbi } from "./accounts/kernel/abi/kernel_v_3_0_0/KernelAccountAbi.js";
+export { KernelV3FactoryAbi } from "./accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryAbi.js";
+export { KernelFactoryStakerAbi } from "./accounts/kernel/abi/kernel_v_3_0_0/KernelFactoryStakerAbi.js";
 export { TokenActionsAbi } from "./accounts/kernel/abi/TokenActionsAbi.js";
 import * as constants_1 from "./constants.js";
 export { constants_1 as constants };

package/_esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EAErB,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACH,oBAAoB,EAGvB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EACH,uBAAuB,EAEvB,0BAA0B,EAE7B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EACH,4BAA4B,EAE/B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,yBAAyB,EAE5B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAIN,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EACH,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EAClB,MAAM,0DAA0D,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;6BAC/C,gBAAgB;wBAA/B,SAAS;AACrB,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAwB,MAAM,wBAAwB,CAAA;AAChF,OAAO,EACH,sBAAsB,EACtB,2BAA2B,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EAErB,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACH,oBAAoB,EAGvB,MAAM,6CAA6C,CAAA;AACpD,OAAO,EACH,uBAAuB,EAEvB,0BAA0B,EAE7B,MAAM,gCAAgC,CAAA;AACvC,OAAO,EACH,4BAA4B,EAE/B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EACH,yBAAyB,EAE5B,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAIN,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EACH,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EAClB,MAAM,0DAA0D,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0DAA0D,CAAA;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAA;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAA;6BAC/C,gBAAgB;wBAA/B,SAAS;AACrB,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAwB,MAAM,wBAAwB,CAAA;AAChF,OAAO,EACH,sBAAsB,EACtB,2BAA2B,EAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA"}

package/_esm/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../types/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../types/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA"}

package/_esm/types/kernel.js.map

@@ -1 +1 @@
-{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6C,MAAM,MAAM,CAAA;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAgJhD,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;AACzB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB"}
+{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../types/kernel.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6C,MAAM,MAAM,CAAA;AAEhE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAuKhD,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,sCAAqB,CAAA;AACzB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB"}

package/_esm/utils.js

@@ -1,7 +1,6 @@
-import { getEntryPointVersion } from "permissionless";
+import { ENTRYPOINT_ADDRESS_V06, getEntryPointVersion } from "permissionless";
 import { satisfies } from "semver";
 import { concatHex, encodeFunctionData, erc20Abi, hexToSignature, isHex, pad, signatureToHex, zeroAddress } from "viem";
-import { KERNEL_ADDRESSES } from "./accounts/index.js";
 import { CALL_TYPE, EXEC_TYPE, KernelImplToVersionMap, LATEST_KERNEL_VERSION } from "./constants.js";
 export const getKernelVersion = (entryPointAddress, kernelImpl) => {
     const entryPointVersion = getEntryPointVersion(entryPointAddress);
@@ -36,7 +35,7 @@ export const getERC20PaymasterApproveCall = async (client, { gasToken, approveAm
         params: [
             {
                 chainId: client.chain?.id,
-                entryPointAddress: KERNEL_ADDRESSES.ENTRYPOINT_V0_6
+                entryPointAddress: ENTRYPOINT_ADDRESS_V06
             }
         ]
     });

package/_esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,EAGH,SAAS,EACT,kBAAkB,EAClB,QAAQ,EACR,cAAc,EACd,KAAK,EACL,GAAG,EACH,cAAc,EACd,WAAW,EACd,MAAM,MAAM,CAAA;AAEb,OAAO,EACH,SAAS,EACT,SAAS,EACT,sBAAsB,EACtB,qBAAqB,EACxB,MAAM,gBAAgB,CAAA;AAEvB,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,iBAA6B,EAC7B,UAAoB,EACd,EAAE;IACR,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAA;IACjE,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,WAAW;QACzC,OAAO,qBAAqB,CAAC,iBAAiB,CAAC,CAAA;IACnD,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;QAC/D,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE;YAAE,OAAO,GAAG,CAAA;IACnE,CAAC;IACD,OAAO,OAAO,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,8DAA2C,CAAA;IAC3C,oEAAiD,CAAA;IACjD,kGAA+E,CAAA;AACnF,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B;AAED,MAAM,0BAA0B,GAAoC;IAChE,CAAC,eAAe,CAAC,mBAAmB,CAAC,EAAE,yBAAyB;IAChE,CAAC,eAAe,CAAC,sBAAsB,CAAC,EAAE,cAAc;IACxD,CAAC,eAAe,CAAC,qCAAqC,CAAC,EAAE,cAAc;CAC1E,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC5B,OAAwB,EACxB,OAAe,EACR,EAAE;IACT,IAAI,CAAC,CAAC,OAAO,IAAI,0BAA0B,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,OAAO,SAAS,CAAC,OAAO,EAAE,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAA;AAClE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAC7C,MAA0C,EAC1C,EACI,QAAQ,EACR,aAAa,EAIhB,EACiD,EAAE;IACpD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAClC,MAAM,EAAE,gBAAgB;QACxB,MAAM,EAAE;YACJ;gBACI,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,EAAY;gBACnC,iBAAiB,EAAE,sBAAsB;aAC5C;SACJ;KACJ,CAAC,CAAA;IACF,OAAO;QACH,EAAE,EAAE,QAAQ;QACZ,IAAI,EAAE,kBAAkB,CAAC;YACrB,GAAG,EAAE,QAAQ;YACb,YAAY,EAAE,SAAS;YACvB,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC;SACrC,CAAC;QACF,KAAK,EAAE,EAAE;KACZ,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAO,EAAE;IAC3C,IAAI,SAAS,GAAG,GAAG,CAAA;IACnB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACpB,SAAS,GAAG,KAAK,SAAS,EAAE,CAAA;QAC5B,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAA;QACjD,CAAC;IACL,CAAC;IAED,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;IAC3C,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;QAAE,CAAC,IAAI,GAAG,CAAA;IAClC,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;IAC1C,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EACxB,QAAQ,EACR,QAAQ,EAIX,EAAO,EAAE;IACN,OAAO,SAAS,CAAC;QACb,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,SAAS;QACnB,YAAY,EAAE,UAAU;QACxB,YAAY,EAAE,UAAU;QACxB,GAAG,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;KAClC,CAAC,CAAA;AACN,CAAC,CAAA"}