ox 0.14.42 → 0.14.44

package/tempo/TransactionRequest.test.ts

@@ -1,7 +1,11 @@
-import { type MultisigWitness, TransactionRequest } from 'ox/tempo'
+import {
+  MultisigConfig,
+  type MultisigSimulation,
+  TransactionRequest,
+} from 'ox/tempo'
 import { describe, expect, test } from 'vitest'
 
-const multisigWitnessRpc = {
+const multisigSimulationRpc = {
   account: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
   approvals: [
     {
@@ -10,8 +14,7 @@ const multisigWitnessRpc = {
       type: 'primitive',
     },
     {
-      type: 'multisig',
-      witness: {
+      spec: {
         account: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
         approvals: [
           {
@@ -20,7 +23,25 @@ const multisigWitnessRpc = {
             owner: '0x2222222222222222222222222222222222222222',
           },
         ],
-        config: {
+        config:
+          '0xf83ba022222222222222222222222222222222222222222222222222222222222222220101d7d694222222222222222222222222222222222222222201',
+      },
+      type: 'multisig',
+    },
+  ],
+  config:
+    '0xf852a011111111111111111111111111111111111111111111111111111111111111118002eed694111111111111111111111111111111111111111101d694bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb01',
+} as const satisfies MultisigSimulation.Rpc
+
+const multisigSimulation = {
+  account: multisigSimulationRpc.account,
+  approvals: [
+    multisigSimulationRpc.approvals[0],
+    {
+      spec: {
+        account: multisigSimulationRpc.approvals[1].spec.account,
+        approvals: multisigSimulationRpc.approvals[1].spec.approvals,
+        config: MultisigConfig.from({
           owners: [
             {
               owner: '0x2222222222222222222222222222222222222222',
@@ -29,12 +50,13 @@ const multisigWitnessRpc = {
           ],
           salt: `0x${'22'.repeat(32)}`,
           threshold: 1,
-          version: 1,
-        },
+          version: 1n,
+        }),
       },
+      type: 'multisig',
     },
   ],
-  config: {
+  config: MultisigConfig.from({
     owners: [
       {
         owner: '0x1111111111111111111111111111111111111111',
@@ -47,27 +69,8 @@ const multisigWitnessRpc = {
     ],
     salt: `0x${'11'.repeat(32)}`,
     threshold: 2,
-    version: 0,
-  },
-} as const satisfies MultisigWitness.Rpc
-
-const multisigWitness = {
-  ...multisigWitnessRpc,
-  approvals: [
-    multisigWitnessRpc.approvals[0],
-    {
-      ...multisigWitnessRpc.approvals[1],
-      witness: {
-        ...multisigWitnessRpc.approvals[1].witness,
-        config: {
-          ...multisigWitnessRpc.approvals[1].witness.config,
-          version: 1n,
-        },
-      },
-    },
-  ],
-  config: { ...multisigWitnessRpc.config, version: 0n },
-} as const satisfies MultisigWitness.MultisigWitness
+  }),
+} as const satisfies MultisigSimulation.Spec
 
 describe('fromRpc', () => {
   test('default', () => {
@@ -137,19 +140,64 @@ describe('fromRpc', () => {
     expect(request.nonceKey).toBe(255n)
   })
 
-  test('behavior: multisig witness', () => {
+  test('behavior: multisig simulation', () => {
     const request = TransactionRequest.fromRpc({
       from: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-      multisigWitness: multisigWitnessRpc,
+      multisigSimulation: multisigSimulationRpc,
       type: '0x76',
     })
 
-    expect(request.multisigWitness?.config.version).toBe(0n)
-    const nested = request.multisigWitness?.approvals[1]
-    expect(nested?.type).toBe('multisig')
-    if (nested?.type !== 'multisig') throw new Error('expected multisig')
-    expect(nested.witness.config.version).toBe(1n)
-    expect(nested.witness.approvals[0]?.keyType).toBe('webAuthn')
+    expect(request.multisigSimulation).toMatchInlineSnapshot(`
+      {
+        "account": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "approvals": [
+          {
+            "keyType": "secp256k1",
+            "owner": "0x1111111111111111111111111111111111111111",
+            "type": "primitive",
+          },
+          {
+            "spec": {
+              "account": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+              "approvals": [
+                {
+                  "keyData": "0x0578",
+                  "keyType": "webAuthn",
+                  "owner": "0x2222222222222222222222222222222222222222",
+                },
+              ],
+              "config": {
+                "owners": [
+                  {
+                    "owner": "0x2222222222222222222222222222222222222222",
+                    "weight": 1,
+                  },
+                ],
+                "salt": "0x2222222222222222222222222222222222222222222222222222222222222222",
+                "threshold": 1,
+                "version": 1n,
+              },
+            },
+            "type": "multisig",
+          },
+        ],
+        "config": {
+          "owners": [
+            {
+              "owner": "0x1111111111111111111111111111111111111111",
+              "weight": 1,
+            },
+            {
+              "owner": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+              "weight": 1,
+            },
+          ],
+          "salt": "0x1111111111111111111111111111111111111111111111111111111111111111",
+          "threshold": 2,
+          "version": 0n,
+        },
+      }
+    `)
   })
 
   test('behavior: empty', () => {
@@ -206,18 +254,43 @@ describe('toRpc', () => {
     `)
   })
 
-  test('behavior: multisig witness', () => {
+  test('behavior: multisig simulation', () => {
     const request = TransactionRequest.toRpc({
       from: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-      multisigWitness,
+      multisigSimulation,
     })
 
-    expect(request.multisigWitness?.config.version).toBe(0)
-    const nested = request.multisigWitness?.approvals[1]
-    expect(nested?.type).toBe('multisig')
-    if (nested?.type !== 'multisig') throw new Error('expected multisig')
-    expect(nested.witness.config.version).toBe(1)
-    expect(request.type).toBe('0x76')
+    expect(request).toMatchInlineSnapshot(`
+      {
+        "from": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+        "multisigSimulation": {
+          "account": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+          "approvals": [
+            {
+              "keyType": "secp256k1",
+              "owner": "0x1111111111111111111111111111111111111111",
+              "type": "primitive",
+            },
+            {
+              "spec": {
+                "account": "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+                "approvals": [
+                  {
+                    "keyData": "0x0578",
+                    "keyType": "webAuthn",
+                    "owner": "0x2222222222222222222222222222222222222222",
+                  },
+                ],
+                "config": "0xf83ba022222222222222222222222222222222222222222222222222222222222222220101d7d694222222222222222222222222222222222222222201",
+              },
+              "type": "multisig",
+            },
+          ],
+          "config": "0xf852a011111111111111111111111111111111111111111111111111111111111111118002eed694111111111111111111111111111111111111111101d694bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb01",
+        },
+        "type": "0x76",
+      }
+      `)
   })
 })
 
@@ -241,7 +314,7 @@ describe('roundtrip', () => {
       nonceKey: 255n,
       gas: 100000n,
       maxFeePerGas: 1000000000n,
-      multisigWitness,
+      multisigSimulation,
     }
 
     const rpc = TransactionRequest.toRpc(original)
@@ -262,7 +335,7 @@ describe('roundtrip', () => {
     expect(converted.nonceKey).toBe(original.nonceKey)
     expect(converted.gas).toBe(original.gas)
     expect(converted.maxFeePerGas).toBe(original.maxFeePerGas)
-    expect(converted.multisigWitness).toEqual(original.multisigWitness)
+    expect(converted.multisigSimulation).toEqual(original.multisigSimulation)
     expect(converted.type).toBe('tempo')
   })
 
@@ -280,7 +353,7 @@ describe('roundtrip', () => {
       validAfter: '0x32',
       nonceKey: '0xff',
       gas: '0x186a0',
-      multisigWitness: multisigWitnessRpc,
+      multisigSimulation: multisigSimulationRpc,
       type: '0x76',
     }
 
@@ -293,7 +366,7 @@ describe('roundtrip', () => {
     expect(rpc.validAfter).toBe(original.validAfter)
     expect(rpc.nonceKey).toBe(original.nonceKey)
     expect(rpc.gas).toBe(original.gas)
-    expect(rpc.multisigWitness).toEqual(original.multisigWitness)
+    expect(rpc.multisigSimulation).toEqual(original.multisigSimulation)
     expect(rpc.type).toBe('0x76')
   })
 })

package/tempo/TransactionRequest.ts

@@ -4,7 +4,7 @@ import type { Compute } from '../core/internal/types.js'
 import * as ox_TransactionRequest from '../core/TransactionRequest.js'
 import * as AuthorizationTempo from './AuthorizationTempo.js'
 import * as KeyAuthorization from './KeyAuthorization.js'
-import * as MultisigWitness from './MultisigWitness.js'
+import * as MultisigSimulation from './MultisigSimulation.js'
 import * as TempoAddress from './TempoAddress.js'
 import * as TokenId from './TokenId.js'
 import * as Transaction from './Transaction.js'
@@ -34,27 +34,27 @@ export type TransactionRequest<
       | AuthorizationTempo.ListSigned<bigintType, numberType>
       | undefined
     calls?: readonly Call<bigintType, addressType>[] | undefined
+    feePayer?: boolean | undefined
+    feeToken?: TokenId.TokenIdOrAddress<addressType> | undefined
     keyAuthorization?: KeyAuthorization.KeyAuthorization<true> | undefined
     keyData?: Hex.Hex | undefined
     keyType?: KeyType | undefined
-    feePayer?: boolean | undefined
-    feeToken?: TokenId.TokenIdOrAddress<addressType> | undefined
-    multisigWitness?: MultisigWitness.MultisigWitness<bigintType> | undefined
+    multisigSimulation?: MultisigSimulation.Spec | undefined
     nonceKey?: 'random' | bigintType | undefined
-    validBefore?: numberType | undefined
     validAfter?: numberType | undefined
+    validBefore?: numberType | undefined
   }
 >
 
 /** RPC representation of a {@link ox#TransactionRequest.TransactionRequest}. */
 export type Rpc = Omit<
   TransactionRequest<Hex.Hex, Hex.Hex, string, Hex.Hex>,
-  'authorizationList' | 'feeToken' | 'keyAuthorization' | 'multisigWitness'
+  'authorizationList' | 'feeToken' | 'keyAuthorization' | 'multisigSimulation'
 > & {
   authorizationList?: AuthorizationTempo.ListRpc | undefined
   feeToken?: Hex.Hex | undefined
   keyAuthorization?: KeyAuthorization.Rpc | undefined
-  multisigWitness?: MultisigWitness.Rpc | undefined
+  multisigSimulation?: MultisigSimulation.Rpc | undefined
   nonceKey?: Hex.Hex | undefined
 }
 
@@ -79,7 +79,7 @@ export type Rpc = Omit<
  * @returns A transaction request.
  */
 export function fromRpc(request: Rpc): TransactionRequest {
-  const { authorizationList: _, multisigWitness: __, ...rest } = request
+  const { authorizationList: _, multisigSimulation: __, ...rest } = request
   const request_ = ox_TransactionRequest.fromRpc(
     rest as any,
   ) as TransactionRequest
@@ -110,8 +110,10 @@ export function fromRpc(request: Rpc): TransactionRequest {
     request_.keyAuthorization = KeyAuthorization.fromRpc(
       request.keyAuthorization,
     )
-  if (request.multisigWitness)
-    request_.multisigWitness = MultisigWitness.fromRpc(request.multisigWitness)
+  if (request.multisigSimulation)
+    request_.multisigSimulation = MultisigSimulation.fromRpc(
+      request.multisigSimulation,
+    )
   if (typeof request.validBefore !== 'undefined')
     request_.validBefore = Hex.toNumber(request.validBefore as Hex.Hex)
   if (typeof request.validAfter !== 'undefined')
@@ -125,9 +127,9 @@ export function fromRpc(request: Rpc): TransactionRequest {
 export declare namespace fromRpc {
   export type ErrorType =
     | AuthorizationTempo.fromRpcList.ErrorType
-    | MultisigWitness.fromRpc.ErrorType
-    | Hex.toNumber.ErrorType
     | Hex.toBigInt.ErrorType
+    | Hex.toNumber.ErrorType
+    | MultisigSimulation.fromRpc.ErrorType
     | Errors.GlobalErrorType
 }
 
@@ -210,8 +212,10 @@ export function toRpc(request: TransactionRequest): Rpc {
     request_rpc.keyAuthorization = KeyAuthorization.toRpc(
       request.keyAuthorization,
     )
-  if (request.multisigWitness)
-    request_rpc.multisigWitness = MultisigWitness.toRpc(request.multisigWitness)
+  if (request.multisigSimulation)
+    request_rpc.multisigSimulation = MultisigSimulation.toRpc(
+      request.multisigSimulation,
+    )
   if (typeof request.validBefore !== 'undefined')
     request_rpc.validBefore = Hex.fromNumber(request.validBefore)
   if (typeof request.validAfter !== 'undefined')
@@ -230,7 +234,7 @@ export function toRpc(request: TransactionRequest): Rpc {
     typeof request.feePayer !== 'undefined' ||
     typeof request.feeToken !== 'undefined' ||
     typeof request.keyAuthorization !== 'undefined' ||
-    typeof request.multisigWitness !== 'undefined' ||
+    typeof request.multisigSimulation !== 'undefined' ||
     typeof request.nonceKey !== 'undefined' ||
     typeof request.validBefore !== 'undefined' ||
     typeof request.validAfter !== 'undefined' ||
@@ -249,7 +253,7 @@ export function toRpc(request: TransactionRequest): Rpc {
 export declare namespace toRpc {
   export type ErrorType =
     | AuthorizationTempo.toRpcList.ErrorType
-    | MultisigWitness.toRpc.ErrorType
+    | MultisigSimulation.toRpc.ErrorType
     | Hex.fromNumber.ErrorType
     | Errors.GlobalErrorType
 }

package/tempo/index.ts

@@ -160,14 +160,14 @@ export * as MultisigConfig from './MultisigConfig.js'
  */
 export * as MultisigOperation from './MultisigOperation.js'
 /**
- * Native multisig RPC simulation witness utilities.
+ * Native multisig RPC simulation utilities.
  *
- * Converts complete root and nested owner witnesses between their domain and
- * Tempo JSON-RPC representations.
+ * Converts complete root and nested owner specs between their domain and Tempo
+ * JSON-RPC representations.
  *
  * @category Reference
  */
-export * as MultisigWitness from './MultisigWitness.js'
+export * as MultisigSimulation from './MultisigSimulation.js'
 /**
  * Utilities for constructing period durations (in seconds) for recurring spending limits.
  *

package/tempo/multisig.e2e.test.ts

@@ -2,7 +2,12 @@ import { AbiFunction, Address, Hex, Secp256k1, Value } from 'ox'
 import { getTransactionCount } from 'viem/actions'
 import { describe, expect, test } from 'vitest'
 import { chain, client, fundAddress } from '../../test/tempo/config.js'
-import { KeyAuthorization, MultisigConfig, SignatureEnvelope } from './index.js'
+import {
+  KeyAuthorization,
+  MultisigConfig,
+  SignatureEnvelope,
+  TransactionRequest,
+} from './index.js'
 import * as Transaction from './Transaction.js'
 import * as TransactionReceipt from './TransactionReceipt.js'
 import * as TxEnvelopeTempo from './TxEnvelopeTempo.js'
@@ -135,6 +140,51 @@ describe('behavior: multisig (TIP-1061)', () => {
     })
   }
 
+  test('behavior: fills a multisig simulation', async () => {
+    const { account, initialConfig, ownerKeys } = setup({
+      count: 2,
+      threshold: 2,
+    })
+    await fundAddress(client, { address: account })
+
+    const request = TransactionRequest.toRpc({
+      calls: [{ to: '0x0000000000000000000000000000000000000000' }],
+      from: account,
+      multisigSimulation: {
+        account,
+        approvals: ownerKeys.map((owner) => ({
+          keyType: 'secp256k1',
+          owner: owner.address,
+          type: 'primitive',
+        })),
+        config: initialConfig,
+      },
+    })
+    expect(request.multisigSimulation?.config).toBeTypeOf('string')
+
+    const response = await client.request({
+      method: 'eth_fillTransaction',
+      params: [request as never],
+    })
+    const transaction = TransactionRequest.fromRpc(
+      response.tx as TransactionRequest.Rpc,
+    )
+
+    expect(Hex.validate(response.raw)).toBe(true)
+    expect(transaction.calls).toHaveLength(1)
+    expect(transaction.calls?.[0]?.to).toBe(
+      '0x0000000000000000000000000000000000000000',
+    )
+    expect(transaction.chainId).toBe(chainId)
+    expect(transaction.feeToken).toBeNull()
+    expect(transaction.gas).toBeGreaterThan(0n)
+    expect(transaction.maxFeePerGas).toBeTypeOf('bigint')
+    expect(transaction.maxPriorityFeePerGas).toBeTypeOf('bigint')
+    expect(transaction.nonce ?? 0n).toBe(0n)
+    expect(transaction.nonceKey ?? 0n).toBe(0n)
+    expect(transaction.type).toBe('tempo')
+  })
+
   test('examples: bootstrap, initialized, and configuration rotation', async () => {
     const { account, initialConfig, ownerKeys } = setup({
       count: 3,
@@ -601,30 +651,30 @@ describe('behavior: multisig (TIP-1061)', () => {
       .then((tx) => TransactionReceipt.fromRpc(tx as any)))!
     expect(bootstrap_receipt.status).toBe('success')
 
-    // Multisig accounts authorize access keys through AccountKeychain.
-    const authorizeKey = AbiFunction.from(
-      'function authorizeKey(address keyId, uint8 signatureType, (uint64 expiry, bool enforceLimits, (address token, uint256 amount, uint64 period)[] limits, bool allowAnyCalls, (address target, (bytes4 selector, address[] recipients)[] selectorRules)[] allowedCalls) config)',
-    )
+    const keyAuthorization = KeyAuthorization.from({
+      account,
+      address: access.address,
+      chainId: BigInt(chainId),
+      isAdmin: false,
+      type: 'secp256k1',
+    })
+    const keyAuthorizationSigned = KeyAuthorization.from(keyAuthorization, {
+      signature: SignatureEnvelope.from({
+        account,
+        config: initialConfig,
+        signatures: approve({
+          config: initialConfig,
+          payload: KeyAuthorization.getSignPayload(keyAuthorization),
+          signers: ownerKeys,
+        }),
+      }),
+    })
 
     const authorize = TxEnvelopeTempo.from({
-      calls: [
-        {
-          to: '0xaaaaaaaa00000000000000000000000000000000',
-          data: AbiFunction.encodeData(authorizeKey, [
-            access.address,
-            0, // secp256k1
-            {
-              expiry: 18446744073709551615n, // u64 max (never expires)
-              enforceLimits: false,
-              limits: [],
-              allowAnyCalls: true,
-              allowedCalls: [],
-            },
-          ]),
-        },
-      ],
+      calls: [{ to: '0x0000000000000000000000000000000000000000' }],
       chainId,
       feeToken: '0x20c0000000000000000000000000000000000001',
+      keyAuthorization: keyAuthorizationSigned,
       nonce: 1n,
       gas: 5_000_000n,
       maxFeePerGas: Value.fromGwei('20'),

package/version.ts

@@ -1,2 +1,2 @@
 /** @internal */
-export const version = '0.14.42'
+export const version = '0.14.44'

package/_cjs/tempo/MultisigWitness.js

@@ -1,92 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InvalidWitnessError = void 0;
-exports.fromRpc = fromRpc;
-exports.toRpc = toRpc;
-const Errors = require("../core/Errors.js");
-const Hex = require("../core/Hex.js");
-const MultisigConfig = require("./MultisigConfig.js");
-function fromRpc(witness) {
-    const { account, approvals, config } = witness;
-    assertApprovalCount(approvals);
-    return {
-        account,
-        approvals: approvals.map((approval) => {
-            if (approval.type === 'primitive')
-                return approval;
-            assertApprovalCount(approval.witness.approvals);
-            return {
-                type: 'multisig',
-                witness: {
-                    account: approval.witness.account,
-                    approvals: approval.witness.approvals,
-                    config: MultisigConfig.from(approval.witness.config),
-                },
-            };
-        }),
-        config: MultisigConfig.from(config),
-    };
-}
-function toRpc(witness) {
-    const { account, approvals, config } = witness;
-    assertApprovalCount(approvals);
-    return {
-        account,
-        approvals: approvals.map((approval) => {
-            if (approval.type === 'primitive')
-                return {
-                    ...approval,
-                    ...(typeof approval.keyData !== 'undefined'
-                        ? { keyData: shimKeyData(approval.keyData) }
-                        : {}),
-                };
-            assertApprovalCount(approval.witness.approvals);
-            return {
-                type: 'multisig',
-                witness: {
-                    account: approval.witness.account,
-                    approvals: approval.witness.approvals.map((approval) => ({
-                        ...approval,
-                        ...(typeof approval.keyData !== 'undefined'
-                            ? { keyData: shimKeyData(approval.keyData) }
-                            : {}),
-                    })),
-                    config: configToRpc(approval.witness.config),
-                },
-            };
-        }),
-        config: configToRpc(config),
-    };
-}
-function assertApprovalCount(approvals) {
-    if (approvals.length > MultisigConfig.maxSignatures)
-        throw new InvalidWitnessError({
-            reason: `approval count exceeds ${MultisigConfig.maxSignatures}`,
-        });
-}
-function configToRpc(config) {
-    const value = MultisigConfig.from(config);
-    return {
-        ...value,
-        version: Hex.toNumber(Hex.fromNumber(Number(value.version))),
-    };
-}
-function shimKeyData(data) {
-    const size = Hex.size(data);
-    if (size <= 4)
-        return data;
-    return Hex.fromNumber(size, { size: 2 });
-}
-class InvalidWitnessError extends Errors.BaseError {
-    constructor(options) {
-        super(`Invalid multisig witness: ${options.reason}.`);
-        Object.defineProperty(this, "name", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 'MultisigWitness.InvalidWitnessError'
-        });
-    }
-}
-exports.InvalidWitnessError = InvalidWitnessError;
-//# sourceMappingURL=MultisigWitness.js.map

package/_cjs/tempo/MultisigWitness.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MultisigWitness.js","sourceRoot":"","sources":["../../tempo/MultisigWitness.ts"],"names":[],"mappings":";;;AA+EA,0BAmBC;AAwBD,sBA8BC;AAvJD,4CAA2C;AAC3C,sCAAqC;AAErC,sDAAqD;AA2ErD,SAAgB,OAAO,CAAC,OAAY;IAClC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC9C,mBAAmB,CAAC,SAAS,CAAC,CAAA;IAC9B,OAAO;QACL,OAAO;QACP,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW;gBAAE,OAAO,QAAQ,CAAA;YAClD,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;YAC/C,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE;oBACP,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO;oBACjC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS;oBACrC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;iBACrD;aACF,CAAA;QACH,CAAC,CAAC;QACF,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;KACpC,CAAA;AACH,CAAC;AAwBD,SAAgB,KAAK,CAAC,OAAwB;IAC5C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC9C,mBAAmB,CAAC,SAAS,CAAC,CAAA;IAC9B,OAAO;QACL,OAAO;QACP,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW;gBAC/B,OAAO;oBACL,GAAG,QAAQ;oBACX,GAAG,CAAC,OAAO,QAAQ,CAAC,OAAO,KAAK,WAAW;wBACzC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBAC5C,CAAC,CAAC,EAAE,CAAC;iBACR,CAAA;YACH,mBAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;YAC/C,OAAO;gBACL,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE;oBACP,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO;oBACjC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;wBACvD,GAAG,QAAQ;wBACX,GAAG,CAAC,OAAO,QAAQ,CAAC,OAAO,KAAK,WAAW;4BACzC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;4BAC5C,CAAC,CAAC,EAAE,CAAC;qBACR,CAAC,CAAC;oBACH,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;iBAC7C;aACF,CAAA;QACH,CAAC,CAAC;QACF,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC;KAC5B,CAAA;AACH,CAAC;AAaD,SAAS,mBAAmB,CAAC,SAA6B;IACxD,IAAI,SAAS,CAAC,MAAM,GAAG,cAAc,CAAC,aAAa;QACjD,MAAM,IAAI,mBAAmB,CAAC;YAC5B,MAAM,EAAE,0BAA0B,cAAc,CAAC,aAAa,EAAE;SACjE,CAAC,CAAA;AACN,CAAC;AAGD,SAAS,WAAW,CAClB,MAA6B;IAE7B,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACzC,OAAO;QACL,GAAG,KAAK;QACR,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;KAC7D,CAAA;AACH,CAAC;AAQD,SAAS,WAAW,CAAC,IAAa;IAChC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC3B,IAAI,IAAI,IAAI,CAAC;QAAE,OAAO,IAAI,CAAA;IAC1B,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAA;AAC1C,CAAC;AAGD,MAAa,mBAAoB,SAAQ,MAAM,CAAC,SAAS;IAEvD,YAAY,OAAoC;QAC9C,KAAK,CAAC,6BAA6B,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QAFrC;;;;mBAAO,qCAAqC;WAAA;IAG9D,CAAC;CACF;AALD,kDAKC"}