permissionless 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # permissionless
 
+## 0.2.4
+
+### Patch Changes
+
+- 7d4602c831430744916dda33983be0583d9b0662: Added utility functions to encode 7579 function calldata
+- d23ee0d5b530134756ea098f6233910f79cba83e: Added support to send calls with 7579 functions and override paymaster props
+- d23ee0d5b530134756ea098f6233910f79cba83e: Added support for initData & deInitData
+
+## 0.2.3
+
+### Patch Changes
+
+- 80176c6b99c3406d23bdf230f6c33b8e0e34bbb9: Fixed - give priority to nonceKey passed in parameters
+
 ## 0.2.2
 
 ### Patch Changes

package/README.md

@@ -4,21 +4,33 @@
 
 ![Node Version](https://img.shields.io/badge/node-20.x-green)
 
-permissionless.js is a TypeScript library built on top of [viem](https://viem.sh) for deploying and managing [ERC-4337](https://eips.ethereum.org/EIPS/eip-4337) smart accounts, interacting with bundlers and paymasters, and leveraging custom signers.
+permissionless.js is a TypeScript library built on top of
+[viem](https://viem.sh) for deploying and managing
+[ERC-4337](https://eips.ethereum.org/EIPS/eip-4337) smart accounts, interacting
+with bundlers and paymasters, and leveraging custom signers.
 
 ## Features
 
-- **High-Level Smart Account Support**: We support a high-level API for deploying and managing smart accounts, including some of the most popular implementations ([Safe](https://safe.global), [Kernel](https://zerodev.app), [Biconomy](https://biconomy.io), etc.)
-- **Bundler Support**: We support all bundler actions following [ERC-4337](https://eips.ethereum.org/EIPS/eip-4337#rpc-methods-eth-namespace).
-- **Gas Sponsorship**: We support paymaster actions to allow you to easily sponsor gas fees.
-- **User Operation Utility Functions**: We provide many low-level utility functions useful for dealing with User Operations.
-- **Modular and Extensible**: We allow you to easily create and plug in your own smart account systems, bundlers, paymasters, and signers.
-- **Built on & for viem**: permissionless.js is designed to be a thin wrapper around viem, maintaining the same style and overall feel viem provides.
+- **High-Level Smart Account Support**: We support a high-level API for
+  deploying and managing smart accounts, including some of the most popular
+  implementations ([Safe](https://safe.global), [Kernel](https://zerodev.app),
+  [Biconomy](https://biconomy.io), etc.)
+- **Bundler Support**: We support all bundler actions following
+  [ERC-4337](https://eips.ethereum.org/EIPS/eip-4337#rpc-methods-eth-namespace).
+- **Gas Sponsorship**: We support paymaster actions to allow you to easily
+  sponsor gas fees.
+- **User Operation Utility Functions**: We provide many low-level utility
+  functions useful for dealing with User Operations.
+- **Modular and Extensible**: We allow you to easily create and plug in your own
+  smart account systems, bundlers, paymasters, and signers.
+- **Built on & for viem**: permissionless.js is designed to be a thin wrapper
+  around viem, maintaining the same style and overall feel viem provides.
 - and a lot more...
 
 ## Documentation
 
-[Take a look at our documentation](https://docs.pimlico.io/permissionless) to learn more about permissionless.js.
+[Take a look at our documentation](https://docs.pimlico.io/permissionless) to
+learn more about permissionless.js.
 
 ## Installation
 
@@ -42,27 +54,43 @@ yarn add viem permissionless
 
 ```typescript
 // Import the required modules.
-import { createBundlerClient } from "permissionless"
-import { sepolia } from "viem/chains"
-import { http } from "viem"
+import { createSmartAccountClient } from "permissionless";
+import { createPaymasterClient } from "viem/account-abstraction";
+import { sepolia } from "viem/chains";
+import { http } from "viem";
 
-// Create the required clients.
-const bundlerClient = createBundlerClient({
-    chain: sepolia,
-    transport: http(`https://api.pimlico.io/v1/sepolia/rpc?apikey=${pimlicoApiKey}`) // Use any bundler url
+const paymaster = createPaymasterClient({
+  transport: http(`https://api.pimlico.io/v2/sepolia/rpc?apikey=${pimlicoApiKey}`)
+})
+
+const account = toSimpleSmartAccount<entryPointVersion>({
+  client: getPublicClient(anvilRpc),
+  owner: privateKeyToAccount(generatePrivateKey())
 })
 
+// Create the required clients.
+const bundlerClient = createSmartAccountClient({
+  account,
+  paymaster: 
+  chain: sepolia,
+  bundlerTransport: http(
+    `https://api.pimlico.io/v2/sepolia/rpc?apikey=${pimlicoApiKey}`,
+  ), // Use any bundler url
+});
+
 // Consume bundler, paymaster, and smart account actions!
 const userOperationReceipt = await bundlerClient.getUserOperationReceipt({
-    hash: "0x5faea6a3af76292c2b23468bbea96ef63fb31360848be195748437f0a79106c8"
-})
+  hash: "0x5faea6a3af76292c2b23468bbea96ef63fb31360848be195748437f0a79106c8",
+});
 ```
 
 ## Contributors
 
-For a full explanation of permissionless.js, please visit our [docs page](https://docs.pimlico.io/permissionless)
+For a full explanation of permissionless.js, please visit our
+[docs page](https://docs.pimlico.io/permissionless)
 
 Build permissionless.js locally with:
+
 ```bash
 bun run build
 ```

package/_cjs/accounts/biconomy/toBiconomySmartAccount.js

@@ -68,7 +68,7 @@ async function toBiconomySmartAccount(parameters) {
             return (0, getAccountNonce_1.getAccountNonce)(client, {
                 address,
                 entryPointAddress: entryPoint.address,
-                key: args?.key ?? parameters?.nonceKey
+                key: parameters?.nonceKey ?? args?.key
             });
         },
         encodeCalls: async (calls) => {

package/_cjs/accounts/biconomy/toBiconomySmartAccount.js.map

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

package/_cjs/accounts/light/toLightSmartAccount.js

@@ -196,7 +196,7 @@ async function toLightSmartAccount(parameters) {
             return (0, getAccountNonce_1.getAccountNonce)(client, {
                 address: await this.getAddress(),
                 entryPointAddress: entryPoint.address,
-                key: args?.key ?? nonceKey
+                key: nonceKey ?? args?.key
             });
         },
         async getStubSignature() {

package/_cjs/accounts/light/toLightSmartAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":";;;AAAA,+BAgBa;AACb,kEASiC;AACjC,0CAAsD;AACtD,sCAAsC;AACtC,0EAAsE;AACtE,4EAAwE;AACxE,iDAA6C;AAE7C,MAAM,kBAAkB,GAAG,KAAK,EAC5B,KAAc,EACd,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EACL,EAAE;IACd,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAEtD,OAAO,IAAA,yBAAkB,EAAC;QACtB,GAAG,EAAE;YACD;gBACI,MAAM,EAAE;oBACJ;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE;oBACL;wBACI,YAAY,EAAE,uBAAuB;wBACrC,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,eAAe,EAAE,YAAY;gBAC7B,IAAI,EAAE,UAAU;aACnB;SACJ;QACD,YAAY,EAAE,eAAe;QAC7B,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;KACvB,CAAC,CAAA;AACN,CAAC,CAAA;AAyBD,KAAK,UAAU,qBAAqB,CAChC,MAAoB,EACpB,OAAe,EACf,cAAuB,EACvB,aAAkB;IAElB,OAAO,MAAM,CAAC,aAAa,CAAC;QACxB,MAAM,EAAE;YACJ,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;YACxB,IAAI,EAAE,cAAc;YACpB,iBAAiB,EAAE,cAAc;YACjC,OAAO,EAAE,GAAG;SACf;QACD,KAAK,EAAE;YACH,mBAAmB,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SAC5D;QACD,OAAO,EAAE;YACL,OAAO,EAAE,aAAa;SACzB;QACD,WAAW,EAAE,qBAAqB;KACrC,CAAC,CAAA;AACN,CAAC;AAED,MAAM,8BAA8B,GAIhC;IACA,OAAO,EAAE;QACL,cAAc,EAAE,4CAA4C;KAC/D;IACD,OAAO,EAAE;QACL,cAAc,EAAE,4CAA4C;KAC/D;CACJ,CAAA;AAED,MAAM,mBAAmB,GAAG,CACxB,mBAAuD,EACvD,EACI,cAAc,EAAE,eAAe,EAGlC,EACH,EAAE;IACA,MAAM,cAAc,GAChB,eAAe;QACf,8BAA8B,CAAC,mBAAmB,CAAC,CAAC,cAAc,CAAA;IAEtE,OAAO;QACH,cAAc;KACjB,CAAA;AACL,CAAC,CAAA;AAkBD,IAAK,aAIJ;AAJD,WAAK,aAAa;IACd,6BAAY,CAAA;AAGhB,CAAC,EAJI,aAAa,KAAb,aAAa,QAIjB;AAOM,KAAK,UAAU,mBAAmB,CAGrC,UAA4D;IAE5D,MAAM,EACF,OAAO,EACP,cAAc,EAAE,eAAe,EAC/B,OAAO,EACP,KAAK,EACL,MAAM,EACN,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EACjB,QAAQ,EACX,GAAG,UAAU,CAAA;IAEd,MAAM,UAAU,GAAG,MAAM,IAAA,iBAAO,EAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IAE3C,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,IAAI,yCAAmB;QAC9D,GAAG,EACC,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,IAAI,KAAK,CAAC,KAAK,KAAK;YAC/C,CAAC,CAAC,qCAAe;YACjB,CAAC,CAAC,qCAAe;QACzB,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,IAAI,KAAK;KAC1C,CAAA;IAEV,MAAM,EAAE,cAAc,EAAE,GAAG,mBAAmB,CAAC,OAAO,EAAE;QACpD,cAAc,EAAE,eAAe;KAClC,CAAC,CAAA;IAEF,IAAI,cAAc,GAAwB,OAAO,CAAA;IAEjD,IAAI,OAAe,CAAA;IAEnB,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;QAClC,IAAI,OAAO;YAAE,OAAO,OAAO,CAAA;QAC3B,OAAO,GAAG,MAAM,CAAC,KAAK;YAClB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACjB,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,MAAM,EAAE,oBAAU,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAA;QAC3D,OAAO,OAAO,CAAA;IAClB,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;QAC9B,OAAO;YACH,OAAO,EAAE,cAAc;YACvB,WAAW,EAAE,MAAM,kBAAkB,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC;SACnE,CAAA;IACL,CAAC,CAAA;IAED,OAAO,IAAA,oCAAc,EAAC;QAClB,MAAM;QACN,UAAU;QACV,cAAc;QACd,KAAK,CAAC,UAAU;YACZ,IAAI,cAAc;gBAAE,OAAO,cAAc,CAAA;YAEzC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,cAAc,EAAE,CAAA;YAEvD,cAAc,GAAG,MAAM,IAAA,mCAAgB,EAAC,MAAM,EAAE;gBAC5C,OAAO;gBACP,WAAW;gBACX,iBAAiB,EAAE,UAAU,CAAC,OAAO;aACxC,CAAC,CAAA;YAEF,OAAO,cAAc,CAAA;QACzB,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,KAAK;YACnB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACnB,OAAO,IAAA,yBAAkB,EAAC;oBACtB,GAAG,EAAE;wBACD;4BACI,MAAM,EAAE;gCACJ;oCACI,YAAY,EAAE,WAAW;oCACzB,IAAI,EAAE,MAAM;oCACZ,IAAI,EAAE,WAAW;iCACpB;gCACD;oCACI,YAAY,EAAE,WAAW;oCACzB,IAAI,EAAE,OAAO;oCACb,IAAI,EAAE,WAAW;iCACpB;gCACD;oCACI,YAAY,EAAE,SAAS;oCACvB,IAAI,EAAE,MAAM;oCACZ,IAAI,EAAE,SAAS;iCAClB;6BACJ;4BACD,IAAI,EAAE,cAAc;4BACpB,OAAO,EAAE,EAAE;4BACX,eAAe,EAAE,YAAY;4BAC7B,IAAI,EAAE,UAAU;yBACnB;qBACJ;oBACD,YAAY,EAAE,cAAc;oBAC5B,IAAI,EAAE;wBACF,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACtB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;wBAC/B,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC;qBACnC;iBACJ,CAAC,CAAA;YACN,CAAC;YAED,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAEtD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;YACzC,CAAC;YAED,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE;oBACD;wBACI,MAAM,EAAE;4BACJ;gCACI,YAAY,EAAE,SAAS;gCACvB,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,SAAS;6BAClB;4BACD;gCACI,YAAY,EAAE,SAAS;gCACvB,IAAI,EAAE,OAAO;gCACb,IAAI,EAAE,SAAS;6BAClB;4BACD;gCACI,YAAY,EAAE,OAAO;gCACrB,IAAI,EAAE,MAAM;gCACZ,IAAI,EAAE,OAAO;6BAChB;yBACJ;wBACD,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,EAAE;wBACX,eAAe,EAAE,YAAY;wBAC7B,IAAI,EAAE,UAAU;qBACnB;iBACJ;gBACD,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;aACvD,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,QAAQ,CAAC,IAAI;YACf,OAAO,IAAA,iCAAe,EAAC,MAAM,EAAE;gBAC3B,OAAO,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE;gBAChC,iBAAiB,EAAE,UAAU,CAAC,OAAO;gBACrC,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,QAAQ;aAC7B,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,gBAAgB;YAClB,MAAM,SAAS,GACX,sIAAsI,CAAA;YAE1I,QAAQ,OAAO,EAAE,CAAC;gBACd,KAAK,OAAO;oBACR,OAAO,SAAS,CAAA;gBACpB,KAAK,OAAO;oBACR,OAAO,IAAA,aAAM,EAAC,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;gBACjD;oBACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;YACxD,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACf,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9C,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YACzB,MAAM,SAAS,GAAG,MAAM,qBAAqB,CACzC,UAAU,EACV,MAAM,kBAAkB,EAAE,EAC1B,MAAM,IAAI,CAAC,UAAU,EAAE,EACvB,IAAA,kBAAW,EAAC,OAAO,CAAC,CACvB,CAAA;YAED,QAAQ,OAAO,EAAE,CAAC;gBACd,KAAK,OAAO;oBACR,OAAO,SAAS,CAAA;gBACpB,KAAK,OAAO;oBACR,OAAO,IAAA,aAAM,EAAC,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;gBACjD;oBACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;YACxD,CAAC;QACL,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YACzB,MAAM,SAAS,GAAG,MAAM,qBAAqB,CACzC,UAAU,EACV,MAAM,kBAAkB,EAAE,EAC1B,MAAM,IAAI,CAAC,UAAU,EAAE,EACvB,IAAA,oBAAa,EAAC,SAAS,CAAC,CAC3B,CAAA;YAED,QAAQ,OAAO,EAAE,CAAC;gBACd,KAAK,OAAO;oBACR,OAAO,SAAS,CAAA;gBACpB,KAAK,OAAO;oBACR,OAAO,IAAA,aAAM,EAAC,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;gBACjD;oBACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;YACxD,CAAC;QACL,CAAC;QACD,KAAK,CAAC,iBAAiB,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,GAAG,MAAM,kBAAkB,EAAE,EAAE,GAAG,aAAa,EAAE,GAC5D,UAAU,CAAA;YAEd,MAAM,IAAI,GAAG,IAAA,0CAAoB,EAAC;gBAC9B,aAAa,EAAE;oBACX,GAAG,aAAa;oBAChB,SAAS,EAAE,IAAI;iBACkB;gBACrC,iBAAiB,EAAE,UAAU,CAAC,OAAO;gBACrC,iBAAiB,EAAE,UAAU,CAAC,OAAO;gBACrC,OAAO,EAAE,OAAO;aACnB,CAAC,CAAA;YAEF,MAAM,SAAS,GAAG,MAAM,IAAA,qBAAW,EAAC,MAAM,EAAE;gBACxC,OAAO,EAAE,UAAU;gBACnB,OAAO,EAAE;oBACL,GAAG,EAAE,IAAI;iBACZ;aACJ,CAAC,CAAA;YAEF,QAAQ,OAAO,EAAE,CAAC;gBACd,KAAK,OAAO;oBACR,OAAO,SAAS,CAAA;gBACpB,KAAK,OAAO;oBACR,OAAO,IAAA,aAAM,EAAC,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;gBACjD;oBACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;YACxD,CAAC;QACL,CAAC;KACJ,CAA8D,CAAA;AACnE,CAAC;AAnOD,kDAmOC"}
+{"version":3,"file":"toLightSmartAccount.js","sourceRoot":"","sources":["../../../accounts/light/toLightSmartAccount.ts"],"names":[],"mappings":"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"}

package/_cjs/accounts/safe/toSafeSmartAccount.js

@@ -889,7 +889,7 @@ async function toSafeSmartAccount(parameters) {
             return (0, getAccountNonce_1.getAccountNonce)(client, {
                 address: await this.getAddress(),
                 entryPointAddress: entryPoint.address,
-                key: args?.key ?? nonceKey
+                key: nonceKey ?? args?.key
             });
         },
         async getStubSignature() {

package/_cjs/accounts/safe/toSafeSmartAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"toSafeSmartAccount.js","sourceRoot":"","sources":["../../../accounts/safe/toSafeSmartAccount.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"toSafeSmartAccount.js","sourceRoot":"","sources":["../../../accounts/safe/toSafeSmartAccount.ts"],"names":[],"mappings":";;;AAAA,+BA6Ba;AACb,kEAQiC;AACjC,0CAAsE;AACtE,sCAAsC;AACtC,0EAAsE;AACtE,uCAA6D;AAC7D,iEAA6D;AAI7D,MAAM,YAAY,GAAG;IACjB;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,OAAO;aAChB;SACJ;QACD,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,SAAS;QAC1B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAEV,MAAM,eAAe,GAAG;IACpB;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE;YACJ;gBACI,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,SAAS;aAC1B;YACD;gBACI,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,qBAAqB;gBACnC,UAAU,EAAE;oBACR;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBAC1B;oBACD;wBACI,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,OAAO;wBACb,YAAY,EAAE,OAAO;qBACxB;iBACJ;aACJ;YACD;gBACI,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,qBAAqB;gBACnC,UAAU,EAAE;oBACR;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBAC1B;oBACD;wBACI,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,OAAO;wBACb,YAAY,EAAE,OAAO;qBACxB;iBACJ;aACJ;YACD;gBACI,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,qBAAqB;gBACnC,UAAU,EAAE;oBACR;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBAC1B;oBACD;wBACI,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,OAAO;wBACb,YAAY,EAAE,OAAO;qBACxB;iBACJ;aACJ;YACD;gBACI,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,WAAW;gBACjB,YAAY,EAAE,WAAW;aAC5B;YACD;gBACI,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,OAAO;gBACb,YAAY,EAAE,OAAO;aACxB;SACJ;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAChC;CACK,CAAA;AAEV,MAAM,qBAAqB,GAAG;IAC1B;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE;YACJ;gBACI,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,SAAS;aAC1B;YACD;gBACI,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,SAAS;gBACf,YAAY,EAAE,SAAS;aAC1B;YACD;gBACI,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO;gBACb,YAAY,EAAE,OAAO;aACxB;SACJ;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAChC;CACK,CAAA;AAEV,MAAM,gBAAgB,GAAG;IACrB;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,WAAW;aACpB;SACJ;QACD,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAEV,MAAM,QAAQ,GAAG;IACb;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,WAAW;aACpB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,iBAAiB;gBAC/B,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAEV,MAAM,uBAAuB,GAAG;IAC5B;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE;YACL;gBACI,YAAY,EAAE,oBAAoB;gBAClC,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;SACJ;QACD,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAEV,MAAM,YAAY,GAAG;IACjB;QACI,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE;YACJ;gBACI,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,OAAO;gBACb,YAAY,EAAE,mCAAmC;gBACjD,UAAU,EAAE;oBACR;wBACI,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBAC1B;oBACD;wBACI,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,WAAW;wBACjB,YAAY,EAAE,WAAW;qBAC5B;oBACD;wBACI,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBAC1B;oBACD;wBACI,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,SAAS;qBAC1B;oBACD;wBACI,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,OAAO;wBACb,YAAY,EAAE,OAAO;qBACxB;oBACD;wBACI,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,oBAAoB;qBACrC;oBACD;wBACI,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,SAAS;wBACf,YAAY,EAAE,qBAAqB;wBACnC,UAAU,EAAE;4BACR;gCACI,IAAI,EAAE,QAAQ;gCACd,IAAI,EAAE,SAAS;gCACf,YAAY,EAAE,SAAS;6BAC1B;4BACD;gCACI,IAAI,EAAE,UAAU;gCAChB,IAAI,EAAE,OAAO;gCACb,YAAY,EAAE,OAAO;6BACxB;yBACJ;qBACJ;oBACD;wBACI,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,OAAO;wBACb,YAAY,EAAE,OAAO;qBACxB;iBACJ;aACJ;SACJ;QACD,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;KAChC;CACK,CAAA;AAEV,MAAM,+BAA+B,GAAG;IACpC;QACI,MAAM,EAAE;YACJ;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,OAAO;aAChB;SACJ;QACD,IAAI,EAAE,8BAA8B;QACpC,OAAO,EAAE,EAAE;QACX,eAAe,EAAE,YAAY;QAC7B,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAEV,MAAM,8BAA8B,GAAG;IACnC,MAAM,EAAE;QACJ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE;QACjC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE;QAC/C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE;QAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE;KAC1C;CACJ,CAAA;AAED,MAAM,8BAA8B,GAAG;IACnC,MAAM,EAAE;QACJ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE;QACjC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE;QAClC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;QACnC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE;QAC/C,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,sBAAsB,EAAE;QACjD,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;QACzC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE;QAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE;QACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE;KAC1C;CACJ,CAAA;AAED,MAAM,6BAA6B,GAW/B;IACA,OAAO,EAAE;QACL,KAAK,EAAE;YACH,yBAAyB,EACrB,4CAA4C;YAChD,wBAAwB,EACpB,4CAA4C;YAChD,0BAA0B,EACtB,4CAA4C;YAChD,sBAAsB,EAClB,4CAA4C;YAChD,kBAAkB,EAAE,4CAA4C;YAChE,4BAA4B,EACxB,4CAA4C;SACnD;QACD,KAAK,EAAE;YACH,yBAAyB,EACrB,4CAA4C;YAChD,wBAAwB,EACpB,4CAA4C;YAChD,0BAA0B,EACtB,4CAA4C;YAChD,sBAAsB,EAClB,4CAA4C;YAChD,kBAAkB,EAAE,4CAA4C;YAChE,4BAA4B,EACxB,4CAA4C;SACnD;KACJ;CACJ,CAAA;AAED,MAAM,kBAAkB,GAAG,CACvB,aAA+C,EAC/C,SAAiB,EACd,EAAE;IACL,MAAM,iBAAiB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;IACxC,MAAM,gCAAgC,GAAG,EAAE,CAAA;IAC3C,IAAI,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACzD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;IACxC,CAAC;IACD,IAAI,aAAa,KAAK,UAAU,EAAE,CAAC;QAC/B,IAAI,UAAU,GAAG,gCAAgC,EAAE,CAAC;YAChD,UAAU,IAAI,gCAAgC,CAAA;QAClD,CAAC;QACD,UAAU,IAAI,CAAC,CAAA;IACnB,CAAC;IACD,IAAI,aAAa,KAAK,mBAAmB,EAAE,CAAC;QACxC,IAAI,UAAU,GAAG,gCAAgC,EAAE,CAAC;YAChD,UAAU,IAAI,gCAAgC,CAAA;QAClD,CAAC;IACL,CAAC;IACD,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAQ,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,CAI/B,OAAwE,EACrE,EAAE;IACL,MAAM,eAAe,GAAG,OAA0B,CAAA;IAElD,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,eAAe,CAAC,GAAG,EAAE,CAAC;QAC7D,OAAO,IAAA,kBAAW,EAAC,eAAe,CAAC,CAAA;IACvC,CAAC;IAED,OAAO,IAAA,oBAAa,EAChB,OAAwD,CAC3D,CAAA;AACL,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAAC,EAKlC,EAAU,EAAE;IACT,MAAM,OAAO,GAAG,IAAA,mBAAY,EACxB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EACnD;QACI,EAAE,CAAC,SAAS;QACZ,EAAE,CAAC,EAAE;QACL,EAAE,CAAC,KAAK;QACR,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACnC,EAAE,CAAC,IAAI;KACV,CACJ,CAAA;IACD,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAC3B,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACpB,GAKG,EACU,EAAE;IACf,MAAM,IAAI,GAAkB,KAAK,GAAG;SAC/B,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC;SAC1C,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;IAEf,OAAO,IAAA,yBAAkB,EAAC;QACtB,GAAG,EAAE,YAAY;QACjB,YAAY,EAAE,WAAW;QACzB,IAAI,EAAE,CAAC,IAAI,CAAC;KACf,CAAC,CAAA;AACN,CAAC,CAAA;AAED,MAAM,wBAAwB,GAAG,CAAC,EAC9B,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,KAAK,EACL,UAAU,EACV,SAAS,EACT,SAAS,EACT,KAAK,EACL,SAAS,EACT,kBAAkB,EAerB,EAAE,EAAE;IACD,MAAM,QAAQ,GAAG;QACb,SAAS,EAAE,oBAAoB;QAC/B,MAAM,EAAE,CAAC,KAAK,CAAC;QACf,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QACpB,OAAO,EAAE,uBAAuB;QAChC,SAAS,EAAE,IAAA,yBAAkB,EAAC;YAC1B,GAAG,EAAE,eAAe;YACpB,YAAY,EAAE,cAAc;YAC5B,IAAI,EAAE;gBACF,qBAAqB;gBACrB,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACzB,MAAM,EAAE,QAAQ,CAAC,OAAO;oBACxB,QAAQ,EAAE,QAAQ,CAAC,OAAO;iBAC7B,CAAC,CAAC;gBACH,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACzB,MAAM,EAAE,QAAQ,CAAC,OAAO;oBACxB,QAAQ,EAAE,QAAQ,CAAC,OAAO;iBAC7B,CAAC,CAAC;gBACH,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACjB,MAAM,EAAE,IAAI,CAAC,OAAO;oBACpB,QAAQ,EAAE,IAAI,CAAC,OAAO;iBACzB,CAAC,CAAC;gBACH,SAAS;gBACT,kBAAkB;aACrB;SACJ,CAAC;QACF,QAAQ,EAAE,qBAAqB;QAC/B,UAAU,EAAE,UAAU;KACzB,CAAA;IAED,OAAO,QAAQ,CAAA;AACnB,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAC9B,KAAK,EACL,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,oBAAoB,EACpB,uBAAuB,EACvB,iBAAiB,GAAG,EAAE,EACtB,WAAW,GAAG,EAAE,EAChB,UAAU,GAAG,EAAE,EACf,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,EAAE,EACd,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,EAAE,EACd,kBAAkB,GAAG,CAAC,EACtB,YAAY,GAAG,kBAAW,EAC1B,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,EACnB,eAAe,GAAG,kBAAW,EA0BhC,EAAE,EAAE;IACD,IAAI,uBAAuB,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,wBAAwB,CAAC;YACtC,qBAAqB;YACrB,oBAAoB;YACpB,uBAAuB;YACvB,KAAK;YACL,UAAU;YACV,SAAS;YACT,SAAS;YACT,KAAK;YACL,SAAS;YACT,kBAAkB;SACrB,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,IAAA,gBAAS,EACtB,IAAA,0BAAmB,EACf;YACI;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,WAAW;aACpB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,YAAY,EAAE,oBAAoB;gBAClC,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,SAAS;aAClB;YACD;gBACI,YAAY,EAAE,qBAAqB;gBACnC,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,SAAS;gBACf,UAAU,EAAE;oBACR;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,OAAO;wBACrB,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,OAAO;qBAChB;iBACJ;aACJ;SACJ,EACD;YACI,QAAQ,CAAC,SAAS;YAClB,QAAQ,CAAC,MAAM;YACf,QAAQ,CAAC,SAAS;YAClB,QAAQ,CAAC,OAAO;YAChB,QAAQ,CAAC,SAAS;YAClB,QAAQ,CAAC,QAAQ;YACjB,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBACpC,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,QAAQ,EAAE,SAAS,CAAC,OAAO;aAC9B,CAAC,CAAC;SACN,CACJ,CACJ,CAAA;QAED,OAAO,IAAA,yBAAkB,EAAC;YACtB,GAAG,EAAE,qBAAqB;YAC1B,YAAY,EAAE,oBAAoB;YAClC,IAAI,EAAE,CAAC,QAAQ,EAAE,kBAAW,EAAE,IAAI,CAAC;SACtC,CAAC,CAAA;IACN,CAAC;IAED,MAAM,iBAAiB,GAAG,eAAe,CAAC;QACtC;YACI,EAAE,EAAE,sBAAsB;YAC1B,IAAI,EAAE,IAAA,yBAAkB,EAAC;gBACrB,GAAG,EAAE,gBAAgB;gBACrB,YAAY,EAAE,eAAe;gBAC7B,IAAI,EAAE,CAAC,CAAC,qBAAqB,EAAE,GAAG,WAAW,CAAC,CAAC;aAClD,CAAC;YACF,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;YAChB,SAAS,EAAE,CAAC;SACf;QACD,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,CAAU,EAAE,CAAC,CAAC;KACvE,CAAC,CAAA;IAEF,OAAO,IAAA,yBAAkB,EAAC;QACtB,GAAG,EAAE,QAAQ;QACb,YAAY,EAAE,OAAO;QACrB,IAAI,EAAE;YACF,CAAC,KAAK,CAAC;YACP,MAAM,CAAC,CAAC,CAAC;YACT,gBAAgB;YAChB,iBAAiB;YACjB,qBAAqB;YACrB,YAAY;YACZ,OAAO;YACP,eAAe;SAClB;KACJ,CAAC,CAAA;AACN,CAAC,CAAA;AAED,SAAS,mBAAmB,CAAC,qBAAoC;IAC7D,OAAO,qBAAqB,CAAC,SAAS;QAClC,CAAC,CAAC,IAAA,aAAM,EAAC;YACH,qBAAqB,CAAC,SAAS;YAC/B,IAAA,UAAG,EACC,IAAA,YAAK,EACD,qBAAqB,CAAC,6BAA6B;gBAC/C,MAAM,CAAC,CAAC,CAAC,CAChB,EACD;gBACI,IAAI,EAAE,EAAE;aACX,CACJ;YACD,IAAA,UAAG,EACC,IAAA,YAAK,EACD,qBAAqB,CAAC,uBAAuB,IAAI,MAAM,CAAC,CAAC,CAAC,CAC7D,EACD;gBACI,IAAI,EAAE,EAAE;aACX,CACJ;YACD,qBAAqB,CAAC,aAAa,IAAK,IAAY;SACvD,CAAC;QACJ,CAAC,CAAC,IAAI,CAAA;AACd,CAAC;AAED,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAC9B,KAAK,EACL,sBAAsB,EACtB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,gBAAgB,EAChB,YAAY,EACZ,OAAO,EACP,eAAe,EACf,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,EACrB,iBAAiB,GAAG,EAAE,EACtB,WAAW,GAAG,EAAE,EAChB,UAAU,GAAG,EAAE,EACf,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,EAAE,EACd,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,EAAE,EACd,kBAAkB,GAAG,CAAC,EA2BzB,EAAgB,EAAE;IACf,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC;QACzC,KAAK;QACL,sBAAsB;QACtB,qBAAqB;QACrB,gBAAgB;QAChB,iBAAiB;QACjB,oBAAoB;QACpB,WAAW;QACX,uBAAuB;QACvB,UAAU;QACV,SAAS;QACT,SAAS;QACT,KAAK;QACL,SAAS;QACT,kBAAkB;QAClB,YAAY;QACZ,OAAO;QACP,eAAe;KAClB,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,IAAA,yBAAkB,EAAC;QACxC,GAAG,EAAE,uBAAuB;QAC5B,YAAY,EAAE,sBAAsB;QACpC,IAAI,EAAE;YACF,uBAAuB,IAAI,oBAAoB;YAC/C,WAAW;YACX,SAAS;SACZ;KACJ,CAAC,CAAA;IAEF,OAAO,gBAAgB,CAAA;AAC3B,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CACxB,WAAwB,EACxB,iBAAgC,EAChC,EACI,mBAAmB,EAAE,oBAAoB,EACzC,sBAAsB,EAAE,uBAAuB,EAC/C,qBAAqB,EAAE,sBAAsB,EAC7C,uBAAuB,EAAE,wBAAwB,EACjD,oBAAoB,EAAE,qBAAqB,EAC3C,gBAAgB,EAAE,iBAAiB,EACnC,wBAAwB,EAAE,yBAAyB,EAStD,EACH,EAAE;IACA,MAAM,sBAAsB,GACxB,uBAAuB;QACvB,oBAAoB;QACpB,6BAA6B,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC;aACxD,yBAAyB,CAAA;IAClC,MAAM,qBAAqB,GACvB,sBAAsB;QACtB,6BAA6B,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC;aACxD,wBAAwB,CAAA;IACjC,MAAM,uBAAuB,GACzB,wBAAwB;QACxB,6BAA6B,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC;aACxD,0BAA0B,CAAA;IACnC,MAAM,oBAAoB,GACtB,qBAAqB;QACrB,6BAA6B,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC;aACxD,sBAAsB,CAAA;IAC/B,MAAM,gBAAgB,GAClB,iBAAiB;QACjB,6BAA6B,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC;aACxD,kBAAkB,CAAA;IAE3B,MAAM,wBAAwB,GAC1B,yBAAyB;QACzB,6BAA6B,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC;aACxD,4BAA4B,CAAA;IAErC,OAAO;QACH,sBAAsB;QACtB,qBAAqB;QACrB,uBAAuB;QACvB,oBAAoB;QACpB,gBAAgB;QAChB,wBAAwB;KAC3B,CAAA;AACL,CAAC,CAAA;AA2DD,SAAS,aAAa,CAClB,IAA0E;IAE1E,OAAO,IAAI,CAAC,uBAAuB,KAAK,SAAS,CAAA;AACrD,CAAC;AAED,MAAM,oBAAoB,GAAG;IACzB;QACI,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE;YACL;gBACI,YAAY,EAAE,OAAO;gBACrB,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,OAAO;aAChB;SACJ;QACD,eAAe,EAAE,MAAM;QACvB,IAAI,EAAE,UAAU;KACnB;CACK,CAAA;AAEV,MAAM,iBAAiB,GAAG,KAAK,EAAE,EAC7B,MAAM,EACN,KAAK,EACL,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,uBAAuB,EACvB,YAAY,EACZ,OAAO,EACP,eAAe,EACf,iBAAiB,GAAG,EAAE,EACtB,WAAW,GAAG,EAAE,EAChB,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,EACrB,UAAU,GAAG,EAAE,EACf,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,EAAE,EACd,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,EAAE,EACd,kBAAkB,GAAG,CAAC,EA6BzB,EAAoB,EAAE;IACnB,MAAM,iBAAiB,GAAG,MAAM,IAAA,sBAAY,EAAC,MAAM,EAAE;QACjD,GAAG,EAAE,oBAAoB;QACzB,OAAO,EAAE,uBAAuB;QAChC,YAAY,EAAE,mBAAmB;KACpC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC;QACzC,KAAK;QACL,sBAAsB;QACtB,qBAAqB;QACrB,gBAAgB;QAChB,iBAAiB;QACjB,oBAAoB;QACpB,WAAW;QACX,uBAAuB;QACvB,UAAU;QACV,SAAS;QACT,SAAS;QACT,KAAK;QACL,SAAS;QACT,kBAAkB;QAClB,YAAY;QACZ,OAAO;QACP,eAAe;KAClB,CAAC,CAAA;IAEF,MAAM,cAAc,GAAG,IAAA,mBAAY,EAC/B,CAAC,OAAO,EAAE,SAAS,CAAC,EACpB;QACI,iBAAiB;QACjB,IAAA,kBAAW,EAAC,uBAAuB,IAAI,oBAAoB,CAAC;KAC/D,CACJ,CAAA;IAED,MAAM,IAAI,GAAG,IAAA,gBAAS,EAClB,IAAA,mBAAY,EACR,CAAC,SAAS,EAAE,SAAS,CAAC,EACtB,CAAC,IAAA,gBAAS,EAAC,IAAA,mBAAY,EAAC,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CACjE,CACJ,CAAA;IAED,OAAO,IAAA,yBAAkB,EAAC;QACtB,IAAI,EAAE,uBAAuB;QAC7B,IAAI;QACJ,QAAQ,EAAE,cAAc;QACxB,MAAM,EAAE,SAAS;KACpB,CAAC,CAAA;AACN,CAAC,CAAA;AA4BM,KAAK,UAAU,kBAAkB,CAIpC,UAAqE;IAErE,MAAM,EACF,MAAM,EACN,MAAM,EACN,OAAO,EACP,OAAO,EACP,qBAAqB,EAAE,sBAAsB,EAC7C,uBAAuB,EAAE,wBAAwB,EACjD,oBAAoB,EAAE,qBAAqB,EAC3C,uBAAuB,EACvB,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,EACrB,UAAU,GAAG,CAAC,EACd,UAAU,GAAG,CAAC,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,eAAe,EAClB,GAAG,UAAU,CAAA;IAEd,MAAM,UAAU,GAAG,MAAM,IAAA,eAAO,EAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAEtD,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,IAAI,yCAAmB;QAC9D,GAAG,EACC,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,IAAI,KAAK,CAAC,KAAK,KAAK;YAC/C,CAAC,CAAC,qCAAe;YACjB,CAAC,CAAC,qCAAe;QACzB,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO,IAAI,KAAK;KAC1C,CAAA;IAEV,IAAI,uBAAuB,GAAwB,SAAS,CAAA;IAC5D,IAAI,iBAAiB,GAAwB,SAAS,CAAA;IACtD,IAAI,yBAAyB,GAAwB,SAAS,CAAA;IAC9D,IAAI,WAAW,GAA0B,SAAS,CAAA;IAClD,IAAI,iBAAiB,GAIf,EAAE,CAAA;IACR,IAAI,UAAU,GAA6C,EAAE,CAAA;IAC7D,IAAI,SAAS,GAA6C,EAAE,CAAA;IAC5D,IAAI,SAAS,GAA6C,EAAE,CAAA;IAC5D,IAAI,KAAK,GAA6C,EAAE,CAAA;IACxD,IAAI,SAAS,GAAc,EAAE,CAAA;IAC7B,IAAI,kBAAkB,GAAG,CAAC,CAAA;IAE1B,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,uBAAuB,GAAG,UAAU,CAAC,sBAAsB,CAAA;QAC3D,iBAAiB,GAAG,UAAU,CAAC,gBAAgB,CAAA;QAC/C,yBAAyB,GAAG,UAAU,CAAC,wBAAwB,CAAA;QAC/D,WAAW,GAAG,UAAU,CAAC,WAAW,CAAA;QACpC,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,IAAI,EAAE,CAAA;IAC1D,CAAC;IAED,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,EAAE,CAAA;QACxC,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,EAAE,CAAA;QACtC,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,EAAE,CAAA;QACtC,KAAK,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE,CAAA;QAC9B,SAAS,GAAG,UAAU,CAAC,SAAS,IAAI,EAAE,CAAA;QACtC,kBAAkB,GAAG,UAAU,CAAC,kBAAkB,IAAI,CAAC,CAAA;IAC3D,CAAC;IAED,MAAM,EACF,sBAAsB,EACtB,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,wBAAwB,EAC3B,GAAG,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE;QACjD,sBAAsB,EAAE,uBAAuB;QAC/C,qBAAqB,EAAE,sBAAsB;QAC7C,uBAAuB,EAAE,wBAAwB;QACjD,oBAAoB,EAAE,qBAAqB;QAC3C,gBAAgB,EAAE,iBAAiB;QACnC,wBAAwB,EAAE,yBAAyB;KACtD,CAAC,CAAA;IAEF,IAAI,cAAc,GAAwB,OAAO,CAAA;IAEjD,IAAI,OAAe,CAAA;IAEnB,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;QAClC,IAAI,OAAO;YAAE,OAAO,OAAO,CAAA;QAC3B,OAAO,GAAG,MAAM,CAAC,KAAK;YAClB,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACjB,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,MAAM,EAAE,oBAAU,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAA;QAC3D,OAAO,OAAO,CAAA;IAClB,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;QAC9B,OAAO;YACH,OAAO,EAAE,uBAAuB;YAChC,WAAW,EAAE,MAAM,kBAAkB,CAAC;gBAClC,KAAK,EAAE,UAAU,CAAC,OAAO;gBACzB,sBAAsB;gBACtB,qBAAqB;gBACrB,oBAAoB;gBACpB,gBAAgB;gBAChB,uBAAuB;gBACvB,SAAS;gBACT,iBAAiB;gBACjB,WAAW;gBACX,UAAU;gBACV,SAAS;gBACT,SAAS;gBACT,KAAK;gBACL,SAAS;gBACT,kBAAkB;gBAClB,YAAY;gBACZ,OAAO;gBACP,eAAe;aAClB,CAAC;SACL,CAAA;IACL,CAAC,CAAA;IAED,OAAO,IAAA,oCAAc,EAAC;QAClB,MAAM;QACN,UAAU;QACV,cAAc;QACd,KAAK,CAAC,UAAU;YACZ,IAAI,cAAc;gBAAE,OAAO,cAAc,CAAA;YAGzC,cAAc,GAAG,MAAM,iBAAiB,CAAC;gBACrC,MAAM;gBACN,KAAK,EAAE,UAAU,CAAC,OAAO;gBACzB,sBAAsB;gBACtB,qBAAqB;gBACrB,uBAAuB;gBACvB,oBAAoB;gBACpB,gBAAgB;gBAChB,uBAAuB;gBACvB,SAAS;gBACT,iBAAiB;gBACjB,WAAW;gBACX,UAAU;gBACV,SAAS;gBACT,SAAS;gBACT,KAAK;gBACL,SAAS;gBACT,kBAAkB;gBAClB,YAAY;gBACZ,OAAO;gBACP,eAAe;aAClB,CAAC,CAAA;YAEF,OAAO,cAAc,CAAA;QACzB,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,KAAK;YACnB,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAA;YAEzC,IAAI,uBAAuB,EAAE,CAAC;gBAC1B,MAAM,YAAY,GAAG,MAAM,IAAA,8BAAsB,EAC7C,MAAM,EACN,MAAM,IAAI,CAAC,UAAU,EAAE,CAC1B,CAAA;gBAED,IAAI,CAAC,YAAY,EAAE,CAAC;oBAChB,MAAM,QAAQ,GAAG,wBAAwB,CAAC;wBACtC,qBAAqB;wBACrB,oBAAoB;wBACpB,uBAAuB;wBACvB,KAAK,EAAE,UAAU,CAAC,OAAO;wBACzB,UAAU;wBACV,SAAS;wBACT,SAAS;wBACT,KAAK;wBACL,SAAS;wBACT,kBAAkB;qBACrB,CAAC,CAAA;oBAEF,OAAO,IAAA,yBAAkB,EAAC;wBACtB,GAAG,EAAE,YAAY;wBACjB,YAAY,EAAE,WAAW;wBACzB,IAAI,EAAE;4BACF;gCACI,GAAG,QAAQ;gCACX,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,CAC/B,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;oCACZ,MAAM,EAAE,SAAS,CAAC,OAAO;oCACzB,QAAQ,EAAE,SAAS,CAAC,OAAO;iCAC9B,CAAC,CACL;gCACD,QAAQ,EAAE,IAAA,iCAAe,EAAC;oCACtB,IAAI,EAAE;wCACF,IAAI,EAAE,gBAAgB;4CAClB,CAAC,CAAC,WAAW;4CACb,CAAC,CAAC,MAAM;wCACZ,aAAa,EAAE,KAAK;wCACpB,QAAQ,EAAE,IAAI;wCACd,OAAO,EAAE,IAAI;qCAChB;oCACD,QAAQ,EAAE,KAAK;iCAClB,CAAC;6BACL;yBACJ;qBACJ,CAAC,CAAA;gBACN,CAAC;gBAED,OAAO,IAAA,iCAAe,EAAC;oBACnB,IAAI,EAAE;wBACF,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM;wBAC7C,aAAa,EAAE,KAAK;wBACpB,QAAQ,EAAE,IAAI;wBACd,OAAO,EAAE,IAAI;qBAChB;oBACD,QAAQ,EAAE,KAAK;iBAClB,CAAC,CAAA;YACN,CAAC;YAED,IAAI,EAAW,CAAA;YACf,IAAI,KAAa,CAAA;YACjB,IAAI,IAAS,CAAA;YACb,IAAI,aAAa,GAAG,CAAC,CAAA;YAErB,IAAI,gBAAgB,EAAE,CAAC;gBACnB,EAAE,GAAG,wBAAwB,CAAA;gBAC7B,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;gBAEjB,IAAI,GAAG,eAAe,CAClB,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBACf,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;oBACrB,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI;oBACrB,SAAS,EAAE,CAAC;iBACf,CAAC,CAAC,CACN,CAAA;gBACD,aAAa,GAAG,CAAC,CAAA;YACrB,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAEtD,IAAI,CAAC,IAAI,EAAE,CAAC;oBACR,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;gBACzC,CAAC;gBAED,EAAE,GAAG,IAAI,CAAC,EAAE,CAAA;gBACZ,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAA;gBACxB,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAA;YAC5B,CAAC;YAED,OAAO,IAAA,yBAAkB,EAAC;gBACtB,GAAG,EAAE,+BAA+B;gBACpC,YAAY,EAAE,8BAA8B;gBAC5C,IAAI,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,CAAC;aACzC,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,QAAQ,CAAC,IAAI;YACf,OAAO,IAAA,iCAAe,EAAC,MAAM,EAAE;gBAC3B,OAAO,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE;gBAChC,iBAAiB,EAAE,UAAU,CAAC,OAAO;gBACrC,GAAG,EAAE,QAAQ,IAAI,IAAI,EAAE,GAAG;aAC7B,CAAC,CAAA;QACN,CAAC;QACD,KAAK,CAAC,gBAAgB;YAClB,OAAO,8JAA8J,CAAA;QACzK,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE;YACf,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9C,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE;YACzB,MAAM,WAAW,GAAG,IAAA,oBAAa,EAAC;gBAC9B,MAAM,EAAE;oBACJ,OAAO,EAAE,MAAM,kBAAkB,EAAE;oBACnC,iBAAiB,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE;iBAC7C;gBACD,KAAK,EAAE;oBACH,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACpD;gBACD,WAAW,EAAE,aAAa;gBAC1B,OAAO,EAAE;oBACL,OAAO,EAAE,0BAA0B,CAAC,OAAO,CAAC;iBAC/C;aACJ,CAAC,CAAA;YAEF,OAAO,kBAAkB,CACrB,UAAU,EACV,MAAM,UAAU,CAAC,WAAW,CAAC;gBACzB,OAAO,EAAE;oBACL,GAAG,EAAE,IAAA,cAAO,EAAC,WAAW,CAAC;iBAC5B;aACJ,CAAC,CACL,CAAA;QACL,CAAC;QACD,KAAK,CAAC,aAAa,CAAC,SAAS;YACzB,OAAO,kBAAkB,CACrB,mBAAmB,EACnB,MAAM,UAAU,CAAC,aAAa,CAAC;gBAC3B,MAAM,EAAE;oBACJ,OAAO,EAAE,MAAM,kBAAkB,EAAE;oBACnC,iBAAiB,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE;iBAC7C;gBACD,KAAK,EAAE;oBACH,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACpD;gBACD,WAAW,EAAE,aAAa;gBAC1B,OAAO,EAAE;oBACL,OAAO,EAAE,0BAA0B,CAAC,SAAS,CAAC;iBACjD;aACJ,CAAC,CACL,CAAA;QACL,CAAC;QACD,KAAK,CAAC,iBAAiB,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,GAAG,MAAM,kBAAkB,EAAE,EAAE,GAAG,aAAa,EAAE,GAC5D,UAAU,CAAA;YAEd,MAAM,OAAO,GAAG;gBACZ,IAAI,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE;gBAC7B,QAAQ,EAAE,aAAa,CAAC,QAAQ;gBAChC,KAAK,EAAE,aAAa,CAAC,KAAK;gBAC1B,QAAQ,EAAE,aAAa,CAAC,QAAQ,IAAI,IAAI;gBACxC,YAAY,EAAE,aAAa,CAAC,YAAY;gBACxC,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;gBACxD,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;gBACpD,oBAAoB,EAAE,aAAa,CAAC,oBAAoB;gBACxD,YAAY,EAAE,aAAa,CAAC,YAAY;gBACxC,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,IAAI,IAAI;gBACxD,UAAU,EAAE,UAAU;gBACtB,UAAU,EAAE,UAAU;gBACtB,UAAU,EAAE,UAAU,CAAC,OAAO;aACjC,CAAA;YAED,IAAI,UAAU,GAAG,KAAK,CAAA;YAEtB,IAAI,UAAU,IAAI,aAAa,EAAE,CAAC;gBAC9B,OAAO,CAAC,gBAAgB;oBACpB,aAAa,CAAC,gBAAgB,IAAI,IAAI,CAAA;gBAC1C,UAAU,GAAG,aAAa,CAAC,QAAQ,KAAK,IAAI,CAAA;YAChD,CAAC;YAED,IAAI,SAAS,IAAI,aAAa,EAAE,CAAC;gBAC7B,IAAI,aAAa,CAAC,OAAO,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;oBACrD,OAAO,CAAC,QAAQ,GAAG,IAAA,gBAAS,EAAC;wBACzB,aAAa,CAAC,OAAO;wBACrB,aAAa,CAAC,WAAW;qBAC5B,CAAC,CAAA;gBACN,CAAC;gBACD,OAAO,CAAC,gBAAgB,GAAG,mBAAmB,CAAC;oBAC3C,GAAG,aAAa;oBAChB,MAAM,EAAE,aAAa,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;iBAC5D,CAAC,CAAA;gBACF,UAAU,GAAG,CAAC,aAAa,CAAC,OAAO,CAAA;YACvC,CAAC;YAED,IAAI,iBAAiB,GAAG,qBAAqB,CAAA;YAE7C,IAAI,uBAAuB,IAAI,CAAC,UAAU,EAAE,CAAC;gBACzC,iBAAiB;oBACb,aAAa,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;YACzD,CAAC;YAED,MAAM,UAAU,GAAG;gBACf;oBACI,MAAM,EAAE,UAAU,CAAC,OAAO;oBAC1B,IAAI,EAAE,MAAM,IAAA,uBAAa,EAAC,MAAM,EAAE;wBAC9B,OAAO,EAAE,UAAU;wBACnB,MAAM,EAAE;4BACJ,OAAO;4BACP,iBAAiB;yBACpB;wBACD,KAAK,EACD,UAAU,CAAC,OAAO,KAAK,KAAK;4BACxB,CAAC,CAAC,8BAA8B;4BAChC,CAAC,CAAC,8BAA8B;wBACxC,WAAW,EAAE,QAAQ;wBACrB,OAAO,EAAE,OAAO;qBACnB,CAAC;iBACL;aACJ,CAAA;YAED,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC5B,IAAI,CAAC,MAAM;iBACN,WAAW,EAAE;iBACb,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CACjD,CAAA;YAED,MAAM,cAAc,GAAG,IAAA,aAAM,EAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;YAEhE,OAAO,IAAA,mBAAY,EACf,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAC7B,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,CAC3C,CAAA;QACL,CAAC;KACJ,CAA6D,CAAA;AAClE,CAAC;AAtYD,gDAsYC"}

package/_cjs/accounts/simple/toSimpleSmartAccount.js

@@ -195,7 +195,7 @@ async function toSimpleSmartAccount(parameters) {
             return (0, getAccountNonce_1.getAccountNonce)(client, {
                 address: await this.getAddress(),
                 entryPointAddress: entryPoint.address,
-                key: args?.key ?? nonceKey
+                key: nonceKey ?? args?.key
             });
         },
         async getStubSignature() {

package/_cjs/accounts/simple/toSimpleSmartAccount.js.map

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

package/_cjs/accounts/trust/toTrustSmartAccount.js

@@ -81,7 +81,7 @@ async function toTrustSmartAccount(parameters) {
             return (0, getAccountNonce_1.getAccountNonce)(client, {
                 address: await this.getAddress(),
                 entryPointAddress: entryPoint.address,
-                key: args?.key ?? parameters?.nonceKey
+                key: parameters?.nonceKey ?? args?.key
             });
         },
         async getStubSignature() {

package/_cjs/accounts/trust/toTrustSmartAccount.js.map

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

package/_cjs/actions/erc7579/installModule.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installModule = void 0;
-const viem_1 = require("viem");
 const account_abstraction_1 = require("viem/account-abstraction");
 const utils_1 = require("viem/utils");
 const errors_1 = require("../../errors/index.js");
-const supportsModule_1 = require("./supportsModule.js");
+const utils_2 = require("../../utils/index.js");
 async function installModule(client, parameters) {
-    const { account: account_ = client.account, maxFeePerGas, maxPriorityFeePerGas, nonce, address, context } = parameters;
+    const { account: account_ = client.account, maxFeePerGas, maxPriorityFeePerGas, nonce, address, context, initData, type, calls, paymaster, paymasterContext } = parameters;
     if (!account_) {
         throw new errors_1.AccountNotFoundError({
             docsPath: "/docs/actions/wallet/sendTransaction"
@@ -16,41 +15,14 @@ async function installModule(client, parameters) {
     const account = (0, utils_1.parseAccount)(account_);
     return (0, utils_1.getAction)(client, account_abstraction_1.sendUserOperation, "sendUserOperation")({
         calls: [
-            {
-                to: account.address,
-                value: BigInt(0),
-                data: (0, viem_1.encodeFunctionData)({
-                    abi: [
-                        {
-                            name: "installModule",
-                            type: "function",
-                            stateMutability: "nonpayable",
-                            inputs: [
-                                {
-                                    type: "uint256",
-                                    name: "moduleTypeId"
-                                },
-                                {
-                                    type: "address",
-                                    name: "module"
-                                },
-                                {
-                                    type: "bytes",
-                                    name: "initData"
-                                }
-                            ],
-                            outputs: []
-                        }
-                    ],
-                    functionName: "installModule",
-                    args: [
-                        (0, supportsModule_1.parseModuleTypeId)(parameters.type),
-                        (0, viem_1.getAddress)(address),
-                        context
-                    ]
-                })
-            }
+            ...(0, utils_2.encodeInstallModule)({
+                account,
+                modules: [{ address, context: context ?? initData, type }]
+            }),
+            ...(calls ?? [])
         ],
+        paymaster,
+        paymasterContext,
         maxFeePerGas,
         maxPriorityFeePerGas,
         nonce,

package/_cjs/actions/erc7579/installModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"installModule.js","sourceRoot":"","sources":["../../../actions/erc7579/installModule.ts"],"names":[],"mappings":";;;AAAA,+BAMa;AACb,kEAIiC;AACjC,sCAAoD;AACpD,yCAAmD;AACnD,qDAAqE;AAa9D,KAAK,UAAU,aAAa,CAG/B,MAAc,EACd,UAAkD;IAElD,MAAM,EACF,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,OAAO,EACP,OAAO,EACV,GAAG,UAAU,CAAA;IAEd,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6BAAoB,CAAC;YAC3B,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IAEtD,OAAO,IAAA,iBAAS,EACZ,MAAM,EACN,uCAAiB,EACjB,mBAAmB,CACtB,CAAC;QACE,KAAK,EAAE;YACH;gBACI,EAAE,EAAE,OAAO,CAAC,OAAO;gBACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;gBAChB,IAAI,EAAE,IAAA,yBAAkB,EAAC;oBACrB,GAAG,EAAE;wBACD;4BACI,IAAI,EAAE,eAAe;4BACrB,IAAI,EAAE,UAAU;4BAChB,eAAe,EAAE,YAAY;4BAC7B,MAAM,EAAE;gCACJ;oCACI,IAAI,EAAE,SAAS;oCACf,IAAI,EAAE,cAAc;iCACvB;gCACD;oCACI,IAAI,EAAE,SAAS;oCACf,IAAI,EAAE,QAAQ;iCACjB;gCACD;oCACI,IAAI,EAAE,OAAO;oCACb,IAAI,EAAE,UAAU;iCACnB;6BACJ;4BACD,OAAO,EAAE,EAAE;yBACd;qBACJ;oBACD,YAAY,EAAE,eAAe;oBAC7B,IAAI,EAAE;wBACF,IAAA,kCAAiB,EAAC,UAAU,CAAC,IAAI,CAAC;wBAClC,IAAA,iBAAU,EAAC,OAAO,CAAC;wBACnB,OAAO;qBACV;iBACJ,CAAC;aACL;SACJ;QACD,YAAY;QACZ,oBAAoB;QACpB,KAAK;QACL,OAAO;KACV,CAAC,CAAA;AACN,CAAC;AArED,sCAqEC"}
+{"version":3,"file":"installModule.js","sourceRoot":"","sources":["../../../actions/erc7579/installModule.ts"],"names":[],"mappings":";;;AACA,kEAMiC;AACjC,sCAAoD;AACpD,yCAAmD;AACnD,uCAAiD;AAsC1C,KAAK,UAAU,aAAa,CAG/B,MAAc,EACd,UAAkD;IAElD,MAAM,EACF,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,OAAO,EACP,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,SAAS,EACT,gBAAgB,EACnB,GAAG,UAAU,CAAA;IAEd,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6BAAoB,CAAC;YAC3B,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IAEtD,OAAO,IAAA,iBAAS,EACZ,MAAM,EACN,uCAAiB,EACjB,mBAAmB,CACtB,CAAC;QACE,KAAK,EAAE;YACH,GAAG,IAAA,2BAAmB,EAAC;gBACnB,OAAO;gBACP,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC7D,CAAC;YACF,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;SACnB;QACD,SAAS;QACT,gBAAgB;QAChB,YAAY;QACZ,oBAAoB;QACpB,KAAK;QACL,OAAO;KACV,CAAC,CAAA;AACN,CAAC;AA/CD,sCA+CC"}

package/_cjs/actions/erc7579/installModules.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installModules = void 0;
-const viem_1 = require("viem");
 const account_abstraction_1 = require("viem/account-abstraction");
 const utils_1 = require("viem/utils");
 const errors_1 = require("../../errors/index.js");
-const supportsModule_1 = require("./supportsModule.js");
+const encodeInstallModule_1 = require("../../utils/encodeInstallModule.js");
 async function installModules(client, parameters) {
-    const { account: account_ = client.account, maxFeePerGas, maxPriorityFeePerGas, nonce, modules } = parameters;
+    const { account: account_ = client.account, maxFeePerGas, maxPriorityFeePerGas, nonce, modules, paymaster, paymasterContext, calls } = parameters;
     if (!account_) {
         throw new errors_1.AccountNotFoundError({
             docsPath: "/docs/actions/wallet/sendTransaction"
@@ -15,36 +14,15 @@ async function installModules(client, parameters) {
     }
     const account = (0, utils_1.parseAccount)(account_);
     return (0, utils_1.getAction)(client, account_abstraction_1.sendUserOperation, "sendUserOperation")({
-        calls: modules.map(({ type, address, context }) => ({
-            to: account.address,
-            value: BigInt(0),
-            data: (0, viem_1.encodeFunctionData)({
-                abi: [
-                    {
-                        name: "installModule",
-                        type: "function",
-                        stateMutability: "nonpayable",
-                        inputs: [
-                            {
-                                type: "uint256",
-                                name: "moduleTypeId"
-                            },
-                            {
-                                type: "address",
-                                name: "module"
-                            },
-                            {
-                                type: "bytes",
-                                name: "initData"
-                            }
-                        ],
-                        outputs: []
-                    }
-                ],
-                functionName: "installModule",
-                args: [(0, supportsModule_1.parseModuleTypeId)(type), (0, viem_1.getAddress)(address), context]
-            })
-        })),
+        calls: [
+            ...(0, encodeInstallModule_1.encodeInstallModule)({
+                account,
+                modules
+            }),
+            ...(calls ?? [])
+        ],
+        paymaster,
+        paymasterContext,
         maxFeePerGas,
         maxPriorityFeePerGas,
         nonce,

package/_cjs/actions/erc7579/installModules.js.map

@@ -1 +1 @@
-{"version":3,"file":"installModules.js","sourceRoot":"","sources":["../../../actions/erc7579/installModules.ts"],"names":[],"mappings":";;;AAAA,+BAQa;AACb,kEAIiC;AACjC,sCAAoD;AACpD,yCAAmD;AACnD,qDAAqE;AAe9D,KAAK,UAAU,cAAc,CAGhC,MAA2D,EAC3D,UAAmD;IAEnD,MAAM,EACF,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,OAAO,EACV,GAAG,UAAU,CAAA;IAEd,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6BAAoB,CAAC;YAC3B,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IACtD,OAAO,IAAA,iBAAS,EACZ,MAAM,EACN,uCAAiB,EACjB,mBAAmB,CACtB,CAAC;QACE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAChD,EAAE,EAAE,OAAO,CAAC,OAAO;YACnB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;YAChB,IAAI,EAAE,IAAA,yBAAkB,EAAC;gBACrB,GAAG,EAAE;oBACD;wBACI,IAAI,EAAE,eAAe;wBACrB,IAAI,EAAE,UAAU;wBAChB,eAAe,EAAE,YAAY;wBAC7B,MAAM,EAAE;4BACJ;gCACI,IAAI,EAAE,SAAS;gCACf,IAAI,EAAE,cAAc;6BACvB;4BACD;gCACI,IAAI,EAAE,SAAS;gCACf,IAAI,EAAE,QAAQ;6BACjB;4BACD;gCACI,IAAI,EAAE,OAAO;gCACb,IAAI,EAAE,UAAU;6BACnB;yBACJ;wBACD,OAAO,EAAE,EAAE;qBACd;iBACJ;gBACD,YAAY,EAAE,eAAe;gBAC7B,IAAI,EAAE,CAAC,IAAA,kCAAiB,EAAC,IAAI,CAAC,EAAE,IAAA,iBAAU,EAAC,OAAO,CAAC,EAAE,OAAO,CAAC;aAChE,CAAC;SACL,CAAC,CAAC;QACH,YAAY;QACZ,oBAAoB;QACpB,KAAK;QACL,OAAO,EAAE,OAAO;KACnB,CAAC,CAAA;AACN,CAAC;AA7DD,wCA6DC"}
+{"version":3,"file":"installModules.js","sourceRoot":"","sources":["../../../actions/erc7579/installModules.ts"],"names":[],"mappings":";;;AACA,kEAKiC;AACjC,sCAAoD;AACpD,yCAAmD;AACnD,yEAGwC;AA4BjC,KAAK,UAAU,cAAc,CAGhC,MAA2D,EAC3D,UAAmD;IAEnD,MAAM,EACF,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,OAAO,EACP,SAAS,EACT,gBAAgB,EAChB,KAAK,EACR,GAAG,UAAU,CAAA;IAEd,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6BAAoB,CAAC;YAC3B,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IACtD,OAAO,IAAA,iBAAS,EACZ,MAAM,EACN,uCAAiB,EACjB,mBAAmB,CACtB,CAAC;QACE,KAAK,EAAE;YACH,GAAG,IAAA,yCAAmB,EAAC;gBACnB,OAAO;gBACP,OAAO;aACV,CAAC;YACF,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;SACnB;QACD,SAAS;QACT,gBAAgB;QAChB,YAAY;QACZ,oBAAoB;QACpB,KAAK;QACL,OAAO,EAAE,OAAO;KACnB,CAAC,CAAA;AACN,CAAC;AA3CD,wCA2CC"}

package/_cjs/actions/erc7579/isModuleInstalled.js

@@ -7,7 +7,7 @@ const utils_1 = require("viem/utils");
 const errors_1 = require("../../errors/index.js");
 const supportsModule_1 = require("./supportsModule.js");
 async function isModuleInstalled(client, parameters) {
-    const { account: account_ = client.account, address, context } = parameters;
+    const { account: account_ = client.account, address, context, additionalContext } = parameters;
     if (!account_) {
         throw new errors_1.AccountNotFoundError({
             docsPath: "/docs/actions/wallet/sendTransaction"
@@ -48,7 +48,7 @@ async function isModuleInstalled(client, parameters) {
             args: [
                 (0, supportsModule_1.parseModuleTypeId)(parameters.type),
                 (0, viem_1.getAddress)(address),
-                context
+                context ?? additionalContext
             ],
             address: account.address
         });
@@ -66,7 +66,7 @@ async function isModuleInstalled(client, parameters) {
                     args: [
                         (0, supportsModule_1.parseModuleTypeId)(parameters.type),
                         (0, viem_1.getAddress)(address),
-                        context
+                        context ?? additionalContext
                     ]
                 })
             });

package/_cjs/actions/erc7579/isModuleInstalled.js.map

@@ -1 +1 @@
-{"version":3,"file":"isModuleInstalled.js","sourceRoot":"","sources":["../../../actions/erc7579/isModuleInstalled.ts"],"names":[],"mappings":";;;AAAA,+BAUa;AAKb,0CAAiD;AACjD,sCAAoD;AACpD,yCAAmD;AACnD,qDAAqE;AAU9D,KAAK,UAAU,iBAAiB,CAGnC,MAA2D,EAC3D,UAAsD;IAEtD,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,UAAU,CAAA;IAE3E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6BAAoB,CAAC;YAC3B,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IAEtD,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAA;IAEnC,MAAM,GAAG,GAAG;QACR;YACI,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,UAAU;YAChB,eAAe,EAAE,MAAM;YACvB,MAAM,EAAE;gBACJ;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,cAAc;iBACvB;gBACD;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;iBACjB;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,mBAAmB;iBAC5B;aACJ;YACD,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,MAAM;iBACf;aACJ;SACJ;KACK,CAAA;IAEV,IAAI,CAAC;QACD,OAAO,MAAM,IAAA,iBAAS,EAClB,YAAY,EACZ,sBAAY,EACZ,cAAc,CACjB,CAAC;YACE,GAAG;YACH,YAAY,EAAE,mBAAmB;YACjC,IAAI,EAAE;gBACF,IAAA,kCAAiB,EAAC,UAAU,CAAC,IAAI,CAAC;gBAClC,IAAA,iBAAU,EAAC,OAAO,CAAC;gBACnB,OAAO;aACV;YACD,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC,CAAA;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,qCAA8B,EAAE,CAAC;YAClD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,OAAO,CAAC,cAAc,EAAE,CAAA;YAE/D,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAS,EAC1B,YAAY,EACZ,cAAI,EACJ,MAAM,CACT,CAAC;gBACE,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,WAAW;gBACxB,EAAE,EAAE,OAAO,CAAC,OAAO;gBACnB,IAAI,EAAE,IAAA,yBAAkB,EAAC;oBACrB,GAAG;oBACH,YAAY,EAAE,mBAAmB;oBACjC,IAAI,EAAE;wBACF,IAAA,kCAAiB,EAAC,UAAU,CAAC,IAAI,CAAC;wBAClC,IAAA,iBAAU,EAAC,OAAO,CAAC;wBACnB,OAAO;qBACV;iBACJ,CAAC;aACL,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;YAChD,CAAC;YAED,OAAO,IAAA,2BAAoB,EAAC;gBACxB,GAAG;gBACH,YAAY,EAAE,mBAAmB;gBACjC,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC,CAAA;QACN,CAAC;QAED,MAAM,KAAK,CAAA;IACf,CAAC;AACL,CAAC;AAhGD,8CAgGC"}
+{"version":3,"file":"isModuleInstalled.js","sourceRoot":"","sources":["../../../actions/erc7579/isModuleInstalled.ts"],"names":[],"mappings":";;;AAAA,+BAWa;AAKb,0CAAiD;AACjD,sCAAoD;AACpD,yCAAmD;AACnD,qDAAqE;AAgB9D,KAAK,UAAU,iBAAiB,CAGnC,MAA2D,EAC3D,UAAsD;IAEtD,MAAM,EACF,OAAO,EAAE,QAAQ,GAAG,MAAM,CAAC,OAAO,EAClC,OAAO,EACP,OAAO,EACP,iBAAiB,EACpB,GAAG,UAAU,CAAA;IAEd,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,6BAAoB,CAAC;YAC3B,QAAQ,EAAE,sCAAsC;SACnD,CAAC,CAAA;IACN,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,QAAQ,CAAiB,CAAA;IAEtD,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAA;IAEnC,MAAM,GAAG,GAAG;QACR;YACI,IAAI,EAAE,mBAAmB;YACzB,IAAI,EAAE,UAAU;YAChB,eAAe,EAAE,MAAM;YACvB,MAAM,EAAE;gBACJ;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,cAAc;iBACvB;gBACD;oBACI,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;iBACjB;gBACD;oBACI,IAAI,EAAE,OAAO;oBACb,IAAI,EAAE,mBAAmB;iBAC5B;aACJ;YACD,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,MAAM;iBACf;aACJ;SACJ;KACK,CAAA;IAEV,IAAI,CAAC;QACD,OAAO,MAAM,IAAA,iBAAS,EAClB,YAAY,EACZ,sBAAY,EACZ,cAAc,CACjB,CAAC;YACE,GAAG;YACH,YAAY,EAAE,mBAAmB;YACjC,IAAI,EAAE;gBACF,IAAA,kCAAiB,EAAC,UAAU,CAAC,IAAI,CAAC;gBAClC,IAAA,iBAAU,EAAC,OAAO,CAAC;gBACnB,OAAO,IAAI,iBAAiB;aAC/B;YACD,OAAO,EAAE,OAAO,CAAC,OAAO;SAC3B,CAAC,CAAA;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,qCAA8B,EAAE,CAAC;YAClD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,OAAO,CAAC,cAAc,EAAE,CAAA;YAE/D,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAS,EAC1B,YAAY,EACZ,cAAI,EACJ,MAAM,CACT,CAAC;gBACE,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,WAAW;gBACxB,EAAE,EAAE,OAAO,CAAC,OAAO;gBACnB,IAAI,EAAE,IAAA,yBAAkB,EAAC;oBACrB,GAAG;oBACH,YAAY,EAAE,mBAAmB;oBACjC,IAAI,EAAE;wBACF,IAAA,kCAAiB,EAAC,UAAU,CAAC,IAAI,CAAC;wBAClC,IAAA,iBAAU,EAAC,OAAO,CAAC;wBACnB,OAAO,IAAI,iBAAiB;qBAC/B;iBACJ,CAAC;aACL,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;YAChD,CAAC;YAED,OAAO,IAAA,2BAAoB,EAAC;gBACxB,GAAG;gBACH,YAAY,EAAE,mBAAmB;gBACjC,IAAI,EAAE,MAAM,CAAC,IAAI;aACpB,CAAC,CAAA;QACN,CAAC;QAED,MAAM,KAAK,CAAA;IACf,CAAC;AACL,CAAC;AArGD,8CAqGC"}