@ledgerhq/coin-aptos 2.0.0-nightly.5 → 2.1.0-next.0

package/lib/bridge/getFeesForTransaction.js

@@ -8,19 +8,20 @@ const ts_sdk_1 = require("@aptos-labs/ts-sdk");
 const logs_1 = require("@ledgerhq/logs");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const cache_1 = require("@ledgerhq/live-network/cache");
-const buildTransaction_1 = __importDefault(require("./buildTransaction"));
 const logic_1 = require("./logic");
+const constants_1 = require("../constants");
+const buildTransaction_1 = __importDefault(require("../logic/buildTransaction"));
 const getFee = async (account, transaction, aptosClient) => {
     const res = {
-        fees: new bignumber_js_1.default(logic_1.DEFAULT_GAS).multipliedBy(logic_1.DEFAULT_GAS_PRICE),
+        fees: new bignumber_js_1.default(constants_1.DEFAULT_GAS).multipliedBy(constants_1.DEFAULT_GAS_PRICE),
         estimate: {
-            maxGasAmount: logic_1.DEFAULT_GAS.toString(),
-            gasUnitPrice: logic_1.DEFAULT_GAS_PRICE.toString(),
+            maxGasAmount: constants_1.DEFAULT_GAS.toString(),
+            gasUnitPrice: constants_1.DEFAULT_GAS_PRICE.toString(),
         },
         errors: { ...transaction.errors },
     };
-    let gasLimit = logic_1.DEFAULT_GAS;
-    let gasPrice = logic_1.DEFAULT_GAS_PRICE;
+    let gasLimit = constants_1.DEFAULT_GAS;
+    let gasPrice = constants_1.DEFAULT_GAS_PRICE;
     transaction.options = {
         maxGasAmount: gasLimit.toString(),
         gasUnitPrice: gasPrice.toString(),
@@ -31,15 +32,17 @@ const getFee = async (account, transaction, aptosClient) => {
             const tx = await (0, buildTransaction_1.default)(account, transaction, aptosClient);
             const simulation = await aptosClient.simulateTransaction(publicKeyEd, tx);
             const completedTx = simulation[0];
-            gasLimit = new bignumber_js_1.default(completedTx.gas_used).multipliedBy(logic_1.ESTIMATE_GAS_MUL);
+            gasLimit = new bignumber_js_1.default(completedTx.gas_used).multipliedBy(constants_1.ESTIMATE_GAS_MUL);
             gasPrice = new bignumber_js_1.default(completedTx.gas_unit_price);
             const expectedGas = gasPrice.multipliedBy(gasLimit);
-            const isUnderMaxSpendable = transaction.amount
-                .plus(expectedGas)
-                .isLessThan(account.spendableBalance);
-            if (isUnderMaxSpendable && !completedTx.success) {
-                // we want to skip INSUFFICIENT_BALANCE error because it will be processed by getTransactionStatus
-                if (!completedTx.vm_status.includes("INSUFFICIENT_BALANCE")) {
+            if (!completedTx.success) {
+                if (completedTx.vm_status.includes("MAX_GAS_UNITS_BELOW_MIN_TRANSACTION_GAS_UNITS")) {
+                    res.errors.maxGasAmount = "GasInsufficientBalance";
+                }
+                else if (!completedTx.vm_status.includes("INSUFFICIENT_BALANCE") &&
+                    !completedTx.vm_status.includes("0x203ed") // 0x203ed -> PROLOGUE_ECANT_PAY_GAS_DEPOSIT equivalent to INSUFFICIENT_BALANCE_FOR_TRANSACTION_FEE
+                ) {
+                    // INSUFFICIENT_BALANCE will be processed by getTransactionStatus
                     throw Error(`Simulation failed with following error: ${completedTx.vm_status}`);
                 }
             }
@@ -55,7 +58,10 @@ const getFee = async (account, transaction, aptosClient) => {
     return res;
 };
 exports.getFee = getFee;
-const CACHE = (0, cache_1.makeLRUCache)(exports.getFee, (account, transaction) => `${account.id}-${transaction.amount.toString()}}`, (0, cache_1.seconds)(30));
+const CACHE = (0, cache_1.makeLRUCache)(exports.getFee, (account, transaction) => {
+    const tokenAccount = (0, logic_1.getTokenAccount)(account, transaction);
+    return `${tokenAccount ? tokenAccount.id : account.id}-${transaction.amount.toString()}}`;
+}, (0, cache_1.seconds)(30));
 const getEstimatedGas = async (account, transaction, aptosClient) => {
     return await CACHE(account, transaction, aptosClient);
 };

package/lib/bridge/getFeesForTransaction.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAI/D,QAAA,MAAM,oBAAoB,MAAa,OAAO,KAAK,WAAW,KAAG,QAAQ,iBAAiB,CAqCzF,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"getTransactionStatus.d.ts","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAK/D,QAAA,MAAM,oBAAoB,MAAa,OAAO,KAAK,WAAW,KAAG,QAAQ,iBAAiB,CAyDzF,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/lib/bridge/getTransactionStatus.js

@@ -1,31 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const bignumber_js_1 = require("bignumber.js");
 const errors_1 = require("@ledgerhq/errors");
+const bignumber_js_1 = require("bignumber.js");
 const ts_sdk_1 = require("@aptos-labs/ts-sdk");
+const logic_1 = require("./logic");
 const getTransactionStatus = async (a, t) => {
     const errors = {};
     const warnings = {};
+    if (!t.recipient) {
+        errors.recipient = new errors_1.RecipientRequired();
+    }
+    if (!ts_sdk_1.AccountAddress.isValid({ input: t.recipient }).valid && !errors.recipient) {
+        errors.recipient = new errors_1.InvalidAddress("", { currencyName: a.currency.name });
+    }
+    if (t.recipient === a.freshAddress && !errors.recipient) {
+        errors.recipient = new errors_1.InvalidAddressBecauseDestinationIsAlsoSource();
+    }
     if (!t.fees) {
         errors.fees = new errors_1.FeeNotLoaded();
     }
     const estimatedFees = t.fees || (0, bignumber_js_1.BigNumber)(0);
-    if (t.amount.eq(0)) {
+    if (t.amount.lte(0)) {
         errors.amount = new errors_1.AmountRequired();
     }
-    const amount = t.amount;
-    const totalSpent = (0, bignumber_js_1.BigNumber)(t.amount).plus(estimatedFees);
-    if (totalSpent.gt(a.balance) && !errors.amount) {
-        errors.amount = new errors_1.NotEnoughBalance();
-    }
-    if (!t.recipient) {
-        errors.recipient = new errors_1.RecipientRequired();
+    const tokenAccount = (0, logic_1.getTokenAccount)(a, t);
+    const amount = t.useAllAmount
+        ? tokenAccount
+            ? tokenAccount.spendableBalance
+            : a.spendableBalance.minus(estimatedFees).isLessThan(0)
+                ? (0, bignumber_js_1.BigNumber)(0)
+                : a.spendableBalance.minus(estimatedFees)
+        : t.amount;
+    const totalSpent = tokenAccount ? amount : amount.plus(estimatedFees);
+    if (tokenAccount && t.errors?.maxGasAmount == "GasInsufficientBalance" && !errors.amount) {
+        errors.amount = new errors_1.NotEnoughBalanceFees();
     }
-    else if (ts_sdk_1.AccountAddress.isValid({ input: t.recipient }).valid === false && !errors.recipient) {
-        errors.recipient = new errors_1.InvalidAddress("", { currencyName: a.currency.name });
-    }
-    else if (t.recipient === a.freshAddress && !errors.recipient) {
-        errors.recipient = new errors_1.InvalidAddressBecauseDestinationIsAlsoSource();
+    if (tokenAccount
+        ? tokenAccount.spendableBalance.isLessThan(totalSpent) ||
+            a.spendableBalance.isLessThan(estimatedFees)
+        : a.spendableBalance.isLessThan(totalSpent) && !errors.amount) {
+        errors.amount = new errors_1.NotEnoughBalance();
     }
     return Promise.resolve({
         errors,

package/lib/bridge/getTransactionStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":";;AAAA,+CAAyC;AACzC,6CAO0B;AAI1B,+CAAoD;AAEpD,MAAM,oBAAoB,GAAG,KAAK,EAAE,CAAU,EAAE,CAAc,EAA8B,EAAE;IAC5F,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACZ,MAAM,CAAC,IAAI,GAAG,IAAI,qBAAY,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,IAAI,IAAA,wBAAS,EAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnB,MAAM,CAAC,MAAM,GAAG,IAAI,uBAAc,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAExB,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3D,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,CAAC,MAAM,GAAG,IAAI,yBAAgB,EAAE,CAAC;IACzC,CAAC;IAED,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,GAAG,IAAI,0BAAiB,EAAE,CAAC;IAC7C,CAAC;SAAM,IAAI,uBAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAC/F,MAAM,CAAC,SAAS,GAAG,IAAI,uBAAc,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;SAAM,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAC/D,MAAM,CAAC,SAAS,GAAG,IAAI,qDAA4C,EAAE,CAAC;IACxE,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM;QACN,QAAQ;QACR,aAAa;QACb,MAAM;QACN,UAAU;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}
+{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":";;AAAA,6CAQ0B;AAE1B,+CAAyC;AAGzC,+CAAoD;AACpD,mCAA0C;AAE1C,MAAM,oBAAoB,GAAG,KAAK,EAAE,CAAU,EAAE,CAAc,EAA8B,EAAE;IAC5F,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,EAAE,CAAC;IAEpB,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,GAAG,IAAI,0BAAiB,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,uBAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAC/E,MAAM,CAAC,SAAS,GAAG,IAAI,uBAAc,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACxD,MAAM,CAAC,SAAS,GAAG,IAAI,qDAA4C,EAAE,CAAC;IACxE,CAAC;IAED,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACZ,MAAM,CAAC,IAAI,GAAG,IAAI,qBAAY,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,IAAI,IAAA,wBAAS,EAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,GAAG,IAAI,uBAAc,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,uBAAe,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,CAAC,CAAC,YAAY;QAC3B,CAAC,CAAC,YAAY;YACZ,CAAC,CAAC,YAAY,CAAC,gBAAgB;YAC/B,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrD,CAAC,CAAC,IAAA,wBAAS,EAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,aAAa,CAAC;QAC7C,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAEb,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAEtE,IAAI,YAAY,IAAI,CAAC,CAAC,MAAM,EAAE,YAAY,IAAI,wBAAwB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzF,MAAM,CAAC,MAAM,GAAG,IAAI,6BAAoB,EAAE,CAAC;IAC7C,CAAC;IACD,IACE,YAAY;QACV,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC;YACpD,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,aAAa,CAAC;QAC9C,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAC/D,CAAC;QACD,MAAM,CAAC,MAAM,GAAG,IAAI,yBAAgB,EAAE,CAAC;IACzC,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC;QACrB,MAAM;QACN,QAAQ;QACR,aAAa;QACb,MAAM;QACN,UAAU;KACX,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}

package/lib/bridge/index.d.ts

@@ -1,4 +1,4 @@
-import { SignerContext } from "@ledgerhq/coin-framework/signer";
+import type { SignerContext } from "@ledgerhq/coin-framework/signer";
 import type { Account, AccountBridge, CurrencyBridge } from "@ledgerhq/types-live";
 import type { Transaction, AptosSigner } from "../types";
 export declare function createBridges(signerContext: SignerContext<AptosSigner>): {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEnF,OAAO,KAAK,EAAE,WAAW,EAAqB,WAAW,EAAE,MAAM,UAAU,CAAC;AAgD5E,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC;;;EAKtE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEnF,OAAO,KAAK,EAAE,WAAW,EAAqB,WAAW,EAAE,MAAM,UAAU,CAAC;AAgD5E,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC;;;EAKtE"}

package/lib/bridge/index.js

@@ -10,10 +10,10 @@ const signer_1 = __importDefault(require("../signer"));
 const getTransactionStatus_1 = __importDefault(require("./getTransactionStatus"));
 const estimateMaxSpendable_1 = __importDefault(require("./estimateMaxSpendable"));
 const prepareTransaction_1 = __importDefault(require("./prepareTransaction"));
-const createTransaction_1 = __importDefault(require("./createTransaction"));
 const synchronisation_1 = require("./synchronisation");
 const signOperation_1 = __importDefault(require("./signOperation"));
 const broadcast_1 = __importDefault(require("./broadcast"));
+const createTransaction_1 = __importDefault(require("../logic/createTransaction"));
 function buildCurrencyBridge(signerContext) {
     const getAddress = (0, signer_1.default)(signerContext);
     const scanAccounts = (0, jsHelpers_1.makeScanAccounts)({

package/lib/bridge/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":";;;;;;AAAA,yEAMmD;AACnD,0GAAkF;AAGlF,uDAAiC;AAEjC,kFAA0D;AAC1D,kFAA0D;AAC1D,8EAAsD;AACtD,4EAAoD;AACpD,uDAAoD;AACpD,oEAAiD;AACjD,4DAAoC;AAEpC,SAAS,mBAAmB,CAAC,aAAyC;IACpE,MAAM,UAAU,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC;QACpC,eAAe,EAAf,iCAAe;QACf,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,aAAyC;IAEzC,MAAM,UAAU,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAG,IAAA,oCAAwB,EAAC,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,IAAA,uBAAkB,EAAC,aAAa,CAAC,CAAC;IAExD,OAAO;QACL,oBAAoB,EAApB,8BAAoB;QACpB,iBAAiB,EAAjB,2BAAiB;QACjB,iBAAiB,EAAjB,6BAAiB;QACjB,oBAAoB,EAApB,8BAAoB;QACpB,8BAA8B,EAA9B,0CAA8B;QAC9B,kBAAkB,EAAlB,4BAAkB;QAClB,IAAI;QACJ,OAAO;QACP,aAAa;QACb,SAAS,EAAT,mBAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAAC,aAAyC;IACrE,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,yEAMmD;AACnD,0GAAkF;AAGlF,uDAAiC;AAEjC,kFAA0D;AAC1D,kFAA0D;AAC1D,8EAAsD;AACtD,uDAAoD;AACpD,oEAAiD;AACjD,4DAAoC;AACpC,mFAA2D;AAE3D,SAAS,mBAAmB,CAAC,aAAyC;IACpE,MAAM,UAAU,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,IAAA,4BAAgB,EAAC;QACpC,eAAe,EAAf,iCAAe;QACf,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,aAAyC;IAEzC,MAAM,UAAU,GAAG,IAAA,gBAAQ,EAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAG,IAAA,oCAAwB,EAAC,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,IAAA,uBAAkB,EAAC,aAAa,CAAC,CAAC;IAExD,OAAO;QACL,oBAAoB,EAApB,8BAAoB;QACpB,iBAAiB,EAAjB,2BAAiB;QACjB,iBAAiB,EAAjB,6BAAiB;QACjB,oBAAoB,EAApB,8BAAoB;QACpB,8BAA8B,EAA9B,0CAA8B;QAC9B,kBAAkB,EAAlB,4BAAkB;QAClB,IAAI;QACJ,OAAO;QACP,aAAa;QACb,SAAS,EAAT,mBAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAAC,aAAyC;IACrE,OAAO;QACL,cAAc,EAAE,mBAAmB,CAAC,aAAa,CAAC;QAClD,aAAa,EAAE,kBAAkB,CAAC,aAAa,CAAC;KACjD,CAAC;AACJ,CAAC;AALD,sCAKC"}

package/lib/bridge/logic.d.ts

@@ -1,24 +1,10 @@
-import { Event, InputEntryFunctionData, WriteSetChange } from "@aptos-labs/ts-sdk";
-import type { Operation } from "@ledgerhq/types-live";
+import type { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
-import type { AptosTransaction, TransactionOptions } from "../types";
-export declare const DEFAULT_GAS: BigNumber;
-export declare const DEFAULT_GAS_PRICE: BigNumber;
-export declare const ESTIMATE_GAS_MUL: BigNumber;
-export declare function isTestnet(currencyId: string): boolean;
-export declare const getMaxSendBalance: (amount: BigNumber, gas: BigNumber, gasPrice: BigNumber) => BigNumber;
-export declare function normalizeTransactionOptions(options: TransactionOptions): TransactionOptions;
+import type { AptosTransaction, Transaction } from "../types";
+export declare const getMaxSendBalance: (gas: BigNumber, gasPrice: BigNumber, account: Account, transaction?: Transaction) => BigNumber;
 export declare const getBlankOperation: (tx: AptosTransaction, id: string) => Operation<Record<string, string>>;
 export declare const txsToOps: (info: {
     address: string;
-}, id: string, txs: (AptosTransaction | null)[]) => Operation[];
-export declare function compareAddress(addressA: string, addressB: string): boolean;
-export declare function getFunctionAddress(payload: InputEntryFunctionData): string | undefined;
-export declare function processRecipients(payload: InputEntryFunctionData, address: string, op: Operation, function_address: string): void;
-export declare function isChangeOfAptos(writeSetChange: WriteSetChange, event: Event, event_name: string): boolean;
-export declare function getAptosAmounts(tx: AptosTransaction, address: string): {
-    amount_in: BigNumber;
-    amount_out: BigNumber;
-};
-export declare function calculateAmount(sender: string, address: string, fee: BigNumber, amount_in: BigNumber, amount_out: BigNumber): BigNumber;
+}, id: string, txs: (AptosTransaction | null)[]) => [Operation[], Operation[]];
+export declare function getTokenAccount(account: Account, transaction: Transaction): TokenAccount | undefined;
 //# sourceMappingURL=logic.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EACL,sBAAsB,EAEtB,cAAc,EACf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AACrE,OAAO,SAAS,MAAM,cAAc,CAAC;AAUrC,OAAO,KAAK,EAAqB,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAExF,eAAO,MAAM,WAAW,WAAqB,CAAC;AAC9C,eAAO,MAAM,iBAAiB,WAAqB,CAAC;AACpD,eAAO,MAAM,gBAAgB,WAAqB,CAAC;AAInD,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,iBAAiB,WACpB,SAAS,OACZ,SAAS,YACJ,SAAS,KAClB,SAIF,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAe3F;AAED,eAAO,MAAM,iBAAiB,OACxB,gBAAgB,MAChB,MAAM,KACT,UAAU,OAAO,MAAM,EAAE,MAAM,CAAC,CAejC,CAAC;AAUH,eAAO,MAAM,QAAQ,SACb;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,MACrB,MAAM,OACL,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,KAC/B,SAAS,EAsCX,CAAC;AAEF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAKhE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,GAAG,SAAS,CAMtF;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,SAAS,EACb,gBAAgB,EAAE,MAAM,GACvB,IAAI,CA6BN;AAQD,wBAAgB,eAAe,CAC7B,cAAc,EAAE,cAAc,EAC9B,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,GACjB,OAAO,CA6BT;AAED,wBAAgB,eAAe,CAC7B,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,GACd;IAAE,SAAS,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,SAAS,CAAA;CAAE,CAqBjD;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,GACpB,SAAS,CAUX"}
+{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/bridge/logic.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAiB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAO5F,OAAO,SAAS,MAAM,cAAc,CAAC;AAGrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAQ9D,eAAO,MAAM,iBAAiB,QACvB,SAAS,YACJ,SAAS,WACV,OAAO,gBACF,WAAW,KACxB,SAWF,CAAC;AAEF,eAAO,MAAM,iBAAiB,OACxB,gBAAgB,MAChB,MAAM,KACT,UAAU,OAAO,MAAM,EAAE,MAAM,CAAC,CAejC,CAAC;AAEH,eAAO,MAAM,QAAQ,SACb;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,MACrB,MAAM,OACL,CAAC,gBAAgB,GAAG,IAAI,CAAC,EAAE,KAC/B,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CA0D3B,CAAC;AAEF,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACvB,YAAY,GAAG,SAAS,CAI1B"}

package/lib/bridge/logic.js

@@ -3,41 +3,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAmount = exports.getAptosAmounts = exports.isChangeOfAptos = exports.processRecipients = exports.getFunctionAddress = exports.compareAddress = exports.txsToOps = exports.getBlankOperation = exports.normalizeTransactionOptions = exports.getMaxSendBalance = exports.isTestnet = exports.ESTIMATE_GAS_MUL = exports.DEFAULT_GAS_PRICE = exports.DEFAULT_GAS = void 0;
-const currencies_1 = require("@ledgerhq/cryptoassets/currencies");
+exports.getTokenAccount = exports.txsToOps = exports.getBlankOperation = exports.getMaxSendBalance = void 0;
+const index_1 = require("@ledgerhq/coin-framework/account/index");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const operation_1 = require("@ledgerhq/coin-framework/operation");
 const constants_1 = require("../constants");
-exports.DEFAULT_GAS = new bignumber_js_1.default(200);
-exports.DEFAULT_GAS_PRICE = new bignumber_js_1.default(100);
-exports.ESTIMATE_GAS_MUL = new bignumber_js_1.default(1.0); // define buffer for gas estimation change here, if needed
-const CLEAN_HEX_REGEXP = /^0x0*|^0+/;
-function isTestnet(currencyId) {
-    return (0, currencies_1.getCryptoCurrencyById)(currencyId).isTestnetFor ? true : false;
-}
-exports.isTestnet = isTestnet;
-const getMaxSendBalance = (amount, gas, gasPrice) => {
+const cryptoassets_1 = require("@ledgerhq/cryptoassets");
+const transactionsToOperations_1 = require("../logic/transactionsToOperations");
+const getCoinAndAmounts_1 = require("../logic/getCoinAndAmounts");
+const calculateAmount_1 = require("../logic/calculateAmount");
+const processRecipients_1 = require("../logic/processRecipients");
+const getFunctionAddress_1 = require("../logic/getFunctionAddress");
+const getMaxSendBalance = (gas, gasPrice, account, transaction) => {
+    const tokenAccount = (0, index_1.findSubAccountById)(account, transaction?.subAccountId ?? "");
+    const fromTokenAccount = tokenAccount && (0, index_1.isTokenAccount)(tokenAccount);
     const totalGas = gas.multipliedBy(gasPrice);
-    return amount.gt(totalGas) ? amount.minus(totalGas) : new bignumber_js_1.default(0);
+    return fromTokenAccount
+        ? tokenAccount.spendableBalance
+        : account.spendableBalance.gt(totalGas)
+            ? account.spendableBalance.minus(totalGas)
+            : new bignumber_js_1.default(0);
 };
 exports.getMaxSendBalance = getMaxSendBalance;
-function normalizeTransactionOptions(options) {
-    // FIXME: this is wrong. TransactionOptions is
-    // {
-    //     maxGasAmount: string;
-    //     gasUnitPrice: string;
-    //     sequenceNumber?: string;
-    //     expirationTimestampSecs?: string;
-    // }
-    // meaning we can't return undefined in check method.
-    // This method is useless, not deleting as it breaks code and this iteration is coin modularisation.
-    const check = (v) => ((v ?? "").toString().trim() ? v : undefined);
-    return {
-        maxGasAmount: check(options.maxGasAmount),
-        gasUnitPrice: check(options.gasUnitPrice),
-    };
-}
-exports.normalizeTransactionOptions = normalizeTransactionOptions;
 const getBlankOperation = (tx, id) => ({
     id: "",
     hash: tx.hash,
@@ -55,143 +42,59 @@ const getBlankOperation = (tx, id) => ({
     hasFailed: false,
 });
 exports.getBlankOperation = getBlankOperation;
-const convertFunctionPayloadResponseToInputEntryFunctionData = (payload) => ({
-    function: payload.function,
-    typeArguments: payload.type_arguments,
-    functionArguments: payload.arguments,
-});
 const txsToOps = (info, id, txs) => {
     const { address } = info;
     const ops = [];
+    const opsTokens = [];
     txs.forEach(tx => {
         if (tx !== null) {
             const op = (0, exports.getBlankOperation)(tx, id);
             op.fee = new bignumber_js_1.default(tx.gas_used).multipliedBy(new bignumber_js_1.default(tx.gas_unit_price));
-            const payload = convertFunctionPayloadResponseToInputEntryFunctionData(tx.payload);
-            const function_address = getFunctionAddress(payload);
+            const payload = (0, transactionsToOperations_1.convertFunctionPayloadResponseToInputEntryFunctionData)(tx.payload);
+            const function_address = (0, getFunctionAddress_1.getFunctionAddress)(payload);
             if (!function_address) {
                 return; // skip transaction without functions in payload
             }
-            const { amount_in, amount_out } = getAptosAmounts(tx, address);
-            op.value = calculateAmount(tx.sender, address, op.fee, amount_in, amount_out);
-            op.type = compareAddress(tx.sender, address) ? constants_1.DIRECTION.OUT : constants_1.DIRECTION.IN;
+            const { coin_id, amount_in, amount_out } = (0, getCoinAndAmounts_1.getCoinAndAmounts)(tx, address);
+            op.value = (0, calculateAmount_1.calculateAmount)(tx.sender, address, amount_in, amount_out);
+            op.type = (0, getCoinAndAmounts_1.compareAddress)(tx.sender, address) ? constants_1.DIRECTION.OUT : constants_1.DIRECTION.IN;
             op.senders.push(tx.sender);
-            processRecipients(payload, address, op, function_address);
+            op.hasFailed = !tx.success;
+            op.id = (0, operation_1.encodeOperationId)(op.accountId, tx.hash, op.type);
+            (0, processRecipients_1.processRecipients)(payload, address, op, function_address);
             if (op.value.isZero()) {
                 // skip transaction that result no Aptos change
                 op.type = constants_1.DIRECTION.UNKNOWN;
             }
-            op.hasFailed = !tx.success;
-            op.id = (0, operation_1.encodeOperationId)(id, tx.hash, op.type);
-            if (op.type !== constants_1.DIRECTION.UNKNOWN)
-                ops.push(op);
-        }
-    });
-    return ops;
-};
-exports.txsToOps = txsToOps;
-function compareAddress(addressA, addressB) {
-    return (addressA.replace(CLEAN_HEX_REGEXP, "").toLowerCase() ===
-        addressB.replace(CLEAN_HEX_REGEXP, "").toLowerCase());
-}
-exports.compareAddress = compareAddress;
-function getFunctionAddress(payload) {
-    if (payload.function) {
-        const parts = payload.function.split("::");
-        return parts.length === 3 && parts[0].length ? parts[0] : undefined;
-    }
-    return undefined;
-}
-exports.getFunctionAddress = getFunctionAddress;
-function processRecipients(payload, address, op, function_address) {
-    // get recipients buy 3 groups
-    if ((constants_1.TRANSFER_TYPES.includes(payload.function) ||
-        constants_1.DELEGATION_POOL_TYPES.includes(payload.function)) &&
-        payload.functionArguments &&
-        payload.functionArguments.length > 0 &&
-        typeof payload.functionArguments[0] === "string") {
-        // 1. Transfer like functions (includes some delegation pool functions)
-        op.recipients.push(payload.functionArguments[0].toString());
-    }
-    else if (constants_1.BATCH_TRANSFER_TYPES.includes(payload.function) &&
-        payload.functionArguments &&
-        payload.functionArguments.length > 0 &&
-        Array.isArray(payload.functionArguments[0])) {
-        // 2. Batch function, to validate we are in the recipients list
-        if (!compareAddress(op.senders[0], address)) {
-            for (const recipient of payload.functionArguments[0]) {
-                if (recipient && compareAddress(recipient.toString(), address)) {
-                    op.recipients.push(recipient.toString());
+            if (op.type !== constants_1.DIRECTION.UNKNOWN && coin_id !== null) {
+                if (coin_id === constants_1.APTOS_ASSET_ID) {
+                    ops.push(op);
                 }
-            }
-        }
-    }
-    else {
-        // 3. other smart contracts, in this case smart contract will be treated as a recipient
-        op.recipients.push(function_address);
-    }
-}
-exports.processRecipients = processRecipients;
-function checkWriteSets(tx, event, event_name) {
-    return tx.changes.some(change => {
-        return isChangeOfAptos(change, event, event_name);
-    });
-}
-function isChangeOfAptos(writeSetChange, event, event_name) {
-    // to validate the event is related to Aptos Tokens we need to find change of type "write_resource"
-    // with the same guid as event
-    if (writeSetChange.type !== constants_1.WRITE_RESOURCE) {
-        return false;
-    }
-    if (!("data" in writeSetChange)) {
-        return false;
-    }
-    const change_data = writeSetChange.data;
-    if (!("type" in change_data)) {
-        return false;
-    }
-    const mr = change_data;
-    if (mr.type !== constants_1.APTOS_COIN_CHANGE) {
-        return false;
-    }
-    const change_event_data = mr.data[event_name];
-    return (change_event_data.guid.id.addr === event.guid.account_address &&
-        change_event_data.guid.id.creation_num === event.guid.creation_number);
-}
-exports.isChangeOfAptos = isChangeOfAptos;
-function getAptosAmounts(tx, address) {
-    let amount_in = new bignumber_js_1.default(0);
-    let amount_out = new bignumber_js_1.default(0);
-    // collect all events related to the address and calculate the overall amounts
-    tx.events.forEach(event => {
-        if (compareAddress(event.guid.account_address, address)) {
-            switch (event.type) {
-                case "0x1::coin::WithdrawEvent":
-                    if (checkWriteSets(tx, event, "withdraw_events")) {
-                        amount_out = amount_out.plus(event.data.amount);
+                else {
+                    const token = (0, cryptoassets_1.findTokenByAddressInCurrency)(coin_id.toLowerCase(), "aptos");
+                    if (token !== undefined) {
+                        op.accountId = (0, index_1.encodeTokenAccountId)(id, token);
+                        opsTokens.push(op);
+                        if (op.type === constants_1.DIRECTION.OUT) {
+                            ops.push({
+                                ...op,
+                                accountId: (0, index_1.decodeTokenAccountId)(op.accountId).accountId,
+                                value: op.fee,
+                                type: "FEES",
+                            });
+                        }
                     }
-                    break;
-                case "0x1::coin::DepositEvent":
-                    if (checkWriteSets(tx, event, "deposit_events")) {
-                        amount_in = amount_in.plus(event.data.amount);
-                    }
-                    break;
+                }
             }
         }
     });
-    return { amount_in, amount_out };
-}
-exports.getAptosAmounts = getAptosAmounts;
-function calculateAmount(sender, address, fee, amount_in, amount_out) {
-    const is_sender = compareAddress(sender, address);
-    // Include fees if our address is the sender
-    if (is_sender) {
-        amount_out = amount_out.plus(fee);
-    }
-    // LL negates the amount for SEND transactions
-    // to show positive amount on the send transaction (ex: in "cancel" tx, when amount will be returned to our account)
-    // we need to make it negative
-    return is_sender ? amount_out.minus(amount_in) : amount_in.minus(amount_out);
+    return [ops, opsTokens];
+};
+exports.txsToOps = txsToOps;
+function getTokenAccount(account, transaction) {
+    const tokenAccount = (0, index_1.findSubAccountById)(account, transaction.subAccountId ?? "");
+    const fromTokenAccount = tokenAccount && (0, index_1.isTokenAccount)(tokenAccount);
+    return fromTokenAccount ? tokenAccount : undefined;
 }
-exports.calculateAmount = calculateAmount;
+exports.getTokenAccount = getTokenAccount;
 //# sourceMappingURL=logic.js.map

package/lib/bridge/logic.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAKpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,QAAA,MAAM,kBAAkB,YACb,OAAO,eACH,WAAW,KACvB,QAAQ,WAAW,CAyCrB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"prepareTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAKpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAI5C,QAAA,MAAM,kBAAkB,YACb,OAAO,eACH,WAAW,KACvB,QAAQ,WAAW,CA2CrB,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/lib/bridge/prepareTransaction.js

@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
-const api_1 = require("../api");
+const network_1 = require("../network");
 const getFeesForTransaction_1 = require("./getFeesForTransaction");
 const logic_1 = require("./logic");
+const constants_1 = require("../constants");
 const prepareTransaction = async (account, transaction) => {
     if (!transaction.recipient) {
         return transaction;
@@ -19,15 +20,15 @@ const prepareTransaction = async (account, transaction) => {
             fees: (0, bignumber_js_1.default)(0),
         };
     }
-    const aptosClient = new api_1.AptosAPI(account.currency.id);
+    const aptosClient = new network_1.AptosAPI(account.currency.id);
     if (transaction.useAllAmount) {
         // we will use this amount in simulation, to estimate gas
-        transaction.amount = (0, logic_1.getMaxSendBalance)(account.spendableBalance, new bignumber_js_1.default(logic_1.DEFAULT_GAS), new bignumber_js_1.default(logic_1.DEFAULT_GAS_PRICE));
+        transaction.amount = (0, logic_1.getMaxSendBalance)(new bignumber_js_1.default(constants_1.DEFAULT_GAS), new bignumber_js_1.default(constants_1.DEFAULT_GAS_PRICE), account, transaction);
     }
     const { fees, estimate, errors } = await (0, getFeesForTransaction_1.getEstimatedGas)(account, transaction, aptosClient);
     if (transaction.useAllAmount) {
         // correct the transaction amount according to estimated fees
-        transaction.amount = (0, logic_1.getMaxSendBalance)(account.spendableBalance, (0, bignumber_js_1.default)(estimate.maxGasAmount), (0, bignumber_js_1.default)(estimate.gasUnitPrice));
+        transaction.amount = (0, logic_1.getMaxSendBalance)((0, bignumber_js_1.default)(estimate.maxGasAmount), (0, bignumber_js_1.default)(estimate.gasUnitPrice), account, transaction);
     }
     transaction.fees = fees;
     transaction.options = estimate;

package/lib/bridge/prepareTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;AACA,gEAAqC;AAErC,gCAAkC;AAClC,mEAA0D;AAE1D,mCAA4E;AAE5E,MAAM,kBAAkB,GAAG,KAAK,EAC9B,OAAgB,EAChB,WAAwB,EACF,EAAE;IACxB,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3B,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,iFAAiF;IACjF,gGAAgG;IAChG,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7D,OAAO;YACL,GAAG,WAAW;YACd,IAAI,EAAE,IAAA,sBAAS,EAAC,CAAC,CAAC;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,cAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEtD,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,yDAAyD;QACzD,WAAW,CAAC,MAAM,GAAG,IAAA,yBAAiB,EACpC,OAAO,CAAC,gBAAgB,EACxB,IAAI,sBAAS,CAAC,mBAAW,CAAC,EAC1B,IAAI,sBAAS,CAAC,yBAAiB,CAAC,CACjC,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,uCAAe,EAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAE5F,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,6DAA6D;QAC7D,WAAW,CAAC,MAAM,GAAG,IAAA,yBAAiB,EACpC,OAAO,CAAC,gBAAgB,EACxB,IAAA,sBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,EAChC,IAAA,sBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,CACjC,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC/B,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;IAE5B,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,kBAAe,kBAAkB,CAAC"}
+{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":";;;;;AACA,gEAAqC;AAErC,wCAAsC;AACtC,mEAA0D;AAE1D,mCAA4C;AAC5C,4CAA8D;AAE9D,MAAM,kBAAkB,GAAG,KAAK,EAC9B,OAAgB,EAChB,WAAwB,EACF,EAAE;IACxB,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3B,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,iFAAiF;IACjF,gGAAgG;IAChG,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7D,OAAO;YACL,GAAG,WAAW;YACd,IAAI,EAAE,IAAA,sBAAS,EAAC,CAAC,CAAC;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,kBAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEtD,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,yDAAyD;QACzD,WAAW,CAAC,MAAM,GAAG,IAAA,yBAAiB,EACpC,IAAI,sBAAS,CAAC,uBAAW,CAAC,EAC1B,IAAI,sBAAS,CAAC,6BAAiB,CAAC,EAChC,OAAO,EACP,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,uCAAe,EAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAE5F,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,6DAA6D;QAC7D,WAAW,CAAC,MAAM,GAAG,IAAA,yBAAiB,EACpC,IAAA,sBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,EAChC,IAAA,sBAAS,EAAC,QAAQ,CAAC,YAAY,CAAC,EAChC,OAAO,EACP,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;IACxB,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC/B,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;IAE5B,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,kBAAe,kBAAkB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAK1D,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAA4B,MAAM,sBAAsB,CAAC;AAG7F,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,eAAO,MAAM,UAAU,MAAO,OAAO;;;CAGnC,CAAC;AAEH,QAAA,MAAM,kBAAkB,kBAEL,cAAc,WAAW,CAAC,KACxC,cAAc,WAAW,EAAE,YAAY,CAAC,CAAC,eAAe,CA2DvD,CAAC;AAEP,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"signOperation.d.ts","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAI1D,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAA4B,MAAM,sBAAsB,CAAC;AAG7F,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAKvC,eAAO,MAAM,UAAU,MAAO,OAAO;;;CAGnC,CAAC;AAEH,QAAA,MAAM,kBAAkB,kBAEL,cAAc,WAAW,CAAC,KACxC,cAAc,WAAW,EAAE,YAAY,CAAC,CAAC,eAAe,CA0EvD,CAAC;AAEP,eAAe,kBAAkB,CAAC"}