@bsv/wallet-toolbox 1.1.11 → 1.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",
@@ -32,7 +32,7 @@
   "dependencies": {
     "@bsv/auth-express-middleware": "^1.0.1",
     "@bsv/payment-express-middleware": "^1.0.1",
-    "@bsv/sdk": "^1.3.13",
+    "@bsv/sdk": "^1.3.16",
     "axios": "^0.29.0",
     "express": "^4.21.2",
     "knex": "^3.1.0",

package/src/Setup.ts

@@ -21,6 +21,7 @@ import { SetupWallet, SetupWalletArgs, StorageKnex } from './index.all'
  *
  */
 export abstract class Setup extends SetupClient {
+
   /**
    * Adds `Knex` based storage to a `Wallet` configured by `Setup.createWalletOnly`
    *

package/src/SetupClient.ts

@@ -5,6 +5,7 @@ import {
   CreateActionOutput,
   CreateActionResult,
   KeyDeriver,
+  LockingScript,
   P2PKH,
   PrivateKey,
   PublicKey,
@@ -20,6 +21,9 @@ import {
   WalletStorageManager
 } from './index.client'
 
+import * as dotenv from 'dotenv'
+dotenv.config()
+
 /**
  * The `SetupClient` class provides static setup functions to construct BRC-100 compatible
  * wallets in a variety of configurations.
@@ -52,21 +56,21 @@ export abstract class SetupClient {
     const mainIdentityKey2 = mainPrivKey2.toPublicKey().toString()
 
     const log = `
-    # Add the following to .env file:
-    MAIN_TAAL_API_KEY='mainnet_9596de07e92300c6287e4393594ae39c'
-    TEST_TAAL_API_KEY='testnet_0e6cf72133b43ea2d7861da2a38684e3'
-    MY_TEST_IDENTITY = '${testIdentityKey1}'
-    MY_TEST_IDENTITY2 = '${testIdentityKey2}'
-    MY_MAIN_IDENTITY = '${mainIdentityKey1}'
-    MY_MAIN_IDENTITY2 = '${mainIdentityKey2}'
-    DEV_KEYS = '{
-        "${testIdentityKey1}": "${testPrivKey1.toString()}",
-        "${testIdentityKey2}": "${testPrivKey2.toString()}"
-        "${mainIdentityKey1}": "${mainPrivKey1.toString()}",
-        "${mainIdentityKey2}": "${mainPrivKey2.toString()}"
-    }'
-    MYSQL_CONNECTION='{"port":3306,"host":"127.0.0.1","user":"root","password":"<your_password>","database":"<your_database>", "timezone": "Z"}'
-    `
+# .env file template for working with wallet-toolbox Setup functions.
+MY_TEST_IDENTITY = '${testIdentityKey1}'
+MY_TEST_IDENTITY2 = '${testIdentityKey2}'
+MY_MAIN_IDENTITY = '${mainIdentityKey1}'
+MY_MAIN_IDENTITY2 = '${mainIdentityKey2}'
+MAIN_TAAL_API_KEY='mainnet_9596de07e92300c6287e4393594ae39c'
+TEST_TAAL_API_KEY='testnet_0e6cf72133b43ea2d7861da2a38684e3'
+MYSQL_CONNECTION='{"port":3306,"host":"127.0.0.1","user":"root","password":"<your_password>","database":"<your_database>", "timezone": "Z"}'
+DEV_KEYS = '{
+    "${testIdentityKey1}": "${testPrivKey1.toString()}",
+    "${testIdentityKey2}": "${testPrivKey2.toString()}"
+    "${mainIdentityKey1}": "${mainPrivKey1.toString()}",
+    "${mainIdentityKey2}": "${mainPrivKey2.toString()}"
+}'
+`
     console.log(log)
 
     return log
@@ -213,7 +217,7 @@ export abstract class SetupClient {
   /**
    * @publicbody
    */
-  static getLockP2PKH(address: string) {
+  static getLockP2PKH(address: string): LockingScript {
     const p2pkh = new P2PKH()
     const lock = p2pkh.lock(address)
     return lock

package/src/services/providers/arcServices.ts

@@ -196,7 +196,7 @@ export async function postTxsToTaalArcMiner(
     for (const txid of txids) {
       const btx = beef.findTxid(txid)
       if (btx) {
-        const tx = btx.tx
+        const tx = btx.tx!
         for (const input of tx.inputs) {
           if (!input.sourceTXID || input.sourceTXID === '0'.repeat(64)) continue // all zero txid is a coinbase input.
           let itx = beef.findTxid(input.sourceTXID!)

package/src/signer/methods/createAction.ts

@@ -10,7 +10,7 @@ import {
   makeAtomicBeef,
   PendingSignAction,
   PendingStorageInput,
-  ScriptTemplateSABPPP,
+  ScriptTemplateBRC29,
   sdk,
   verifyTruthy,
   Wallet
@@ -100,7 +100,7 @@ function makeChangeLock(
 ): Script {
   const derivationPrefix = dctr.derivationPrefix
   const derivationSuffix = verifyTruthy(out.derivationSuffix)
-  const sabppp = new ScriptTemplateSABPPP({
+  const sabppp = new ScriptTemplateBRC29({
     derivationPrefix,
     derivationSuffix,
     keyDeriver: wallet.keyDeriver
@@ -149,7 +149,7 @@ export async function completeSignedTransaction(
   // Insert SABPPP unlock templates for storage signed inputs
   /////////////////////
   for (const pdi of prior.pdi) {
-    const sabppp = new ScriptTemplateSABPPP({
+    const sabppp = new ScriptTemplateBRC29({
       derivationPrefix: pdi.derivationPrefix,
       derivationSuffix: pdi.derivationSuffix,
       keyDeriver: wallet.keyDeriver
@@ -321,7 +321,7 @@ function buildSignableTransaction(
       }
       tx.addInput(inputToAdd)
     } else {
-      // Type2: SABPPP protocol inputs which are signed using ScriptTemplateSABPPP.
+      // Type2: SABPPP protocol inputs which are signed using ScriptTemplateBRC29.
       if (storageInput.type !== 'P2PKH')
         throw new sdk.WERR_INVALID_PARAMETER(
           'type',

package/src/signer/methods/internalizeAction.ts

@@ -122,7 +122,7 @@ export async function internalizeAction(
         'tx',
         `valid AtomicBEEF with newest txid of ${txid}`
       )
-    const tx = btx.tx
+    const tx = btx.tx!
 
     /*
     for (const i of tx.inputs) {

package/src/signer/methods/signAction.ts

@@ -9,7 +9,7 @@ import {
 import {
   asBsvSdkScript,
   PendingSignAction,
-  ScriptTemplateSABPPP,
+  ScriptTemplateBRC29,
   sdk,
   Wallet
 } from '../../index.client'
@@ -92,7 +92,7 @@ export async function completeSignedTransaction(
   // Insert SABPPP unlock templates for wallet signed inputs
   /////////////////////
   for (const pdi of prior.pdi) {
-    const sabppp = new ScriptTemplateSABPPP({
+    const sabppp = new ScriptTemplateBRC29({
       derivationPrefix: pdi.derivationPrefix,
       derivationSuffix: pdi.derivationSuffix,
       keyDeriver: wallet.keyDeriver

package/src/storage/WalletStorageManager.ts

@@ -32,13 +32,13 @@ import {
  * If manages multiple `StorageBase` derived storage services: one actice, the rest as backups.
  *
  * Of the storage services, one is 'active' at any one time.
- * On startup, and whenever triggered by the wallet, `SignerStorage` runs a syncrhonization sequence:
+ * On startup, and whenever triggered by the wallet, `WalletStorageManager` runs a syncrhonization sequence:
  *
  * 1. While synchronizing, all other access to storage is blocked waiting.
  * 2. The active service is confirmed, potentially triggering a resolution process if there is disagreement.
  * 3. Changes are pushed from the active storage service to each inactive, backup service.
  *
- * Some storage services do not support multiple writers. `SignerStorage` manages wait-blocking write requests
+ * Some storage services do not support multiple writers. `WalletStorageManager` manages wait-blocking write requests
  * for these services.
  */
 export class WalletStorageManager implements sdk.WalletStorage {

package/src/storage/methods/createAction.ts

@@ -701,12 +701,12 @@ async function validateRequiredInputs(
         if (proven) beef.mergeBump(new EntityProvenTx(proven).getMerklePath())
       }
       // btx is valid has parsed transaction data.
-      if (vout >= btx.tx.outputs.length)
+      if (vout >= btx.tx!.outputs.length)
         throw new sdk.WERR_INVALID_PARAMETER(
           `${txid}.${vout}`,
           'valid outpoint'
         )
-      const so = btx.tx.outputs[vout]
+      const so = btx.tx!.outputs[vout]
       input.satoshis = verifyTruthy(so.satoshis)
       input.lockingScript = so.lockingScript
     }

package/src/storage/methods/internalizeAction.ts

@@ -303,7 +303,7 @@ class InternalizeActionContext {
         'tx',
         `valid AtomicBEEF with newest txid of ${txid}`
       )
-    const tx = btx.tx
+    const tx = btx.tx!
 
     /*
     for (const i of tx.inputs) {

package/src/utility/{ScriptTemplateSABPPP.ts → ScriptTemplateBRC29.ts}

@@ -1,31 +1,33 @@
-import { HexString, KeyDeriver, KeyDeriverApi, WalletProtocol } from '@bsv/sdk'
 import { asBsvSdkPrivateKey, verifyTruthy } from './index.client'
 import {
+  HexString,
+  KeyDeriver,
+  KeyDeriverApi,
+  WalletProtocol,
+  ScriptTemplate,
+  ScriptTemplateUnlock,
   LockingScript,
   P2PKH,
   PrivateKey,
-  Script,
-  ScriptTemplate,
-  Transaction,
-  UnlockingScript
+  Script
 } from '@bsv/sdk'
 
-export interface ScriptTemplateParamsSABPPP {
+export const brc29ProtocolID: WalletProtocol = [2, '3241645161d8']
+
+export interface ScriptTemplateParamsBRC29 {
   derivationPrefix?: string
   derivationSuffix?: string
   keyDeriver: KeyDeriverApi
 }
 
-export const brc29ProtocolID: WalletProtocol = [2, '3241645161d8']
-
 /**
  * Simple Authenticated BSV P2PKH Payment Protocol
  * https://brc.dev/29
  */
-export class ScriptTemplateSABPPP implements ScriptTemplate {
+export class ScriptTemplateBRC29 implements ScriptTemplate {
   p2pkh: P2PKH
 
-  constructor(public params: ScriptTemplateParamsSABPPP) {
+  constructor(public params: ScriptTemplateParamsBRC29) {
     this.p2pkh = new P2PKH()
 
     verifyTruthy(params.derivationPrefix)
@@ -59,10 +61,7 @@ export class ScriptTemplateSABPPP implements ScriptTemplate {
     lockerPubKey: string,
     sourceSatoshis?: number,
     lockingScript?: Script
-  ): {
-    sign: (tx: Transaction, inputIndex: number) => Promise<UnlockingScript>
-    estimateLength: (tx?: Transaction, inputIndex?: number) => Promise<number>
-  } {
+  ): ScriptTemplateUnlock {
     const derivedPrivateKey = this.getKeyDeriver(unlockerPrivKey)
       .derivePrivateKey(brc29ProtocolID, this.getKeyID(), lockerPubKey)
       .toHex()

package/src/utility/index.all.ts

@@ -1,5 +1,5 @@
 export * from './stampLog'
-export * from './ScriptTemplateSABPPP'
+export * from './ScriptTemplateBRC29'
 export * from './parseTxScriptOffsets'
 export * from './tscProofToMerklePath'
 export * from './utilityHelpers'

package/src/utility/index.client.ts

@@ -1,5 +1,5 @@
 export * from './stampLog'
-export * from './ScriptTemplateSABPPP'
+export * from './ScriptTemplateBRC29'
 export * from './parseTxScriptOffsets'
 export * from './tscProofToMerklePath'
 export * from './utilityHelpers'

package/test/Wallet/live/walletLive.man.test.ts

@@ -16,7 +16,7 @@ import {
   sdk,
   verifyOne,
   verifyId,
-  ScriptTemplateSABPPP,
+  ScriptTemplateBRC29,
   randomBytesBase64,
   randomBytes,
   EntityProvenTxReq,
@@ -451,7 +451,7 @@ export function createWalletPaymentOutput(args: {
   derivationSuffix: string
   lockingScript: string
 } {
-  const t = new ScriptTemplateSABPPP({
+  const t = new ScriptTemplateBRC29({
     derivationPrefix: randomBytesBase64(8),
     derivationSuffix: randomBytesBase64(8),
     keyDeriver: new KeyDeriver(PrivateKey.fromString(args.fromRootKeyHex))
@@ -495,7 +495,7 @@ export async function createWalletPaymentAction(args: {
 }> {
   const { toIdentityKey, outputSatoshis, keyDeriver, wallet } = args
 
-  const t = new ScriptTemplateSABPPP({
+  const t = new ScriptTemplateBRC29({
     derivationPrefix: randomBytesBase64(8),
     derivationSuffix: randomBytesBase64(8),
     keyDeriver

package/test/utils/TestUtilsWalletStorage.ts

@@ -1,4 +1,5 @@
 import {
+  Beef,
   CreateActionArgs,
   CreateActionOutput,
   CreateActionResult,
@@ -52,10 +53,8 @@ import {
 } from '../../src/index.all'
 
 import { Knex, knex as makeKnex } from 'knex'
-import { Beef } from '@bsv/sdk'
 
 import * as dotenv from 'dotenv'
-import { PrivilegedKeyManager, TransactionStatus } from '../../src/sdk'
 dotenv.config()
 
 const localMySqlConnection = process.env.LOCAL_MYSQL_CONNECTION || ''
@@ -172,7 +171,7 @@ export abstract class TestUtilsWalletStorage {
     expect(st.reference).toBeTruthy()
     // const tx = Transaction.fromAtomicBEEF(st.tx) // Transaction doesn't support V2 Beef yet.
     const atomicBeef = Beef.fromBinary(st.tx)
-    const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx
+    const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx!
     for (const input of tx.inputs) {
       expect(atomicBeef.findTxid(input.sourceTXID!)).toBeTruthy()
     }
@@ -251,10 +250,10 @@ export abstract class TestUtilsWalletStorage {
     )
     const monitor = new Monitor(monopts)
     monitor.addDefaultTasks()
-    let privilegedKeyManager: PrivilegedKeyManager | undefined = undefined
+    let privilegedKeyManager: sdk.PrivilegedKeyManager | undefined = undefined
     if (args.privKeyHex) {
       const privKey = PrivateKey.fromString(args.privKeyHex)
-      privilegedKeyManager = new PrivilegedKeyManager(async () => privKey)
+      privilegedKeyManager = new sdk.PrivilegedKeyManager(async () => privKey)
     }
     const wallet = new Wallet({
       chain,
@@ -1210,7 +1209,7 @@ export abstract class TestUtilsWalletStorage {
             {
               txid: input.sourceOutpoint.split('.')[0],
               satoshis: input.sourceSatoshis,
-              status: 'confirmed' as TransactionStatus,
+              status: 'confirmed' as sdk.TransactionStatus,
               description: 'Generated transaction for input',
               lockTime: 0,
               version: 1,
@@ -1260,7 +1259,7 @@ export abstract class TestUtilsWalletStorage {
         {
           txid: `${action.txid}` || `tx_${action.satoshis}_${Date.now()}`,
           satoshis: action.satoshis,
-          status: action.status as TransactionStatus,
+          status: action.status as sdk.TransactionStatus,
           description: action.description,
           lockTime: action.lockTime,
           version: action.version,

package/test/wallet/action/createAction.test.ts

@@ -35,33 +35,40 @@ describe('createAction test', () => {
   test('0_invalid_params', async () => {
     for (const { wallet } of ctxs) {
       {
-        const log = `\n${testName()}\n`
-        const args: CreateActionArgs = {
-          description: ''
-        }
-        // description is too short...
-        await expectToThrowWERR(sdk.WERR_INVALID_PARAMETER, () =>
-          wallet.createAction(args)
-        )
-        args.description = 'five.'
-        // no outputs, inputs or sendWith
-        await expectToThrowWERR(sdk.WERR_INVALID_PARAMETER, () =>
-          wallet.createAction(args)
-        )
-        args.options = { signAndProcess: false }
-        args.outputs = [
-          { satoshis: 42, lockingScript: 'fred', outputDescription: 'pay fred' }
+        const args: CreateActionArgs[] = [
+          // description is too short...
+          { description: '' },
+          // no outputs, inputs or sendWith
+          { description: '12345' },
+          // lockingScript must be hexadecimal
+          {
+            description: '12345',
+            outputs: [
+              {
+                satoshis: 42,
+                lockingScript: 'fred',
+                outputDescription: 'pay fred'
+              }
+            ]
+          },
+          // lockingScript must be even length
+          {
+            description: '12345',
+            outputs: [
+              {
+                satoshis: 42,
+                lockingScript: 'abc',
+                outputDescription: 'pay fred'
+              }
+            ]
+          }
         ]
-        // lockingScript must be hexadecimal
-        await expectToThrowWERR(sdk.WERR_INVALID_PARAMETER, () =>
-          wallet.createAction(args)
-        )
-        args.outputs[0].lockingScript = 'fre'
-        // lockingScript must be even length
-        await expectToThrowWERR(sdk.WERR_INVALID_PARAMETER, () =>
-          wallet.createAction(args)
-        )
-        if (!noLog) console.log(log)
+
+        for (const a of args) {
+          await expectToThrowWERR(sdk.WERR_INVALID_PARAMETER, () =>
+            wallet.createAction(a)
+          )
+        }
       }
     }
   })
@@ -137,7 +144,7 @@ describe('createAction test', () => {
         expect(st.reference).toBeTruthy()
         // const tx = Transaction.fromAtomicBEEF(st.tx) // Transaction doesn't support V2 Beef yet.
         const atomicBeef = Beef.fromBinary(st.tx)
-        const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx
+        const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx!
         for (const input of tx.inputs) {
           expect(atomicBeef.findTxid(input.sourceTXID!)).toBeTruthy()
         }
@@ -194,7 +201,7 @@ describe('createAction test', () => {
         const st = cr.signableTransaction!
         expect(st.reference).toBeTruthy()
         const atomicBeef = Beef.fromBinary(st.tx)
-        const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx
+        const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx!
 
         tx.inputs[0].unlockingScriptTemplate = unlock
         await tx.sign()

package/test/wallet/action/createActionToGenerateBeefs.man.test.ts

@@ -217,7 +217,7 @@ async function createAndConsume(
     expect(st.reference).toBeTruthy()
     // const tx = Transaction.fromAtomicBEEF(st.tx) // Transaction doesn't support V2 Beef yet.
     const atomicBeef = bsv.Beef.fromBinary(st.tx)
-    const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx
+    const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx!
     for (const input of tx.inputs) {
       expect(atomicBeef.findTxid(input.sourceTXID!)).toBeTruthy()
     }
@@ -273,7 +273,7 @@ async function createAndConsume(
     const st = cr.signableTransaction!
     expect(st.reference).toBeTruthy()
     const atomicBeef: bsv.Beef = bsv.Beef.fromBinary(st.tx)
-    const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx
+    const tx = atomicBeef.txs[atomicBeef.txs.length - 1].tx!
 
     tx.inputs[0].unlockingScriptTemplate = unlock
     await tx.sign()

package/out/src/utility/ScriptTemplateSABPPP.d.ts

@@ -1,29 +0,0 @@
-import { HexString, KeyDeriverApi, WalletProtocol } from '@bsv/sdk';
-import { LockingScript, P2PKH, PrivateKey, Script, ScriptTemplate, Transaction, UnlockingScript } from '@bsv/sdk';
-export interface ScriptTemplateParamsSABPPP {
-    derivationPrefix?: string;
-    derivationSuffix?: string;
-    keyDeriver: KeyDeriverApi;
-}
-export declare const brc29ProtocolID: WalletProtocol;
-/**
- * Simple Authenticated BSV P2PKH Payment Protocol
- * https://brc.dev/29
- */
-export declare class ScriptTemplateSABPPP implements ScriptTemplate {
-    params: ScriptTemplateParamsSABPPP;
-    p2pkh: P2PKH;
-    constructor(params: ScriptTemplateParamsSABPPP);
-    getKeyID(): string;
-    getKeyDeriver(privKey: PrivateKey | HexString): KeyDeriverApi;
-    lock(lockerPrivKey: string, unlockerPubKey: string): LockingScript;
-    unlock(unlockerPrivKey: string, lockerPubKey: string, sourceSatoshis?: number, lockingScript?: Script): {
-        sign: (tx: Transaction, inputIndex: number) => Promise<UnlockingScript>;
-        estimateLength: (tx?: Transaction, inputIndex?: number) => Promise<number>;
-    };
-    /**
-     * P2PKH unlock estimateLength is a constant
-     */
-    unlockLength: number;
-}
-//# sourceMappingURL=ScriptTemplateSABPPP.d.ts.map

package/out/src/utility/ScriptTemplateSABPPP.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ScriptTemplateSABPPP.d.ts","sourceRoot":"","sources":["../../../src/utility/ScriptTemplateSABPPP.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAc,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE/E,OAAO,EACL,aAAa,EACb,KAAK,EACL,UAAU,EACV,MAAM,EACN,cAAc,EACd,WAAW,EACX,eAAe,EAChB,MAAM,UAAU,CAAA;AAEjB,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,aAAa,CAAA;CAC1B;AAED,eAAO,MAAM,eAAe,EAAE,cAAoC,CAAA;AAElE;;;GAGG;AACH,qBAAa,oBAAqB,YAAW,cAAc;IAGtC,MAAM,EAAE,0BAA0B;IAFrD,KAAK,EAAE,KAAK,CAAA;gBAEO,MAAM,EAAE,0BAA0B;IAOrD,QAAQ;IAIR,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,GAAG,aAAa;IAU7D,IAAI,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,aAAa;IAQlE,MAAM,CACJ,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,MAAM,GACrB;QACD,IAAI,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAA;QACvE,cAAc,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAC3E;IAcD;;OAEG;IACH,YAAY,SAAM;CACnB"}

package/out/src/utility/ScriptTemplateSABPPP.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ScriptTemplateSABPPP.js","sourceRoot":"","sources":["../../../src/utility/ScriptTemplateSABPPP.ts"],"names":[],"mappings":";;;AAAA,kCAA+E;AAC/E,iDAAiE;AACjE,kCAQiB;AAQJ,QAAA,eAAe,GAAmB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;AAElE;;;GAGG;AACH,MAAa,oBAAoB;IAG/B,YAAmB,MAAkC;QAAlC,WAAM,GAAN,MAAM,CAA4B;QAmDrD;;WAEG;QACH,iBAAY,GAAG,GAAG,CAAA;QArDhB,IAAI,CAAC,KAAK,GAAG,IAAI,WAAK,EAAE,CAAA;QAExB,IAAA,2BAAY,EAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QACrC,IAAA,2BAAY,EAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IACvC,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAA;IAC1E,CAAC;IAED,aAAa,CAAC,OAA+B;QAC3C,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,GAAG,gBAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACtE,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU;YACvB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,OAAO,CAAC,KAAK,EAAE;YAE1D,OAAO,IAAI,gBAAU,CAAC,OAAO,CAAC,CAAA;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAA;IAC/B,CAAC;IAED,IAAI,CAAC,aAAqB,EAAE,cAAsB;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;aAC9C,eAAe,CAAC,uBAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,KAAK,CAAC;aACxE,SAAS,EAAE,CAAA;QACd,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAClC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,CACJ,eAAuB,EACvB,YAAoB,EACpB,cAAuB,EACvB,aAAsB;QAKtB,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;aAC1D,gBAAgB,CAAC,uBAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC;aAChE,KAAK,EAAE,CAAA;QACV,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CACzB,IAAA,iCAAkB,EAAC,iBAAiB,CAAC,EACrC,KAAK,EACL,KAAK,EACL,cAAc,EACd,aAAa,CACd,CAAA;QACD,OAAO,CAAC,CAAA;IACV,CAAC;CAMF;AA1DD,oDA0DC"}