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

package/CHANGELOG.md

@@ -1,20 +1,22 @@
 # @ledgerhq/coin-hedera
 
-## 1.15.0-nightly.20251126023856
+## 1.15.0-nightly.20251126160702
 
 ### Minor Changes
 
+- [#12608](https://github.com/LedgerHQ/ledger-live/pull/12608) [`a2ecb55`](https://github.com/LedgerHQ/ledger-live/commit/a2ecb55df9d383dc282f5fe489cb14386208215e) Thanks [@mdomanski-ext-ledger](https://github.com/mdomanski-ext-ledger)! - feat: support for erc20 tokens in coin-hedera
+
 - [#12889](https://github.com/LedgerHQ/ledger-live/pull/12889) [`bf6f5d3`](https://github.com/LedgerHQ/ledger-live/commit/bf6f5d39cf752138741d16b246d1bc322426f9e5) Thanks [@francois-guerin-ledger](https://github.com/francois-guerin-ledger)! - refactor(llc): use core operation `tx.failed` property
 
 ### Patch Changes
 
-- Updated dependencies [[`50aeea1`](https://github.com/LedgerHQ/ledger-live/commit/50aeea1233056e9abff9568eb928927f39e76cff), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`67137eb`](https://github.com/LedgerHQ/ledger-live/commit/67137eb5d7f04dd5f3610fdaa4e463d292654105), [`49ef24c`](https://github.com/LedgerHQ/ledger-live/commit/49ef24cbd1948bfd146af0b20f2128951b2dc170), [`b4a4e16`](https://github.com/LedgerHQ/ledger-live/commit/b4a4e160aae6fd64f944ab25633f6931dc4358d3), [`927ae64`](https://github.com/LedgerHQ/ledger-live/commit/927ae64db0bb04af54e25623655a001a68e0f2d3), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`9251b77`](https://github.com/LedgerHQ/ledger-live/commit/9251b77fcb01709723842f19220a2a41a6fc8f3b), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`6d0c6b2`](https://github.com/LedgerHQ/ledger-live/commit/6d0c6b2eda60049d8eebda5de2c54e8f0be7d009), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`aadcec6`](https://github.com/LedgerHQ/ledger-live/commit/aadcec66847b800f79452ba1df09149e0a1cb9e8), [`b113920`](https://github.com/LedgerHQ/ledger-live/commit/b11392056bc334fc1813c473569ad3ae7be08045), [`ed8532b`](https://github.com/LedgerHQ/ledger-live/commit/ed8532bad754ca2b5f1788c6e92f4646b775ec79), [`88a5018`](https://github.com/LedgerHQ/ledger-live/commit/88a501871d58c980f18495b5b32012a3eaa9ab2c), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d)]:
-  - @ledgerhq/cryptoassets@13.34.0-nightly.20251126023856
-  - @ledgerhq/types-live@6.90.0-nightly.20251126023856
-  - @ledgerhq/coin-framework@6.10.0-nightly.20251126023856
-  - @ledgerhq/live-env@2.21.1-nightly.20251126023856
-  - @ledgerhq/live-countervalues@0.10.1-nightly.20251126023856
-  - @ledgerhq/live-network@2.1.2-nightly.20251126023856
+- Updated dependencies [[`50aeea1`](https://github.com/LedgerHQ/ledger-live/commit/50aeea1233056e9abff9568eb928927f39e76cff), [`a2ecb55`](https://github.com/LedgerHQ/ledger-live/commit/a2ecb55df9d383dc282f5fe489cb14386208215e), [`fe81926`](https://github.com/LedgerHQ/ledger-live/commit/fe81926afeb2df8e917e6bd1e4cbab13f09647fd), [`67137eb`](https://github.com/LedgerHQ/ledger-live/commit/67137eb5d7f04dd5f3610fdaa4e463d292654105), [`49ef24c`](https://github.com/LedgerHQ/ledger-live/commit/49ef24cbd1948bfd146af0b20f2128951b2dc170), [`b4a4e16`](https://github.com/LedgerHQ/ledger-live/commit/b4a4e160aae6fd64f944ab25633f6931dc4358d3), [`927ae64`](https://github.com/LedgerHQ/ledger-live/commit/927ae64db0bb04af54e25623655a001a68e0f2d3), [`903ea9c`](https://github.com/LedgerHQ/ledger-live/commit/903ea9cdacf704a0119de2803a4f409b775391a5), [`9251b77`](https://github.com/LedgerHQ/ledger-live/commit/9251b77fcb01709723842f19220a2a41a6fc8f3b), [`02ef98f`](https://github.com/LedgerHQ/ledger-live/commit/02ef98faeb13c182ef255e06a43c39abeb55ecc7), [`6d0c6b2`](https://github.com/LedgerHQ/ledger-live/commit/6d0c6b2eda60049d8eebda5de2c54e8f0be7d009), [`0d33751`](https://github.com/LedgerHQ/ledger-live/commit/0d33751bb2ae599d0d26ce6a8efdbe01757f12fb), [`aadcec6`](https://github.com/LedgerHQ/ledger-live/commit/aadcec66847b800f79452ba1df09149e0a1cb9e8), [`b113920`](https://github.com/LedgerHQ/ledger-live/commit/b11392056bc334fc1813c473569ad3ae7be08045), [`ed8532b`](https://github.com/LedgerHQ/ledger-live/commit/ed8532bad754ca2b5f1788c6e92f4646b775ec79), [`88a5018`](https://github.com/LedgerHQ/ledger-live/commit/88a501871d58c980f18495b5b32012a3eaa9ab2c), [`9659a34`](https://github.com/LedgerHQ/ledger-live/commit/9659a34d9998d5c4dff8618bf6cef7d16403680d)]:
+  - @ledgerhq/cryptoassets@13.34.0-nightly.20251126160702
+  - @ledgerhq/types-live@6.90.0-nightly.20251126160702
+  - @ledgerhq/coin-framework@6.10.0-nightly.20251126160702
+  - @ledgerhq/live-env@2.22.0-nightly.20251126160702
+  - @ledgerhq/live-countervalues@0.10.1-nightly.20251126160702
+  - @ledgerhq/live-network@2.1.2-nightly.20251126160702
 
 ## 1.14.0
 

package/lib/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EAWJ,MAAM,oCAAoC,CAAC;AAgB5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAsHxE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EAWJ,MAAM,oCAAoC,CAAC;AAiB5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CA4HxE"}

package/lib/api/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApi = void 0;
 const currencies_1 = require("@ledgerhq/cryptoassets/currencies");
 const config_1 = __importDefault(require("../config"));
+const constants_1 = require("../constants");
 const index_1 = require("../logic/index");
 const utils_1 = require("../logic/utils");
 const api_1 = require("../network/api");
@@ -29,9 +30,12 @@ function createApi(config) {
         },
         estimateFees: async (transactionIntent) => {
             const operationType = (0, utils_1.mapIntentToSDKOperation)(transactionIntent);
-            const estimatedFee = await (0, index_1.estimateFees)(currency, operationType);
+            if (operationType === constants_1.HEDERA_OPERATION_TYPES.ContractCall) {
+                throw new Error("hedera: estimateFees for ContractCall is not supported yet");
+            }
+            const estimatedFee = await (0, index_1.estimateFees)({ currency, operationType });
             return {
-                value: BigInt(estimatedFee.toString()),
+                value: BigInt(estimatedFee.tinybars.toString()),
             };
         },
         getBalance: address => (0, index_1.getBalance)(currency, address),

package/lib/api/index.js.map

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

package/lib/bridge/broadcast.js

@@ -12,7 +12,7 @@ const broadcast = async ({ signedOperation }) => {
     const base64HashUrlSafe = (0, utils_1.base64ToUrlSafeBase64)(base64Hash);
     const extra = {
         ...((0, utils_1.isValidExtra)(operation.extra) ? operation.extra : {}),
-        transactionId: response.transactionId.toString(),
+        transactionId: (0, utils_1.formatTransactionId)(response.transactionId),
     };
     let patchedOperation = operation;
     patchedOperation = (0, operation_1.patchOperationWithHash)(patchedOperation, base64HashUrlSafe);

package/lib/bridge/broadcast.js.map

@@ -1 +1 @@
-{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":";;;AACA,kEAA4E;AAC5E,kDAAiE;AACjE,0CAAqE;AAErE,mCAAkD;AAE3C,MAAM,SAAS,GAA4C,KAAK,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE;IAC9F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IACjD,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAc,EAAC,SAAS,CAAC,CAAC;IAEjD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,IAAA,6BAAqB,EAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAyB;QAClC,GAAG,CAAC,IAAA,oBAAY,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,aAAa,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE;KACjD,CAAC;IAEF,IAAI,gBAAgB,GAAc,SAAS,CAAC;IAC5C,gBAAgB,GAAG,IAAA,kCAAsB,EAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC/E,gBAAgB,GAAG,IAAA,+BAAuB,EAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAEpE,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAhBW,QAAA,SAAS,aAgBpB"}
+{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":";;;AACA,kEAA4E;AAC5E,kDAAiE;AACjE,0CAA0F;AAE1F,mCAAkD;AAE3C,MAAM,SAAS,GAA4C,KAAK,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE;IAC9F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IACjD,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAc,EAAC,SAAS,CAAC,CAAC;IAEjD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,IAAA,6BAAqB,EAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAyB;QAClC,GAAG,CAAC,IAAA,oBAAY,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,aAAa,EAAE,IAAA,2BAAmB,EAAC,QAAQ,CAAC,aAAa,CAAC;KAC3D,CAAC;IAEF,IAAI,gBAAgB,GAAc,SAAS,CAAC;IAC5C,gBAAgB,GAAG,IAAA,kCAAsB,EAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC/E,gBAAgB,GAAG,IAAA,+BAAuB,EAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAEpE,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAhBW,QAAA,SAAS,aAgBpB"}

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

@@ -1 +1 @@
-{"version":3,"file":"buildOptimisticOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAA+B,MAAM,sBAAsB,CAAC;AAM5F,OAAO,KAAK,EAAwB,WAAW,EAAE,MAAM,UAAU,CAAC;AA0HlE,eAAO,MAAM,wBAAwB;aAI1B,OAAO;iBACH,WAAW;MACtB,QAAQ,SAAS,CAWpB,CAAC"}
+{"version":3,"file":"buildOptimisticOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAA+B,MAAM,sBAAsB,CAAC;AAM5F,OAAO,KAAK,EAAwB,WAAW,EAAE,MAAM,UAAU,CAAC;AAkMlE,eAAO,MAAM,wBAAwB;aAI1B,OAAO;iBACH,WAAW;MACtB,QAAQ,SAAS,CAgBpB,CAAC"}

package/lib/bridge/buildOptimisticOperation.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildOptimisticOperation = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const invariant_1 = __importDefault(require("invariant"));
 const operation_1 = require("@ledgerhq/coin-framework/operation");
 const helpers_1 = require("@ledgerhq/coin-framework/account/helpers");
@@ -12,14 +13,17 @@ const estimateFees_1 = require("../logic/estimateFees");
 const utils_1 = require("../logic/utils");
 const buildOptimisticTokenAssociateOperation = async ({ account, transaction, }) => {
     (0, invariant_1.default)((0, utils_1.isTokenAssociateTransaction)(transaction), "invalid transaction properties");
-    const estimatedFee = await (0, estimateFees_1.estimateFees)(account.currency, constants_1.HEDERA_OPERATION_TYPES.TokenAssociate);
+    const estimatedFee = await (0, estimateFees_1.estimateFees)({
+        currency: account.currency,
+        operationType: constants_1.HEDERA_OPERATION_TYPES.TokenAssociate,
+    });
     const type = "ASSOCIATE_TOKEN";
     const operation = {
         id: (0, operation_1.encodeOperationId)(account.id, "", type),
         hash: "",
         type,
-        value: estimatedFee,
-        fee: estimatedFee,
+        value: estimatedFee.tinybars,
+        fee: estimatedFee.tinybars,
         blockHash: null,
         blockHeight: null,
         senders: [account.freshAddress.toString()],
@@ -35,17 +39,21 @@ const buildOptimisticTokenAssociateOperation = async ({ account, transaction, })
 const buildOptimisticCoinOperation = async ({ account, transaction, transactionType, }) => {
     const estimatedFee = transactionType === "FEES"
         ? transaction.amount
-        : await (0, estimateFees_1.estimateFees)(account.currency, constants_1.HEDERA_OPERATION_TYPES.CryptoTransfer);
+        : await (0, estimateFees_1.estimateFees)({
+            currency: account.currency,
+            operationType: constants_1.HEDERA_OPERATION_TYPES.CryptoTransfer,
+        });
     const value = transaction.amount;
     const type = transactionType ?? "OUT";
     const [_, recipientAddress] = (0, utils_1.safeParseAccountId)(transaction.recipient);
     const recipientWithoutChecksum = recipientAddress?.accountId ?? transaction.recipient;
+    const memo = transaction.memo;
     const operation = {
         id: (0, operation_1.encodeOperationId)(account.id, "", type),
         hash: "",
         type,
         value,
-        fee: estimatedFee,
+        fee: bignumber_js_1.default.isBigNumber(estimatedFee) ? estimatedFee : estimatedFee.tinybars,
         blockHash: null,
         blockHeight: null,
         senders: [account.freshAddress.toString()],
@@ -53,23 +61,26 @@ const buildOptimisticCoinOperation = async ({ account, transaction, transactionT
         accountId: account.id,
         date: new Date(),
         extra: {
-            ...(!!transaction.memo && { memo: transaction.memo }),
+            ...(memo && { memo }),
         },
     };
     return operation;
 };
-const buildOptimisticTokenOperation = async ({ account, tokenAccount, transaction, }) => {
-    const estimatedFee = await (0, estimateFees_1.estimateFees)(account.currency, constants_1.HEDERA_OPERATION_TYPES.TokenTransfer);
+const buildOptimisticHTSTokenOperation = async ({ account, tokenAccount, transaction, }) => {
+    const estimatedFee = await (0, estimateFees_1.estimateFees)({
+        currency: account.currency,
+        operationType: constants_1.HEDERA_OPERATION_TYPES.TokenTransfer,
+    });
     const value = transaction.amount;
     const type = "OUT";
     const [_, recipientAddress] = (0, utils_1.safeParseAccountId)(transaction.recipient);
     const recipientWithoutChecksum = recipientAddress?.accountId ?? transaction.recipient;
+    const memo = transaction.memo;
     const coinOperation = await buildOptimisticCoinOperation({
         account,
         transaction: {
             ...transaction,
-            recipient: tokenAccount.token.contractAddress,
-            amount: estimatedFee,
+            amount: estimatedFee.tinybars,
         },
         transactionType: "FEES",
     });
@@ -81,7 +92,7 @@ const buildOptimisticTokenOperation = async ({ account, tokenAccount, transactio
                 hash: "",
                 type,
                 value,
-                fee: estimatedFee,
+                fee: estimatedFee.tinybars,
                 blockHash: null,
                 blockHeight: null,
                 senders: [account.freshAddress.toString()],
@@ -89,7 +100,57 @@ const buildOptimisticTokenOperation = async ({ account, tokenAccount, transactio
                 accountId: tokenAccount.id,
                 date: new Date(),
                 extra: {
-                    ...(!!transaction.memo && { memo: transaction.memo }),
+                    ...(memo && { memo }),
+                },
+            },
+        ],
+    };
+    return operation;
+};
+const buildOptimisticERC20TokenOperation = async ({ account, tokenAccount, transaction, }) => {
+    const estimatedFees = await (0, estimateFees_1.estimateFees)({
+        operationType: constants_1.HEDERA_OPERATION_TYPES.ContractCall,
+        txIntent: {
+            intentType: "transaction",
+            type: constants_1.HEDERA_TRANSACTION_MODES.Send,
+            asset: {
+                type: "erc20",
+                assetReference: tokenAccount.token.contractAddress,
+                assetOwner: account.freshAddress,
+            },
+            amount: BigInt(transaction.amount.toString()),
+            sender: account.freshAddress,
+            recipient: transaction.recipient,
+        },
+    });
+    const value = transaction.amount;
+    const type = "OUT";
+    const memo = transaction.memo;
+    const coinOperation = await buildOptimisticCoinOperation({
+        account,
+        transaction: {
+            ...transaction,
+            amount: estimatedFees.tinybars,
+        },
+        transactionType: "FEES",
+    });
+    const operation = {
+        ...coinOperation,
+        subOperations: [
+            {
+                id: (0, operation_1.encodeOperationId)(tokenAccount.id, "", type),
+                hash: "",
+                type,
+                value,
+                fee: estimatedFees.tinybars,
+                blockHash: null,
+                blockHeight: null,
+                senders: [account.freshAddress.toString()],
+                recipients: [transaction.recipient],
+                accountId: tokenAccount.id,
+                date: new Date(),
+                extra: {
+                    ...(memo && { memo }),
                 },
             },
         ],
@@ -98,12 +159,16 @@ const buildOptimisticTokenOperation = async ({ account, tokenAccount, transactio
 };
 const buildOptimisticOperation = async ({ account, transaction, }) => {
     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)) {
         return buildOptimisticTokenAssociateOperation({ account, transaction });
     }
-    else if (isTokenTransaction) {
-        return buildOptimisticTokenOperation({ account, tokenAccount: subAccount, transaction });
+    else if (isHTSTokenTransaction) {
+        return buildOptimisticHTSTokenOperation({ account, tokenAccount: subAccount, transaction });
+    }
+    else if (isERC20TokenTransaction) {
+        return buildOptimisticERC20TokenOperation({ account, tokenAccount: subAccount, transaction });
     }
     else {
         return buildOptimisticCoinOperation({ account, transaction });

package/lib/bridge/buildOptimisticOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAkC;AAElC,kEAAuE;AACvE,sEAA8F;AAC9F,4CAAsD;AACtD,wDAAqD;AACrD,0CAAiF;AAGjF,MAAM,sCAAsC,GAAG,KAAK,EAAE,EACpD,OAAO,EACP,WAAW,GAIZ,EAAsB,EAAE;IACvB,IAAA,mBAAS,EAAC,IAAA,mCAA2B,EAAC,WAAW,CAAC,EAAE,gCAAgC,CAAC,CAAC;IAEtF,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,kCAAsB,CAAC,cAAc,CAAC,CAAC;IACjG,MAAM,IAAI,GAAkB,iBAAiB,CAAC;IAE9C,MAAM,SAAS,GAAc;QAC3B,EAAE,EAAE,IAAA,6BAAiB,EAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC;QAC3C,IAAI,EAAE,EAAE;QACR,IAAI;QACJ,KAAK,EAAE,YAAY;QACnB,GAAG,EAAE,YAAY;QACjB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC1C,UAAU,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC;QACnC,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,KAAK,EAAE;YACL,iBAAiB,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe;SACjC;KACjC,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAG,KAAK,EAAE,EAC1C,OAAO,EACP,WAAW,EACX,eAAe,GAKhB,EAAsB,EAAE;IACvB,MAAM,YAAY,GAChB,eAAe,KAAK,MAAM;QACxB,CAAC,CAAC,WAAW,CAAC,MAAM;QACpB,CAAC,CAAC,MAAM,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,kCAAsB,CAAC,cAAc,CAAC,CAAC;IAClF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;IACjC,MAAM,IAAI,GAAkB,eAAe,IAAI,KAAK,CAAC;IACrD,MAAM,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,IAAA,0BAAkB,EAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACxE,MAAM,wBAAwB,GAAG,gBAAgB,EAAE,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC;IAEtF,MAAM,SAAS,GAAc;QAC3B,EAAE,EAAE,IAAA,6BAAiB,EAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC;QAC3C,IAAI,EAAE,EAAE;QACR,IAAI;QACJ,KAAK;QACL,GAAG,EAAE,YAAY;QACjB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAC1C,UAAU,EAAE,CAAC,wBAAwB,CAAC;QACtC,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,KAAK,EAAE;YACL,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;SACtD;KACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,KAAK,EAAE,EAC3C,OAAO,EACP,YAAY,EACZ,WAAW,GAKZ,EAAsB,EAAE;IACvB,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,kCAAsB,CAAC,aAAa,CAAC,CAAC;IAChG,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;IACjC,MAAM,IAAI,GAAkB,KAAK,CAAC;IAClC,MAAM,CAAC,CAAC,EAAE,gBAAgB,CAAC,GAAG,IAAA,0BAAkB,EAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACxE,MAAM,wBAAwB,GAAG,gBAAgB,EAAE,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC;IAEtF,MAAM,aAAa,GAAG,MAAM,4BAA4B,CAAC;QACvD,OAAO;QACP,WAAW,EAAE;YACX,GAAG,WAAW;YACd,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,eAAe;YAC7C,MAAM,EAAE,YAAY;SACrB;QACD,eAAe,EAAE,MAAM;KACxB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAc;QAC3B,GAAG,aAAa;QAChB,aAAa,EAAE;YACb;gBACE,EAAE,EAAE,IAAA,6BAAiB,EAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC;gBAChD,IAAI,EAAE,EAAE;gBACR,IAAI;gBACJ,KAAK;gBACL,GAAG,EAAE,YAAY;gBACjB,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC1C,UAAU,EAAE,CAAC,wBAAwB,CAAC;gBACtC,SAAS,EAAE,YAAY,CAAC,EAAE;gBAC1B,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,KAAK,EAAE;oBACL,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;iBACtD;aACF;SACF;KACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEK,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC7C,OAAO,EACP,WAAW,GAIZ,EAAsB,EAAE;IACvB,MAAM,UAAU,GAAG,IAAA,4BAAkB,EAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAC/E,MAAM,kBAAkB,GAAG,IAAA,wBAAc,EAAC,UAAU,CAAC,CAAC;IAEtD,IAAI,IAAA,mCAA2B,EAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,OAAO,sCAAsC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1E,CAAC;SAAM,IAAI,kBAAkB,EAAE,CAAC;QAC9B,OAAO,6BAA6B,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAC3F,CAAC;SAAM,CAAC;QACN,OAAO,4BAA4B,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAjBW,QAAA,wBAAwB,4BAiBnC"}
+{"version":3,"file":"buildOptimisticOperation.js","sourceRoot":"","sources":["../../src/bridge/buildOptimisticOperation.ts"],"names":[],"mappings":"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"}

package/lib/bridge/estimateMaxSpendable.js

@@ -16,8 +16,11 @@ const estimateMaxSpendable = async ({ account, parentAccount, }) => {
     if (isTokenTransaction) {
         return Promise.resolve(balance);
     }
-    const estimatedFees = await (0, estimateFees_1.estimateFees)(mainAccount.currency, constants_1.HEDERA_OPERATION_TYPES.CryptoTransfer);
-    let maxSpendable = balance.minus(estimatedFees);
+    const estimatedFees = await (0, estimateFees_1.estimateFees)({
+        currency: mainAccount.currency,
+        operationType: constants_1.HEDERA_OPERATION_TYPES.CryptoTransfer,
+    });
+    let maxSpendable = balance.minus(estimatedFees.tinybars);
     // set max spendable to 0 if negative
     // for cases where the user's account balance is smaller than the estimated fee
     if (maxSpendable.isLessThan(0)) {

package/lib/bridge/estimateMaxSpendable.js.map

@@ -1 +1 @@
-{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,kEAAwE;AACxE,sEAA0E;AAC1E,4CAAsD;AACtD,wDAAqD;AAG9C,MAAM,oBAAoB,GAAuD,KAAK,EAAE,EAC7F,OAAO,EACP,aAAa,GACd,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,kBAAkB,GAAG,IAAA,wBAAc,EAAC,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAEhC,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,IAAA,2BAAY,EACtC,WAAW,CAAC,QAAQ,EACpB,kCAAsB,CAAC,cAAc,CACtC,CAAC;IACF,IAAI,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAEhD,qCAAqC;IACrC,+EAA+E;IAC/E,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,YAAY,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AACvC,CAAC,CAAC;AAzBW,QAAA,oBAAoB,wBAyB/B"}
+{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,kEAAwE;AACxE,sEAA0E;AAC1E,4CAAsD;AACtD,wDAAqD;AAG9C,MAAM,oBAAoB,GAAuD,KAAK,EAAE,EAC7F,OAAO,EACP,aAAa,GACd,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3D,MAAM,kBAAkB,GAAG,IAAA,wBAAc,EAAC,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAEhC,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,IAAA,2BAAY,EAAC;QACvC,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,aAAa,EAAE,kCAAsB,CAAC,cAAc;KACrD,CAAC,CAAC;IACH,IAAI,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAEzD,qCAAqC;IACrC,+EAA+E;IAC/E,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,YAAY,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AACvC,CAAC,CAAC;AAzBW,QAAA,oBAAoB,wBAyB/B"}

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

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAgB,MAAM,sBAAsB,CAAC;AAiBjF,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAA6B,MAAM,UAAU,CAAC;AAuJ1F,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAC9C,WAAW,EACX,OAAO,EACP,iBAAiB,CAClB,CAAC,sBAAsB,CAWvB,CAAC"}
+{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAgB,MAAM,sBAAsB,CAAC;AAkBjF,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAA6B,MAAM,UAAU,CAAC;AA0N1F,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAC9C,WAAW,EACX,OAAO,EACP,iBAAiB,CAClB,CAAC,sBAAsB,CAgBvB,CAAC"}

package/lib/bridge/getTransactionStatus.js

@@ -32,10 +32,13 @@ async function handleTokenAssociateTransaction(account, transaction) {
     const warnings = {};
     const [usdRate, estimatedFees] = await Promise.all([
         (0, utils_1.getCurrencyToUSDRate)(account.currency),
-        (0, estimateFees_1.estimateFees)(account.currency, constants_1.HEDERA_OPERATION_TYPES.TokenAssociate),
+        (0, estimateFees_1.estimateFees)({
+            currency: account.currency,
+            operationType: constants_1.HEDERA_OPERATION_TYPES.TokenAssociate,
+        }),
     ]);
     const amount = (0, bignumber_js_1.default)(0);
-    const totalSpent = amount.plus(estimatedFees);
+    const totalSpent = amount.plus(estimatedFees.tinybars);
     const isAssociationFlow = (0, utils_1.isTokenAssociationRequired)(account, transaction.properties.token);
     if (isAssociationFlow) {
         const hbarBalance = account.balance.dividedBy(10 ** account.currency.units[0].magnitude);
@@ -50,17 +53,20 @@ async function handleTokenAssociateTransaction(account, transaction) {
     return {
         amount,
         totalSpent,
-        estimatedFees,
+        estimatedFees: estimatedFees.tinybars,
         errors,
         warnings,
     };
 }
-async function handleTokenTransaction(account, subAccount, transaction) {
+async function handleHTSTokenTransaction(account, subAccount, transaction) {
     const errors = {};
     const warnings = {};
     const [calculatedAmount, estimatedFees] = await Promise.all([
         (0, utils_2.calculateAmount)({ transaction, account }),
-        (0, estimateFees_1.estimateFees)(account.currency, constants_1.HEDERA_OPERATION_TYPES.TokenTransfer),
+        (0, estimateFees_1.estimateFees)({
+            currency: account.currency,
+            operationType: constants_1.HEDERA_OPERATION_TYPES.TokenTransfer,
+        }),
     ]);
     const recipientError = validateRecipient(account, transaction.recipient);
     if (recipientError) {
@@ -68,7 +74,7 @@ async function handleTokenTransaction(account, subAccount, transaction) {
     }
     if (!errors.recipient) {
         try {
-            const hasRecipientTokenAssociated = await (0, utils_1.checkAccountTokenAssociationStatus)(transaction.recipient, subAccount.token.contractAddress);
+            const hasRecipientTokenAssociated = await (0, utils_1.checkAccountTokenAssociationStatus)(transaction.recipient, subAccount.token);
             if (!hasRecipientTokenAssociated) {
                 warnings.missingAssociation = new errors_2.HederaRecipientTokenAssociationRequired();
             }
@@ -83,13 +89,57 @@ async function handleTokenTransaction(account, subAccount, transaction) {
     if (subAccount.balance.isLessThan(calculatedAmount.totalSpent)) {
         errors.amount = new errors_1.NotEnoughBalance();
     }
-    if (account.balance.isLessThan(estimatedFees)) {
+    if (account.balance.isLessThan(estimatedFees.tinybars)) {
         errors.amount = new errors_1.NotEnoughBalance();
     }
     return {
         amount: calculatedAmount.amount,
         totalSpent: calculatedAmount.totalSpent,
-        estimatedFees,
+        estimatedFees: estimatedFees.tinybars,
+        errors,
+        warnings,
+    };
+}
+async function handleERC20TokenTransaction(account, subAccount, transaction) {
+    const errors = {};
+    const warnings = {
+        unverifiedEvmAddress: new errors_2.HederaRecipientEvmAddressVerificationRequired(),
+    };
+    const [calculatedAmount, estimatedFees] = await Promise.all([
+        (0, utils_2.calculateAmount)({ transaction, account }),
+        (0, estimateFees_1.estimateFees)({
+            operationType: constants_1.HEDERA_OPERATION_TYPES.ContractCall,
+            txIntent: {
+                intentType: "transaction",
+                type: constants_1.HEDERA_TRANSACTION_MODES.Send,
+                asset: {
+                    type: "erc20",
+                    assetReference: subAccount.token.contractAddress,
+                    assetOwner: account.freshAddress,
+                },
+                amount: BigInt(transaction.amount.toString()),
+                sender: account.freshAddress,
+                recipient: transaction.recipient,
+            },
+        }),
+    ]);
+    const recipientError = validateRecipient(account, transaction.recipient);
+    if (recipientError) {
+        errors.recipient = recipientError;
+    }
+    if (transaction.amount.eq(0)) {
+        errors.amount = new errors_1.AmountRequired();
+    }
+    if (subAccount.balance.isLessThan(calculatedAmount.totalSpent)) {
+        errors.amount = new errors_1.NotEnoughBalance();
+    }
+    if (account.balance.isLessThan(estimatedFees.tinybars)) {
+        errors.amount = new errors_1.NotEnoughBalance();
+    }
+    return {
+        amount: calculatedAmount.amount,
+        totalSpent: calculatedAmount.totalSpent,
+        estimatedFees: estimatedFees.tinybars,
         errors,
         warnings,
     };
@@ -99,7 +149,10 @@ async function handleCoinTransaction(account, transaction) {
     const warnings = {};
     const [calculatedAmount, estimatedFees] = await Promise.all([
         (0, utils_2.calculateAmount)({ transaction, account }),
-        (0, estimateFees_1.estimateFees)(account.currency, constants_1.HEDERA_OPERATION_TYPES.CryptoTransfer),
+        (0, estimateFees_1.estimateFees)({
+            currency: account.currency,
+            operationType: constants_1.HEDERA_OPERATION_TYPES.CryptoTransfer,
+        }),
     ]);
     const recipientError = validateRecipient(account, transaction.recipient);
     if (recipientError) {
@@ -114,19 +167,23 @@ async function handleCoinTransaction(account, transaction) {
     return {
         amount: calculatedAmount.amount,
         totalSpent: calculatedAmount.totalSpent,
-        estimatedFees,
+        estimatedFees: estimatedFees.tinybars,
         errors,
         warnings,
     };
 }
 const getTransactionStatus = async (account, transaction) => {
     const subAccount = (0, account_1.findSubAccountById)(account, transaction?.subAccountId || "");
-    const isTokenTransaction = (0, account_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)) {
         return handleTokenAssociateTransaction(account, transaction);
     }
-    else if (isTokenTransaction) {
-        return handleTokenTransaction(account, subAccount, transaction);
+    else if (isHTSTokenTransaction) {
+        return handleHTSTokenTransaction(account, subAccount, transaction);
+    }
+    else if (isERC20TokenTransaction) {
+        return handleERC20TokenTransaction(account, subAccount, transaction);
     }
     else {
         return handleCoinTransaction(account, transaction);

package/lib/bridge/getTransactionStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,6CAK0B;AAE1B,8DAAsF;AACtF,iDAA4C;AAC5C,4CAAsD;AACtD,sCAImB;AACnB,wDAAqD;AACrD,0CAMwB;AAExB,mCAA0C;AAK1C,SAAS,iBAAiB,CAAC,OAAgB,EAAE,SAAiB;IAC5D,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,0BAAiB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,IAAA,0BAAkB,EAAC,SAAS,CAAC,CAAC;IAEpE,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,wBAAwB,GAAG,aAAa,CAAC,SAAS,CAAC;IAEzD,IAAI,OAAO,CAAC,YAAY,KAAK,wBAAwB,EAAE,CAAC;QACtD,OAAO,IAAI,qDAA4C,EAAE,CAAC;IAC5D,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,+BAA+B,CAC5C,OAAgB,EAChB,WAAsC;IAEtC,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,4BAAoB,EAAC,OAAO,CAAC,QAAQ,CAAC;QACtC,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,kCAAsB,CAAC,cAAc,CAAC;KACtE,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9C,MAAM,iBAAiB,GAAG,IAAA,kCAA0B,EAAC,OAAO,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAE5F,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACzF,MAAM,iBAAiB,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;QACzF,MAAM,kBAAkB,GAAG,IAAA,iBAAM,EAAC,kCAAkC,CAAC,CAAC;QAEtE,IAAI,iBAAiB,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,4BAA4B,GAAG,IAAI,8CAAqC,CAAC,EAAE,EAAE;gBAClF,kBAAkB;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM;QACN,UAAU;QACV,aAAa;QACb,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAgB,EAChB,UAAwB,EACxB,WAAwB;IAExB,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1D,IAAA,uBAAe,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QACzC,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,kCAAsB,CAAC,aAAa,CAAC;KACrE,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,SAAS,GAAG,cAAc,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,2BAA2B,GAAG,MAAM,IAAA,0CAAkC,EAC1E,WAAW,CAAC,SAAS,EACrB,UAAU,CAAC,KAAK,CAAC,eAAe,CACjC,CAAC;YAEF,IAAI,CAAC,2BAA2B,EAAE,CAAC;gBACjC,QAAQ,CAAC,kBAAkB,GAAG,IAAI,gDAAuC,EAAE,CAAC;YAC9E,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,QAAQ,CAAC,qBAAqB,GAAG,IAAI,kDAAyC,EAAE,CAAC;QACnF,CAAC;IACH,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,GAAG,IAAI,uBAAc,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,MAAM,GAAG,IAAI,yBAAgB,EAAE,CAAC;IACzC,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,MAAM,GAAG,IAAI,yBAAgB,EAAE,CAAC;IACzC,CAAC;IAED,OAAO;QACL,MAAM,EAAE,gBAAgB,CAAC,MAAM;QAC/B,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,aAAa;QACb,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,OAAgB,EAChB,WAAwB;IAExB,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1D,IAAA,uBAAe,EAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QACzC,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,kCAAsB,CAAC,cAAc,CAAC;KACtE,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,SAAS,GAAG,cAAc,CAAC;IACpC,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QAC1D,MAAM,CAAC,MAAM,GAAG,IAAI,uBAAc,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5D,MAAM,CAAC,MAAM,GAAG,IAAI,yBAAgB,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO;QACL,MAAM,EAAE,gBAAgB,CAAC,MAAM;QAC/B,UAAU,EAAE,gBAAgB,CAAC,UAAU;QACvC,aAAa;QACb,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC;AAEM,MAAM,oBAAoB,GAIL,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAA,4BAAkB,EAAC,OAAO,EAAE,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC;IAChF,MAAM,kBAAkB,GAAG,IAAA,wBAAc,EAAC,UAAU,CAAC,CAAC;IAEtD,IAAI,IAAA,mCAA2B,EAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,OAAO,+BAA+B,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,CAAC;SAAM,IAAI,kBAAkB,EAAE,CAAC;QAC9B,OAAO,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IAClE,CAAC;SAAM,CAAC;QACN,OAAO,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,oBAAoB,wBAe/B"}
+{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"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"}

package/lib/bridge/index.js

@@ -29,7 +29,7 @@ function buildCurrencyBridge(signerContext) {
         scanAccounts,
     };
 }
-const sync = (0, jsHelpers_1.makeSync)({ getAccountShape: synchronisation_1.getAccountShape });
+const sync = (0, jsHelpers_1.makeSync)({ getAccountShape: synchronisation_1.getAccountShape, postSync: synchronisation_1.postSync, shouldMergeOps: false });
 function buildAccountBridge(signerContext) {
     const getAddress = (0, index_1.default)(signerContext);
     const signOperation = (0, signOperation_1.buildSignOperation)(signerContext);

package/lib/bridge/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":";;;;;;AAAA,yEAKmD;AACnD,0GAAkF;AAGlF,2CAAwC;AACxC,2DAAwD;AACxD,iEAA8D;AAC9D,iEAA8D;AAC9D,6DAA0D;AAC1D,uCAAoC;AACpC,mDAAqD;AACrD,uDAAwE;AACxE,mDAA2E;AAC3E,4DAAuC;AAGvC,SAAS,mBAAmB,CAAC,aAA0C;IACrE,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC;QACpC,eAAe,EAAf,iCAAe;QACf,kBAAkB,EAAlB,oCAAkB;QAClB,YAAY,EAAE,IAAA,2BAAiB,EAAC,UAAU,CAAC;KAC5C,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;QACjB,YAAY;KACb,CAAC;AACJ,CAAC;AAED,MAAM,IAAI,GAAG,IAAA,oBAAQ,EAAC,EAAE,eAAe,EAAf,iCAAe,EAAE,CAAC,CAAC;AAE3C,SAAS,kBAAkB,CACzB,aAA0C;IAE1C,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,aAAa,GAAG,IAAA,kCAAkB,EAAC,aAAa,CAAC,CAAC;IAExD,OAAO;QACL,oBAAoB,EAApB,2CAAoB;QACpB,iBAAiB,EAAjB,qCAAiB;QACjB,iBAAiB,EAAjB,6BAAiB;QACjB,oBAAoB,EAApB,2CAAoB;QACpB,kBAAkB,EAAlB,uCAAkB;QAClB,kBAAkB,EAAlB,kCAAkB;QAClB,oBAAoB,EAApB,oCAAoB;QACpB,IAAI;QACJ,OAAO,EAAE,IAAA,iBAAO,EAAC,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;QAC/C,aAAa;QACb,gBAAgB,EAAE,GAAG,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,SAAS,EAAT,qBAAS;QACT,8BAA8B,EAA9B,0CAA8B;KAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAAC,aAA0C;IACtE,OAAO;QACL,cAAc,EAAE,mBAAmB,CAAC,aAAa,CAAC;QAClD,aAAa,EAAE,kBAAkB,CAAC,aAAa,CAAC;KACjD,CAAC;AACJ,CAAC;AALD,sCAKC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":";;;;;;AAAA,yEAKmD;AACnD,0GAAkF;AAGlF,2CAAwC;AACxC,2DAAwD;AACxD,iEAA8D;AAC9D,iEAA8D;AAC9D,6DAA0D;AAC1D,uCAAoC;AACpC,mDAAqD;AACrD,uDAAkF;AAClF,mDAA2E;AAC3E,4DAAuC;AAGvC,SAAS,mBAAmB,CAAC,aAA0C;IACrE,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC;QACpC,eAAe,EAAf,iCAAe;QACf,kBAAkB,EAAlB,oCAAkB;QAClB,YAAY,EAAE,IAAA,2BAAiB,EAAC,UAAU,CAAC;KAC5C,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;QACjB,YAAY;KACb,CAAC;AACJ,CAAC;AAED,MAAM,IAAI,GAAG,IAAA,oBAAQ,EAAC,EAAE,eAAe,EAAf,iCAAe,EAAE,QAAQ,EAAR,0BAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;AAE5E,SAAS,kBAAkB,CACzB,aAA0C;IAE1C,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,aAAa,GAAG,IAAA,kCAAkB,EAAC,aAAa,CAAC,CAAC;IAExD,OAAO;QACL,oBAAoB,EAApB,2CAAoB;QACpB,iBAAiB,EAAjB,qCAAiB;QACjB,iBAAiB,EAAjB,6BAAiB;QACjB,oBAAoB,EAApB,2CAAoB;QACpB,kBAAkB,EAAlB,uCAAkB;QAClB,kBAAkB,EAAlB,kCAAkB;QAClB,oBAAoB,EAApB,oCAAoB;QACpB,IAAI;QACJ,OAAO,EAAE,IAAA,iBAAO,EAAC,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;QAC/C,aAAa;QACb,gBAAgB,EAAE,GAAG,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,SAAS,EAAT,qBAAS;QACT,8BAA8B,EAA9B,0CAA8B;KAC/B,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAAC,aAA0C;IACtE,OAAO;QACL,cAAc,EAAE,mBAAmB,CAAC,aAAa,CAAC;QAClD,aAAa,EAAE,kBAAkB,CAAC,aAAa,CAAC;KACjD,CAAC;AACJ,CAAC;AALD,sCAKC"}

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

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,oBAAoB,CA+B/E,CAAC"}
+{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI1D,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AAGhE;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAkE/E,CAAC"}

package/lib/bridge/prepareTransaction.js

@@ -15,29 +15,62 @@ const utils_2 = require("./utils");
  *
  */
 const prepareTransaction = async (account, transaction) => {
-    const subAccount = (0, helpers_1.findSubAccountById)(account, transaction?.subAccountId || "");
-    const isTokenTransaction = (0, helpers_1.isTokenAccount)(subAccount);
+    let estimateFeesParams;
     let operationType;
+    const subAccount = (0, helpers_1.findSubAccountById)(account, transaction?.subAccountId || "");
+    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)) {
         operationType = constants_1.HEDERA_OPERATION_TYPES.TokenAssociate;
     }
-    else if (isTokenTransaction) {
+    else if (isHTSTokenTransaction) {
         operationType = constants_1.HEDERA_OPERATION_TYPES.TokenTransfer;
     }
+    else if (isERC20TokenTransaction) {
+        operationType = constants_1.HEDERA_OPERATION_TYPES.ContractCall;
+    }
     else {
         operationType = constants_1.HEDERA_OPERATION_TYPES.CryptoTransfer;
     }
+    // build different estimation params for ERC20 ContractCall transactions
+    if (operationType === constants_1.HEDERA_OPERATION_TYPES.ContractCall) {
+        estimateFeesParams = {
+            operationType,
+            txIntent: {
+                intentType: "transaction",
+                type: constants_1.HEDERA_TRANSACTION_MODES.Send,
+                asset: {
+                    type: "erc20",
+                    assetReference: subAccount?.token.contractAddress ?? "",
+                    assetOwner: account.freshAddress,
+                },
+                amount: BigInt(transaction.amount.toString()),
+                sender: account.freshAddress,
+                recipient: transaction.recipient,
+            },
+        };
+    }
+    else {
+        estimateFeesParams = {
+            currency: account.currency,
+            operationType,
+        };
+    }
     // explicitly calculate transaction amount to account for `useAllAmount` flag (send max flow)
     // i.e. if `useAllAmount` has been toggled to true, this is where it will update the transaction to reflect that action
-    const [{ amount }, estimatedFees] = await Promise.all([
+    const [calculatedAmount, estimatedFees] = await Promise.all([
         (0, utils_2.calculateAmount)({ account, transaction }),
-        (0, estimateFees_1.estimateFees)(account.currency, operationType),
+        (0, estimateFees_1.estimateFees)(estimateFeesParams),
     ]);
+    transaction.amount = calculatedAmount.amount;
     // `maxFee` must be explicitly set to avoid the @hashgraph/sdk default fallback
     // this ensures device app validation passes (e.g. during swap flow)
     // it's applied via `tx.setMaxTransactionFee` when building the transaction
-    transaction.maxFee = estimatedFees;
-    transaction.amount = amount;
+    transaction.maxFee = estimatedFees.tinybars;
+    // ERC20 transactions should have gas limit set (tinybars fee is calculated based on gas)
+    if (isERC20TokenTransaction && estimatedFees.gas) {
+        transaction.gasLimit = estimatedFees.gas;
+    }
     return transaction;
 };
 exports.prepareTransaction = prepareTransaction;

package/lib/bridge/prepareTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;AAAA,sEAA8F;AAE9F,4CAAsD;AACtD,wDAAqD;AACrD,0CAA6D;AAE7D,mCAA0C;AAE1C;;;;;;;GAOG;AACI,MAAM,kBAAkB,GAAqD,KAAK,EACvF,OAAO,EACP,WAAW,EACW,EAAE;IACxB,MAAM,UAAU,GAAG,IAAA,4BAAkB,EAAC,OAAO,EAAE,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC;IAChF,MAAM,kBAAkB,GAAG,IAAA,wBAAc,EAAC,UAAU,CAAC,CAAC;IACtD,IAAI,aAAqC,CAAC;IAE1C,IAAI,IAAA,mCAA2B,EAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,aAAa,GAAG,kCAAsB,CAAC,cAAc,CAAC;IACxD,CAAC;SAAM,IAAI,kBAAkB,EAAE,CAAC;QAC9B,aAAa,GAAG,kCAAsB,CAAC,aAAa,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,aAAa,GAAG,kCAAsB,CAAC,cAAc,CAAC;IACxD,CAAC;IAED,6FAA6F;IAC7F,uHAAuH;IACvH,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;QACzC,IAAA,2BAAY,EAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC;KAC9C,CAAC,CAAC;IAEH,+EAA+E;IAC/E,oEAAoE;IACpE,2EAA2E;IAC3E,WAAW,CAAC,MAAM,GAAG,aAAa,CAAC;IAEnC,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;IAE5B,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AA/BW,QAAA,kBAAkB,sBA+B7B"}
+{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;AAAA,sEAA8E;AAE9E,4CAAgF;AAChF,wDAAqD;AACrD,0CAA6D;AAE7D,mCAA0C;AAE1C;;;;;;;GAOG;AACI,MAAM,kBAAkB,GAAqD,KAAK,EACvF,OAAO,EACP,WAAW,EACW,EAAE;IACxB,IAAI,kBAAsC,CAAC;IAC3C,IAAI,aAAqC,CAAC;IAC1C,MAAM,UAAU,GAAG,IAAA,4BAAkB,EAAC,OAAO,EAAE,WAAW,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC;IAChF,MAAM,qBAAqB,GACzB,WAAW,CAAC,IAAI,KAAK,oCAAwB,CAAC,IAAI,IAAI,UAAU,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC;IAC9F,MAAM,uBAAuB,GAC3B,WAAW,CAAC,IAAI,KAAK,oCAAwB,CAAC,IAAI,IAAI,UAAU,EAAE,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC;IAEhG,IAAI,IAAA,mCAA2B,EAAC,WAAW,CAAC,EAAE,CAAC;QAC7C,aAAa,GAAG,kCAAsB,CAAC,cAAc,CAAC;IACxD,CAAC;SAAM,IAAI,qBAAqB,EAAE,CAAC;QACjC,aAAa,GAAG,kCAAsB,CAAC,aAAa,CAAC;IACvD,CAAC;SAAM,IAAI,uBAAuB,EAAE,CAAC;QACnC,aAAa,GAAG,kCAAsB,CAAC,YAAY,CAAC;IACtD,CAAC;SAAM,CAAC;QACN,aAAa,GAAG,kCAAsB,CAAC,cAAc,CAAC;IACxD,CAAC;IAED,wEAAwE;IACxE,IAAI,aAAa,KAAK,kCAAsB,CAAC,YAAY,EAAE,CAAC;QAC1D,kBAAkB,GAAG;YACnB,aAAa;YACb,QAAQ,EAAE;gBACR,UAAU,EAAE,aAAa;gBACzB,IAAI,EAAE,oCAAwB,CAAC,IAAI;gBACnC,KAAK,EAAE;oBACL,IAAI,EAAE,OAAO;oBACb,cAAc,EAAE,UAAU,EAAE,KAAK,CAAC,eAAe,IAAI,EAAE;oBACvD,UAAU,EAAE,OAAO,CAAC,YAAY;iBACjC;gBACD,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC7C,MAAM,EAAE,OAAO,CAAC,YAAY;gBAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;aACjC;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,kBAAkB,GAAG;YACnB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,aAAa;SACd,CAAC;IACJ,CAAC;IAED,6FAA6F;IAC7F,uHAAuH;IACvH,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1D,IAAA,uBAAe,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;QACzC,IAAA,2BAAY,EAAC,kBAAkB,CAAC;KACjC,CAAC,CAAC;IAEH,WAAW,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAE7C,+EAA+E;IAC/E,oEAAoE;IACpE,2EAA2E;IAC3E,WAAW,CAAC,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC;IAE5C,yFAAyF;IACzF,IAAI,uBAAuB,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC;QACjD,WAAW,CAAC,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC;IAC3C,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAlEW,QAAA,kBAAkB,sBAkE7B"}