@ledgerhq/coin-hedera 1.15.0-nightly.20251126023856 → 1.15.0-nightly.20251126160702

package/lib/bridge/signOperation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYhE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE1D,eAAO,MAAM,kBAAkB,kBAEZ,cAAc,YAAY,CAAC,KACzC,cAAc,WAAW,EAAE,OAAO,CAAC,CAAC,eAAe,CA0FlD,CAAC"}
+{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYhE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAgB,MAAM,UAAU,CAAC;AAExE,eAAO,MAAM,kBAAkB,kBAEZ,cAAc,YAAY,CAAC,KACzC,cAAc,WAAW,EAAE,OAAO,CAAC,CAAC,eAAe,CA4GlD,CAAC"}

package/lib/bridge/signOperation.js

@@ -16,10 +16,14 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId
             });
             let type;
             let asset;
+            let data;
             const accountAddress = account.freshAddress;
             const accountPublicKey = account.seedIdentifier;
             const subAccount = (0, helpers_1.findSubAccountById)(account, transaction.subAccountId || "");
-            const isTokenTransaction = (0, helpers_1.isTokenAccount)(subAccount);
+            const isHTSTokenTransaction = transaction.mode === constants_1.HEDERA_TRANSACTION_MODES.Send &&
+                subAccount?.token.tokenType === "hts";
+            const isERC20TokenTransaction = transaction.mode === constants_1.HEDERA_TRANSACTION_MODES.Send &&
+                subAccount?.token.tokenType === "erc20";
             if ((0, utils_1.isTokenAssociateTransaction)(transaction)) {
                 type = constants_1.HEDERA_TRANSACTION_MODES.TokenAssociate;
                 asset = {
@@ -27,7 +31,7 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId
                     assetReference: transaction.properties.token.contractAddress,
                 };
             }
-            else if (isTokenTransaction) {
+            else if (isHTSTokenTransaction) {
                 type = constants_1.HEDERA_TRANSACTION_MODES.Send;
                 asset = {
                     type: subAccount.token.tokenType,
@@ -35,6 +39,18 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId
                     assetOwner: accountAddress,
                 };
             }
+            else if (isERC20TokenTransaction) {
+                type = constants_1.HEDERA_TRANSACTION_MODES.Send;
+                asset = {
+                    type: subAccount.token.tokenType,
+                    assetReference: subAccount.token.contractAddress,
+                    assetOwner: accountAddress,
+                };
+                data = {
+                    type: "erc20",
+                    gasLimit: BigInt((transaction.gasLimit ?? constants_1.DEFAULT_GAS_LIMIT).toString()),
+                };
+            }
             else {
                 type = constants_1.HEDERA_TRANSACTION_MODES.Send;
                 asset = {
@@ -57,6 +73,7 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId
                         type: "string",
                         value: transaction.memo ?? "",
                     },
+                    ...(data && { data }),
                 }, customFees);
                 const txBodyBytes = (0, utils_1.getHederaTransactionBodyBytes)(tx);
                 const signatureBytes = await signer.signTransaction(txBodyBytes);

package/lib/bridge/signOperation.js.map

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

package/lib/bridge/synchronisation.d.ts

@@ -1,5 +1,7 @@
 import type { GetAccountShape, IterateResultBuilder } from "@ledgerhq/coin-framework/bridge/jsHelpers";
+import type { Account } from "@ledgerhq/types-live";
 import type { HederaAccount } from "../types";
 export declare const getAccountShape: GetAccountShape<HederaAccount>;
 export declare const buildIterateResult: IterateResultBuilder;
+export declare const postSync: (_initial: Account, synced: Account) => Account;
 //# sourceMappingURL=synchronisation.d.ts.map

package/lib/bridge/synchronisation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,eAAe,EACf,oBAAoB,EACrB,MAAM,2CAA2C,CAAC;AAKnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAG9C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,aAAa,CAuF1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,oBAqBhC,CAAC"}
+{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,eAAe,EACf,oBAAoB,EACrB,MAAM,2CAA2C,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAa,MAAM,sBAAsB,CAAC;AAM/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAS9C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,aAAa,CA0I1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,oBAqBhC,CAAC;AAGF,eAAO,MAAM,QAAQ,aAAc,OAAO,UAAU,OAAO,KAAG,OAgB7D,CAAC"}

package/lib/bridge/synchronisation.js

@@ -3,18 +3,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildIterateResult = exports.getAccountShape = void 0;
+exports.postSync = exports.buildIterateResult = exports.getAccountShape = void 0;
 const bignumber_js_1 = require("bignumber.js");
 const invariant_1 = __importDefault(require("invariant"));
 const derivation_1 = require("@ledgerhq/coin-framework/derivation");
 const jsHelpers_1 = require("@ledgerhq/coin-framework/bridge/jsHelpers");
 const account_1 = require("@ledgerhq/coin-framework/account");
-const listOperations_1 = require("../logic/listOperations");
+const utils_1 = require("../logic/utils");
+const logic_1 = require("../logic");
 const api_1 = require("../network/api");
-const utils_1 = require("./utils");
+const thirdweb_1 = require("../network/thirdweb");
+const utils_2 = require("../network/utils");
+const utils_3 = require("./utils");
 const getAccountShape = async (info, { blacklistedTokenIds }) => {
     const { currency, derivationMode, address, initialAccount } = info;
-    (0, invariant_1.default)(address, "an hedera address is expected");
+    (0, invariant_1.default)(address, "hedera: address is expected");
+    const evmAddress = (0, utils_1.toEVMAddress)(address);
+    (0, invariant_1.default)(evmAddress, "hedera: evm address is missing");
     const liveAccountId = (0, account_1.encodeAccountId)({
         type: "js",
         version: "2",
@@ -25,41 +30,90 @@ const getAccountShape = async (info, { blacklistedTokenIds }) => {
     // get current account balance and tokens
     // tokens are fetched with separate requests to get "created_timestamp" for each token
     // based on this, ASSOCIATE_TOKEN operations can be connected with tokens
-    const [mirrorAccount, mirrorTokens] = await Promise.all([
+    const [mirrorAccount, mirrorTokens, erc20TokenBalances] = await Promise.all([
         api_1.apiClient.getAccount(address),
         api_1.apiClient.getAccountTokens(address),
+        (0, utils_2.getERC20BalancesForAccount)(evmAddress),
     ]);
     const accountBalance = new bignumber_js_1.BigNumber(mirrorAccount.balance.balance);
     // we should sync again when new tokens are added or blacklist changes
     const syncHash = await (0, account_1.getSyncHash)(currency.id, blacklistedTokenIds);
     const shouldSyncFromScratch = !initialAccount || syncHash !== initialAccount?.syncHash;
-    const oldOperations = initialAccount?.operations ?? [];
-    const pendingOperations = initialAccount?.pendingOperations ?? [];
-    // grab latest operation's consensus timestamp for incremental sync
+    const pendingOperations = shouldSyncFromScratch ? [] : initialAccount?.pendingOperations ?? [];
+    const oldOperations = shouldSyncFromScratch ? [] : initialAccount?.operations ?? [];
+    const oldERC20Operations = oldOperations.filter(item => item.standard === "erc20");
     const latestOperation = oldOperations[0];
-    const latestOperationTimestamp = !shouldSyncFromScratch && latestOperation
-        ? new bignumber_js_1.BigNumber(Math.floor(latestOperation.date.getTime() / 1000))
-        : null;
-    const latestAccountOperations = await (0, listOperations_1.listOperations)({
-        currency,
-        address,
-        mirrorTokens,
-        pagination: {
-            minHeight: 0,
-            ...(latestOperationTimestamp && { lastPagingToken: latestOperationTimestamp.toString() }),
-        },
-        fetchAllPages: true,
-        skipFeesForTokenOperations: false,
-        useEncodedHash: true,
-        useSyntheticBlocks: false,
-    });
-    const newSubAccounts = await (0, utils_1.getSubAccounts)(liveAccountId, latestAccountOperations.tokenOperations, mirrorTokens);
-    const subAccounts = (0, utils_1.mergeSubAccounts)(initialAccount, newSubAccounts);
-    const newOperations = await (0, utils_1.prepareOperations)(latestAccountOperations.coinOperations, latestAccountOperations.tokenOperations);
-    const enrichedNewOperations = (0, utils_1.applyPendingExtras)(newOperations, pendingOperations);
+    const erc20LatestOperation = oldERC20Operations[0];
+    const pendingOperationHashes = new Set(pendingOperations.map(op => op.hash));
+    const erc20OperationHashes = new Set(oldERC20Operations.map(op => op.hash));
+    // grab latest operation timestamps for incremental sync
+    let latestOperationTimestamp = null;
+    let erc20LatestOperationTimestamp = null;
+    if (!shouldSyncFromScratch && latestOperation) {
+        const timestamp = Math.floor(latestOperation.date.getTime() / 1000);
+        latestOperationTimestamp = new bignumber_js_1.BigNumber(timestamp).toString();
+    }
+    if (!shouldSyncFromScratch && erc20LatestOperation) {
+        const timestamp = Math.floor(erc20LatestOperation.date.getTime() / 1000);
+        erc20LatestOperationTimestamp = new bignumber_js_1.BigNumber(timestamp).toString();
+    }
+    const [latestAccountOperations, erc20Transactions] = await Promise.all([
+        (0, logic_1.listOperations)({
+            currency,
+            address,
+            mirrorTokens,
+            pagination: {
+                minHeight: 0,
+                ...(latestOperationTimestamp && { lastPagingToken: latestOperationTimestamp.toString() }),
+            },
+            fetchAllPages: true,
+            skipFeesForTokenOperations: false,
+            useEncodedHash: true,
+            useSyntheticBlocks: false,
+        }),
+        thirdweb_1.thirdwebClient.getERC20TransactionsForAccount({
+            address,
+            contractAddresses: erc20TokenBalances.map(token => token.token.contractAddress),
+            since: erc20LatestOperationTimestamp,
+        }),
+    ]);
+    const newOperations = await (0, utils_3.prepareOperations)(latestAccountOperations.coinOperations, latestAccountOperations.tokenOperations);
+    const enrichedNewOperations = (0, utils_3.applyPendingExtras)(newOperations, pendingOperations);
     const operations = shouldSyncFromScratch
         ? enrichedNewOperations
         : (0, jsHelpers_1.mergeOps)(oldOperations, enrichedNewOperations);
+    // how ERC20 operations are handled:
+    // - mirror node doesn't include "IN" erc20 token transactions
+    // - mirror node returns "CONTRACT_CALL" (OUT) erc20 token transactions made from given account address
+    // - mirror node doesn't return "CONTRACT_CALL" (OUT) erc20 token transactions made from 3rd party with allowance
+    //
+    // 1. mirror node transactions are already transformed into operations at this point + we have raw erc20 transactions fetched from thirdweb
+    // 2. related mirror node transaction must be fetched for each erc20 transaction (to get fee and consensus timestamp)
+    // 3. CONTRACTCALL operations must be removed if existing operations already include erc20 operation with the same tx.hash
+    // 4. ERC20 transactions must be classified into two groups: patchList and addList
+    //    - patchList: transactions which are already present in mirror operations (we can have CONTRACT_CALL from mirror node that we can transform into "FEES")
+    //    - addList should include transactions which are missing in mirror operations (e.g. "IN" erc20 token transaction and "OUT" made by 3rd party with allowance)
+    // 5. list of all operations must be updated based on prepared `patchList` and `addList`
+    // 6. sub accounts must get erc20 tokens and erc20 operations in addition to hts tokens and hts operations
+    // 7. postSync must remove pending operations that are already confirmed as erc20 operations
+    const { updatedOperations, newERC20TokenOperations } = await (0, utils_3.integrateERC20Operations)({
+        ledgerAccountId: liveAccountId,
+        address,
+        allOperations: operations,
+        latestERC20Transactions: erc20Transactions,
+        pendingOperationHashes,
+        erc20OperationHashes,
+    });
+    const newSubAccounts = await (0, utils_3.getSubAccounts)({
+        ledgerAccountId: liveAccountId,
+        latestHTSTokenOperations: latestAccountOperations.tokenOperations,
+        latestERC20TokenOperations: newERC20TokenOperations,
+        mirrorTokens,
+        erc20Tokens: erc20TokenBalances,
+    });
+    const subAccounts = shouldSyncFromScratch
+        ? newSubAccounts
+        : (0, utils_3.mergeSubAccounts)(initialAccount, newSubAccounts);
     return {
         id: liveAccountId,
         freshAddress: address,
@@ -67,8 +121,8 @@ const getAccountShape = async (info, { blacklistedTokenIds }) => {
         lastSyncDate: new Date(),
         balance: accountBalance,
         spendableBalance: accountBalance,
-        operations,
-        operationsCount: operations.length,
+        operations: updatedOperations,
+        operationsCount: updatedOperations.length,
         // NOTE: there are no "blocks" in hedera
         // Set a value just so that operations are considered confirmed according to isConfirmedOperation
         blockHeight: 10,
@@ -101,4 +155,21 @@ const buildIterateResult = async ({ result: rootResult }) => {
     };
 };
 exports.buildIterateResult = buildIterateResult;
+// it might be necessary to remove pending operations after ERC20 patching done by `integrateERC20Operations`
+const postSync = (_initial, synced) => {
+    const erc20Operations = synced.operations.filter(op => op.standard === "erc20");
+    const erc20Hashes = new Set(erc20Operations.map(op => op.hash));
+    const excludeConfirmedERC20Operations = (o) => !erc20Hashes.has(o.hash);
+    return {
+        ...synced,
+        pendingOperations: synced.pendingOperations.filter(excludeConfirmedERC20Operations),
+        subAccounts: (synced.subAccounts ?? []).map(subAccount => {
+            return {
+                ...subAccount,
+                pendingOperations: subAccount.pendingOperations.filter(excludeConfirmedERC20Operations),
+            };
+        }),
+    };
+};
+exports.postSync = postSync;
 //# sourceMappingURL=synchronisation.js.map

package/lib/bridge/synchronisation.js.map

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

package/lib/bridge/utils.d.ts

@@ -1,6 +1,6 @@
 import BigNumber from "bignumber.js";
 import type { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
-import type { HederaOperationExtra, Transaction, HederaMirrorToken } from "../types";
+import type { HederaOperationExtra, Transaction, OperationERC20, HederaMirrorToken, HederaERC20TokenBalance, HederaThirdwebTransaction, ERC20OperationFields } from "../types";
 interface CalculateAmountResult {
     amount: BigNumber;
     totalSpent: BigNumber;
@@ -9,7 +9,13 @@ export declare const calculateAmount: ({ account, transaction, }: {
     account: Account;
     transaction: Transaction;
 }) => Promise<CalculateAmountResult>;
-export declare const getSubAccounts: (accountId: string, lastTokenOperations: Operation[], mirrorTokens: HederaMirrorToken[]) => Promise<TokenAccount[]>;
+export declare const getSubAccounts: ({ ledgerAccountId, latestHTSTokenOperations, latestERC20TokenOperations, mirrorTokens, erc20Tokens, }: {
+    ledgerAccountId: string;
+    latestHTSTokenOperations: Operation[];
+    latestERC20TokenOperations: Operation[];
+    mirrorTokens: HederaMirrorToken[];
+    erc20Tokens: HederaERC20TokenBalance[];
+}) => Promise<TokenAccount[]>;
 export declare const prepareOperations: (coinOperations: Operation<HederaOperationExtra>[], tokenOperations: Operation<HederaOperationExtra>[]) => Promise<Operation<HederaOperationExtra>[]>;
 /**
  * In charge of smartly merging sub accounts while maintaining references as much as possible
@@ -17,5 +23,32 @@ export declare const prepareOperations: (coinOperations: Operation<HederaOperati
 export declare const mergeSubAccounts: (initialAccount: Account | undefined, newSubAccounts: TokenAccount[]) => Array<TokenAccount>;
 export declare const applyPendingExtras: (existing: Operation[], pending: Operation[]) => Operation[];
 export declare function patchOperationWithExtra(operation: Operation, extra: HederaOperationExtra): Operation;
+export declare const removeDuplicatedContractCallOperations: (operations: Operation[], pendingOperationHashes: Set<string>, erc20OperationHashes: Set<string>) => Operation[];
+export declare const classifyERC20Operations: ({ latestERC20Operations, operationsByHash, evmAccountAddress, }: {
+    latestERC20Operations: OperationERC20[];
+    operationsByHash: Map<string, Operation>;
+    evmAccountAddress: string | null;
+}) => {
+    erc20OperationsToPatch: Map<string, OperationERC20>;
+    erc20OperationsToAdd: Map<string, OperationERC20>;
+};
+export declare const patchContractCallOperation: ({ relatedExistingOperation, ledgerAccountId, hash, erc20Fields, tokenOperation, }: {
+    relatedExistingOperation: Operation;
+    ledgerAccountId: string;
+    hash: string;
+    erc20Fields: ERC20OperationFields;
+    tokenOperation: Operation;
+}) => void;
+export declare const integrateERC20Operations: ({ ledgerAccountId, address, allOperations, latestERC20Transactions, pendingOperationHashes, erc20OperationHashes, }: {
+    ledgerAccountId: string;
+    address: string;
+    allOperations: Operation[];
+    latestERC20Transactions: HederaThirdwebTransaction[];
+    pendingOperationHashes: Set<string>;
+    erc20OperationHashes: Set<string>;
+}) => Promise<{
+    updatedOperations: Operation[];
+    newERC20TokenOperations: Operation[];
+}>;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/lib/bridge/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAgB7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAErF,UAAU,qBAAqB;IAC7B,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,SAAS,CAAC;CACvB;AAyCD,eAAO,MAAM,eAAe;aAIjB,OAAO;iBACH,WAAW;MACtB,QAAQ,qBAAqB,CAahC,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,uBACI,SAAS,EAAE,gBAClB,iBAAiB,EAAE,KAChC,QAAQ,YAAY,EAAE,CAwFxB,CAAC;AAoCF,eAAO,MAAM,iBAAiB,mBACZ,UAAU,oBAAoB,CAAC,EAAE,mBAChC,UAAU,oBAAoB,CAAC,EAAE,KACjD,QAAQ,UAAU,oBAAoB,CAAC,EAAE,CAmC3C,CAAC;AAaF;;GAEG;AACH,eAAO,MAAM,gBAAgB,mBACX,OAAO,GAAG,SAAS,kBACnB,YAAY,EAAE,KAC7B,MAAM,YAAY,CAmDpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,SAAS,EAAE,WAAW,SAAS,EAAE,gBAiB7E,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAoB,GAC1B,SAAS,CAOX"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bridge/utils.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAiB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAwB5F,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,uBAAuB,EACvB,yBAAyB,EACzB,oBAAoB,EACrB,MAAM,UAAU,CAAC;AAElB,UAAU,qBAAqB;IAC7B,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,SAAS,CAAC;CACvB;AAyCD,eAAO,MAAM,eAAe;aAIjB,OAAO;iBACH,WAAW;MACtB,QAAQ,qBAAqB,CAahC,CAAC;AAEF,eAAO,MAAM,cAAc;qBAOR,MAAM;8BACG,SAAS,EAAE;gCACT,SAAS,EAAE;kBACzB,iBAAiB,EAAE;iBACpB,uBAAuB,EAAE;MACpC,QAAQ,YAAY,EAAE,CAqGzB,CAAC;AAoCF,eAAO,MAAM,iBAAiB,mBACZ,UAAU,oBAAoB,CAAC,EAAE,mBAChC,UAAU,oBAAoB,CAAC,EAAE,KACjD,QAAQ,UAAU,oBAAoB,CAAC,EAAE,CAmC3C,CAAC;AAaF;;GAEG;AACH,eAAO,MAAM,gBAAgB,mBACX,OAAO,GAAG,SAAS,kBACnB,YAAY,EAAE,KAC7B,MAAM,YAAY,CAmDpB,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,SAAS,EAAE,WAAW,SAAS,EAAE,gBAiB7E,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,oBAAoB,GAC1B,SAAS,CAOX;AAGD,eAAO,MAAM,sCAAsC,eACrC,SAAS,EAAE,0BACC,IAAI,MAAM,CAAC,wBACb,IAAI,MAAM,CAAC,KAChC,SAAS,EAWX,CAAC;AAKF,eAAO,MAAM,uBAAuB;2BAKX,cAAc,EAAE;sBACrB,IAAI,MAAM,EAAE,SAAS,CAAC;uBACrB,MAAM,GAAG,IAAI;;4BAER,IAAI,MAAM,EAAE,cAAc,CAAC;0BAC7B,IAAI,MAAM,EAAE,cAAc,CAAC;CAuBlD,CAAC;AA6DF,eAAO,MAAM,0BAA0B;8BAOX,SAAS;qBAClB,MAAM;UACjB,MAAM;iBACC,oBAAoB;oBACjB,SAAS;MACvB,IAQH,CAAC;AAEF,eAAO,MAAM,wBAAwB;qBAQlB,MAAM;aACd,MAAM;mBACA,SAAS,EAAE;6BACD,yBAAyB,EAAE;4BAC5B,IAAI,MAAM,CAAC;0BACb,IAAI,MAAM,CAAC;;uBAEd,SAAS,EAAE;6BACL,SAAS,EAAE;EA+GrC,CAAC"}