@ledgerhq/coin-aptos 2.0.0-nightly.5 → 2.0.0

package/lib-es/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-es/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-es/bridge/getTransactionStatus.js

@@ -1,29 +1,43 @@
+import { NotEnoughBalance, RecipientRequired, InvalidAddress, FeeNotLoaded, InvalidAddressBecauseDestinationIsAlsoSource, AmountRequired, NotEnoughBalanceFees, } from "@ledgerhq/errors";
 import { BigNumber } from "bignumber.js";
-import { NotEnoughBalance, RecipientRequired, InvalidAddress, FeeNotLoaded, InvalidAddressBecauseDestinationIsAlsoSource, AmountRequired, } from "@ledgerhq/errors";
 import { AccountAddress } from "@aptos-labs/ts-sdk";
+import { getTokenAccount } from "./logic";
 const getTransactionStatus = async (a, t) => {
     const errors = {};
     const warnings = {};
+    if (!t.recipient) {
+        errors.recipient = new RecipientRequired();
+    }
+    if (!AccountAddress.isValid({ input: t.recipient }).valid && !errors.recipient) {
+        errors.recipient = new InvalidAddress("", { currencyName: a.currency.name });
+    }
+    if (t.recipient === a.freshAddress && !errors.recipient) {
+        errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
+    }
     if (!t.fees) {
         errors.fees = new FeeNotLoaded();
     }
     const estimatedFees = t.fees || BigNumber(0);
-    if (t.amount.eq(0)) {
+    if (t.amount.lte(0)) {
         errors.amount = new AmountRequired();
     }
-    const amount = t.amount;
-    const totalSpent = BigNumber(t.amount).plus(estimatedFees);
-    if (totalSpent.gt(a.balance) && !errors.amount) {
-        errors.amount = new NotEnoughBalance();
+    const tokenAccount = getTokenAccount(a, t);
+    const amount = t.useAllAmount
+        ? tokenAccount
+            ? tokenAccount.spendableBalance
+            : a.spendableBalance.minus(estimatedFees).isLessThan(0)
+                ? 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 NotEnoughBalanceFees();
     }
-    if (!t.recipient) {
-        errors.recipient = new RecipientRequired();
-    }
-    else if (AccountAddress.isValid({ input: t.recipient }).valid === false && !errors.recipient) {
-        errors.recipient = new InvalidAddress("", { currencyName: a.currency.name });
-    }
-    else if (t.recipient === a.freshAddress && !errors.recipient) {
-        errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
+    if (tokenAccount
+        ? tokenAccount.spendableBalance.isLessThan(totalSpent) ||
+            a.spendableBalance.isLessThan(estimatedFees)
+        : a.spendableBalance.isLessThan(totalSpent) && !errors.amount) {
+        errors.amount = new NotEnoughBalance();
     }
     return Promise.resolve({
         errors,

package/lib-es/bridge/getTransactionStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,4CAA4C,EAC5C,cAAc,GACf,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;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,YAAY,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnB,MAAM,CAAC,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAExB,MAAM,UAAU,GAAG,SAAS,CAAC,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,gBAAgB,EAAE,CAAC;IACzC,CAAC;IAED,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QACjB,MAAM,CAAC,SAAS,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAC7C,CAAC;SAAM,IAAI,cAAc,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,cAAc,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,4CAA4C,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,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"getTransactionStatus.js","sourceRoot":"","sources":["../../src/bridge/getTransactionStatus.ts"],"names":[],"mappings":"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"}

package/lib-es/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-es/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-es/bridge/logic.d.ts

@@ -1,24 +1,26 @@
-import { Event, InputEntryFunctionData, WriteSetChange } from "@aptos-labs/ts-sdk";
-import type { Operation } from "@ledgerhq/types-live";
+import { Event, InputEntryFunctionData, WriteSetChangeWriteResource } from "@aptos-labs/ts-sdk";
+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;
+import type { AptosTransaction, Transaction, TransactionOptions } from "../types";
 export declare function isTestnet(currencyId: string): boolean;
-export declare const getMaxSendBalance: (amount: BigNumber, gas: BigNumber, gasPrice: BigNumber) => BigNumber;
+export declare const getMaxSendBalance: (gas: BigNumber, gasPrice: BigNumber, account: Account, transaction?: Transaction) => BigNumber;
 export declare function normalizeTransactionOptions(options: TransactionOptions): TransactionOptions;
 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[];
+}, id: string, txs: (AptosTransaction | null)[]) => [Operation[], 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): {
+export declare function getEventCoinAddress(change: WriteSetChangeWriteResource, event: Event, event_name: string): string | null;
+export declare function getEventFAAddress(change: WriteSetChangeWriteResource, event: Event, _event_name: string): string | null;
+export declare function getResourceAddress(tx: AptosTransaction, event: Event, event_name: string, getAddressProcessor: (change: WriteSetChangeWriteResource, event: Event, event_name: string) => string | null): string | null;
+export declare function checkFAOwner(tx: AptosTransaction, event: Event, user_address: string): boolean;
+export declare function getCoinAndAmounts(tx: AptosTransaction, address: string): {
+    coin_id: string | null;
     amount_in: BigNumber;
     amount_out: BigNumber;
 };
-export declare function calculateAmount(sender: string, address: string, fee: BigNumber, amount_in: BigNumber, amount_out: BigNumber): BigNumber;
+export declare function calculateAmount(sender: string, address: string, amount_in: BigNumber, amount_out: BigNumber): BigNumber;
+export declare function getTokenAccount(account: Account, transaction: Transaction): TokenAccount | undefined;
 //# sourceMappingURL=logic.d.ts.map

package/lib-es/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":"AAAA,OAAO,EAEL,KAAK,EACL,sBAAsB,EAGtB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAiB,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAO5F,OAAO,SAAS,MAAM,cAAc,CAAC;AAYrC,OAAO,KAAK,EAIV,gBAAgB,EAChB,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAKlB,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,iBAAiB,QACvB,SAAS,YACJ,SAAS,WACV,OAAO,gBACF,WAAW,KACxB,SAWF,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,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CA0D3B,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,CAsCN;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAoBf;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAcf;AAED,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,EAClB,mBAAmB,EAAE,CACnB,MAAM,EAAE,2BAA2B,EACnC,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,KACf,MAAM,GAAG,IAAI,GACjB,MAAM,GAAG,IAAI,CAUf;AAQD,wBAAgB,YAAY,CAAC,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAc9F;AAED,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,GACd;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,SAAS,CAAA;CAAE,CA4CzE;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,GACpB,SAAS,CAMX;AAYD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,GACvB,YAAY,GAAG,SAAS,CAI1B"}

package/lib-es/bridge/logic.js

@@ -1,17 +1,22 @@
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
+import { decodeTokenAccountId, encodeTokenAccountId, findSubAccountById, isTokenAccount, } from "@ledgerhq/coin-framework/account/index";
 import BigNumber from "bignumber.js";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
-import { APTOS_COIN_CHANGE, BATCH_TRANSFER_TYPES, DELEGATION_POOL_TYPES, DIRECTION, TRANSFER_TYPES, WRITE_RESOURCE, } from "../constants";
-export const DEFAULT_GAS = new BigNumber(200);
-export const DEFAULT_GAS_PRICE = new BigNumber(100);
-export const ESTIMATE_GAS_MUL = new BigNumber(1.0); // define buffer for gas estimation change here, if needed
+import { APTOS_ASSET_ID, APTOS_FUNGIBLE_STORE, BATCH_TRANSFER_TYPES, DELEGATION_POOL_TYPES, DIRECTION, COIN_TRANSFER_TYPES, FA_TRANSFER_TYPES, APTOS_OBJECT_CORE, } from "../constants";
+import { findTokenByAddressInCurrency } from "@ledgerhq/cryptoassets";
 const CLEAN_HEX_REGEXP = /^0x0*|^0+/;
 export function isTestnet(currencyId) {
     return getCryptoCurrencyById(currencyId).isTestnetFor ? true : false;
 }
-export const getMaxSendBalance = (amount, gas, gasPrice) => {
+export const getMaxSendBalance = (gas, gasPrice, account, transaction) => {
+    const tokenAccount = findSubAccountById(account, transaction?.subAccountId ?? "");
+    const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
     const totalGas = gas.multipliedBy(gasPrice);
-    return amount.gt(totalGas) ? amount.minus(totalGas) : new BigNumber(0);
+    return fromTokenAccount
+        ? tokenAccount.spendableBalance
+        : account.spendableBalance.gt(totalGas)
+            ? account.spendableBalance.minus(totalGas)
+            : new BigNumber(0);
 };
 export function normalizeTransactionOptions(options) {
     // FIXME: this is wrong. TransactionOptions is
@@ -53,6 +58,7 @@ const convertFunctionPayloadResponseToInputEntryFunctionData = (payload) => ({
 export const txsToOps = (info, id, txs) => {
     const { address } = info;
     const ops = [];
+    const opsTokens = [];
     txs.forEach(tx => {
         if (tx !== null) {
             const op = getBlankOperation(tx, id);
@@ -62,22 +68,40 @@ export const txsToOps = (info, id, txs) => {
             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);
+            const { coin_id, amount_in, amount_out } = getCoinAndAmounts(tx, address);
+            op.value = calculateAmount(tx.sender, address, amount_in, amount_out);
             op.type = compareAddress(tx.sender, address) ? DIRECTION.OUT : DIRECTION.IN;
             op.senders.push(tx.sender);
+            op.hasFailed = !tx.success;
+            op.id = encodeOperationId(op.accountId, tx.hash, op.type);
             processRecipients(payload, address, op, function_address);
             if (op.value.isZero()) {
                 // skip transaction that result no Aptos change
                 op.type = DIRECTION.UNKNOWN;
             }
-            op.hasFailed = !tx.success;
-            op.id = encodeOperationId(id, tx.hash, op.type);
-            if (op.type !== DIRECTION.UNKNOWN)
-                ops.push(op);
+            if (op.type !== DIRECTION.UNKNOWN && coin_id !== null) {
+                if (coin_id === APTOS_ASSET_ID) {
+                    ops.push(op);
+                }
+                else {
+                    const token = findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
+                    if (token !== undefined) {
+                        op.accountId = encodeTokenAccountId(id, token);
+                        opsTokens.push(op);
+                        if (op.type === DIRECTION.OUT) {
+                            ops.push({
+                                ...op,
+                                accountId: decodeTokenAccountId(op.accountId).accountId,
+                                value: op.fee,
+                                type: "FEES",
+                            });
+                        }
+                    }
+                }
+            }
         }
     });
-    return ops;
+    return [ops, opsTokens];
 };
 export function compareAddress(addressA, addressB) {
     return (addressA.replace(CLEAN_HEX_REGEXP, "").toLowerCase() ===
@@ -92,7 +116,7 @@ export function getFunctionAddress(payload) {
 }
 export function processRecipients(payload, address, op, function_address) {
     // get recipients buy 3 groups
-    if ((TRANSFER_TYPES.includes(payload.function) ||
+    if ((COIN_TRANSFER_TYPES.includes(payload.function) ||
         DELEGATION_POOL_TYPES.includes(payload.function)) &&
         payload.functionArguments &&
         payload.functionArguments.length > 0 &&
@@ -100,6 +124,14 @@ export function processRecipients(payload, address, op, function_address) {
         // 1. Transfer like functions (includes some delegation pool functions)
         op.recipients.push(payload.functionArguments[0].toString());
     }
+    else if (FA_TRANSFER_TYPES.includes(payload.function) &&
+        payload.functionArguments &&
+        payload.functionArguments.length > 1 &&
+        typeof payload.functionArguments[0] === "object" &&
+        typeof payload.functionArguments[1] === "string") {
+        // 1. Transfer like functions (includes some delegation pool functions)
+        op.recipients.push(payload.functionArguments[1].toString());
+    }
     else if (BATCH_TRANSFER_TYPES.includes(payload.function) &&
         payload.functionArguments &&
         payload.functionArguments.length > 0 &&
@@ -118,63 +150,122 @@ export function processRecipients(payload, address, op, function_address) {
         op.recipients.push(function_address);
     }
 }
-function checkWriteSets(tx, event, event_name) {
-    return tx.changes.some(change => {
-        return isChangeOfAptos(change, event, event_name);
-    });
-}
-export 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 !== WRITE_RESOURCE) {
-        return false;
+export function getEventCoinAddress(change, event, event_name) {
+    const change_data = change.data;
+    const mr = change_data; // -> this is data that we want to parse
+    if (!(event_name in mr.data)) {
+        return null;
     }
-    if (!("data" in writeSetChange)) {
-        return false;
+    const change_event_data = mr.data[event_name];
+    if (change_event_data.guid.id.addr !== event.guid.account_address ||
+        change_event_data.guid.id.creation_num !== event.guid.creation_number) {
+        return null;
     }
-    const change_data = writeSetChange.data;
-    if (!("type" in change_data)) {
-        return false;
+    const address = extractAddress(mr.type);
+    return address;
+}
+export function getEventFAAddress(change, event, _event_name) {
+    const change_data = change.data;
+    if (change_data.type !== APTOS_FUNGIBLE_STORE) {
+        return null;
     }
     const mr = change_data;
-    if (mr.type !== APTOS_COIN_CHANGE) {
-        return false;
+    if (change.address !== event.data.store) {
+        return null;
     }
-    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);
+    return mr.data.metadata.inner;
 }
-export function getAptosAmounts(tx, address) {
-    let amount_in = new BigNumber(0);
-    let amount_out = new BigNumber(0);
+export function getResourceAddress(tx, event, event_name, getAddressProcessor) {
+    for (const change of tx.changes) {
+        if (isWriteSetChangeWriteResource(change)) {
+            const address = getAddressProcessor(change, event, event_name);
+            if (address !== null) {
+                return address;
+            }
+        }
+    }
+    return null;
+}
+function isWriteSetChangeWriteResource(change) {
+    return change.data !== undefined;
+}
+export function checkFAOwner(tx, event, user_address) {
+    for (const change of tx.changes) {
+        if (isWriteSetChangeWriteResource(change)) {
+            const storeData = change.data;
+            if (change.address == event.data.store &&
+                storeData.type == APTOS_OBJECT_CORE &&
+                storeData.data.owner == user_address) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+export function getCoinAndAmounts(tx, address) {
+    let coin_id = null;
+    let amount_in = BigNumber(0);
+    let amount_out = BigNumber(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);
-                    }
-                    break;
-                case "0x1::coin::DepositEvent":
-                    if (checkWriteSets(tx, event, "deposit_events")) {
-                        amount_in = amount_in.plus(event.data.amount);
+        switch (event.type) {
+            case "0x1::coin::WithdrawEvent":
+                if (compareAddress(event.guid.account_address, address)) {
+                    coin_id = getResourceAddress(tx, event, "withdraw_events", getEventCoinAddress);
+                    amount_out = amount_out.plus(event.data.amount);
+                }
+                break;
+            case "0x1::coin::DepositEvent":
+                if (compareAddress(event.guid.account_address, address)) {
+                    coin_id = getResourceAddress(tx, event, "deposit_events", getEventCoinAddress);
+                    amount_in = amount_in.plus(event.data.amount);
+                }
+                break;
+            case "0x1::fungible_asset::Withdraw":
+                if (checkFAOwner(tx, event, address)) {
+                    coin_id = getResourceAddress(tx, event, "withdraw_events", getEventFAAddress);
+                    amount_out = amount_out.plus(event.data.amount);
+                }
+                break;
+            case "0x1::fungible_asset::Deposit":
+                if (checkFAOwner(tx, event, address)) {
+                    coin_id = getResourceAddress(tx, event, "deposit_events", getEventFAAddress);
+                    amount_in = amount_in.plus(event.data.amount);
+                }
+                break;
+            case "0x1::transaction_fee::FeeStatement":
+                if (tx.sender === address) {
+                    if (coin_id === null)
+                        coin_id = APTOS_ASSET_ID;
+                    if (coin_id === APTOS_ASSET_ID) {
+                        const fees = BigNumber(tx.gas_unit_price).times(BigNumber(tx.gas_used));
+                        amount_out = amount_out.plus(fees);
                     }
-                    break;
-            }
+                }
+                break;
         }
     });
-    return { amount_in, amount_out };
+    return { coin_id, amount_in, amount_out }; // TODO: manage situation when there are several coinID from the events parsing
 }
-export function calculateAmount(sender, address, fee, amount_in, amount_out) {
+export function calculateAmount(sender, address, 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);
 }
+/**
+ * Extracts the address from a string like "0x1::coin::CoinStore<address::module::type>"
+ * @param {string} str - The input string containing the address.
+ * @returns {string | null} - The extracted address or null if not found.
+ */
+function extractAddress(str) {
+    const match = str.match(/<([^<>]+)>{1}$/);
+    return match ? match[1] : null;
+}
+export function getTokenAccount(account, transaction) {
+    const tokenAccount = findSubAccountById(account, transaction.subAccountId ?? "");
+    const fromTokenAccount = tokenAccount && isTokenAccount(tokenAccount);
+    return fromTokenAccount ? tokenAccount : undefined;
+}
 //# sourceMappingURL=logic.js.map

package/lib-es/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-es/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-es/bridge/prepareTransaction.js

@@ -1,7 +1,8 @@
 import BigNumber from "bignumber.js";
-import { AptosAPI } from "../api";
+import { AptosAPI } from "../network";
 import { getEstimatedGas } from "./getFeesForTransaction";
-import { DEFAULT_GAS, DEFAULT_GAS_PRICE, getMaxSendBalance } from "./logic";
+import { getMaxSendBalance } from "./logic";
+import { DEFAULT_GAS, DEFAULT_GAS_PRICE } from "./../constants";
 const prepareTransaction = async (account, transaction) => {
     if (!transaction.recipient) {
         return transaction;
@@ -17,12 +18,12 @@ const prepareTransaction = async (account, transaction) => {
     const aptosClient = new AptosAPI(account.currency.id);
     if (transaction.useAllAmount) {
         // we will use this amount in simulation, to estimate gas
-        transaction.amount = getMaxSendBalance(account.spendableBalance, new BigNumber(DEFAULT_GAS), new BigNumber(DEFAULT_GAS_PRICE));
+        transaction.amount = getMaxSendBalance(new BigNumber(DEFAULT_GAS), new BigNumber(DEFAULT_GAS_PRICE), account, transaction);
     }
     const { fees, estimate, errors } = await getEstimatedGas(account, transaction, aptosClient);
     if (transaction.useAllAmount) {
         // correct the transaction amount according to estimated fees
-        transaction.amount = getMaxSendBalance(account.spendableBalance, BigNumber(estimate.maxGasAmount), BigNumber(estimate.gasUnitPrice));
+        transaction.amount = getMaxSendBalance(BigNumber(estimate.maxGasAmount), BigNumber(estimate.gasUnitPrice), account, transaction);
     }
     transaction.fees = fees;
     transaction.options = estimate;

package/lib-es/bridge/prepareTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;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,SAAS,CAAC,CAAC,CAAC;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEtD,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,yDAAyD;QACzD,WAAW,CAAC,MAAM,GAAG,iBAAiB,CACpC,OAAO,CAAC,gBAAgB,EACxB,IAAI,SAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,SAAS,CAAC,iBAAiB,CAAC,CACjC,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAE5F,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,6DAA6D;QAC7D,WAAW,CAAC,MAAM,GAAG,iBAAiB,CACpC,OAAO,CAAC,gBAAgB,EACxB,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAChC,SAAS,CAAC,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,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"prepareTransaction.js","sourceRoot":"","sources":["../../src/bridge/prepareTransaction.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,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,SAAS,CAAC,CAAC,CAAC;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEtD,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,yDAAyD;QACzD,WAAW,CAAC,MAAM,GAAG,iBAAiB,CACpC,IAAI,SAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,SAAS,CAAC,iBAAiB,CAAC,EAChC,OAAO,EACP,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAE5F,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,6DAA6D;QAC7D,WAAW,CAAC,MAAM,GAAG,iBAAiB,CACpC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAChC,SAAS,CAAC,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,eAAe,kBAAkB,CAAC"}

package/lib-es/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;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;AAIvC,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"}

package/lib-es/bridge/signOperation.js

@@ -2,8 +2,9 @@ import { Observable } from "rxjs";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import buildTransaction from "./buildTransaction";
 import BigNumber from "bignumber.js";
-import { AptosAPI } from "../api";
+import { AptosAPI } from "../network";
 import { signTransaction } from "../network";
+import { findSubAccountById } from "@ledgerhq/coin-framework/account/helpers";
 export const getAddress = (a) => ({
     address: a.freshAddress,
     derivationPath: a.freshAddressPath,
@@ -27,14 +28,13 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId
             senders.push(account.freshAddress);
             recipients.push(transaction.recipient);
         }
+        const subAccount = !!transaction.subAccountId && findSubAccountById(account, transaction.subAccountId);
         // build optimistic operation
         const operation = {
             id: encodeOperationId(accountId, hash, type),
             hash,
             type,
-            value: transaction.useAllAmount
-                ? account.balance.minus(fee)
-                : transaction.amount.plus(fee),
+            value: subAccount ? fee : transaction.amount.plus(fee),
             fee,
             extra,
             blockHash: null,
@@ -44,6 +44,20 @@ const buildSignOperation = (signerContext) => ({ account, transaction, deviceId
             accountId,
             date: new Date(),
             transactionSequenceNumber: Number(rawTx.sequence_number),
+            subOperations: subAccount
+                ? [
+                    {
+                        id: encodeOperationId(subAccount.id, "", "OUT"),
+                        type: "OUT",
+                        accountId: transaction.subAccountId,
+                        senders: [account.freshAddress],
+                        recipients: [transaction.recipient],
+                        value: transaction.amount,
+                        fee,
+                        date: new Date(),
+                    },
+                ]
+                : [],
         };
         o.next({
             type: "signed",

package/lib-es/bridge/signOperation.js.map

@@ -1 +1 @@
-{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC;IACzC,OAAO,EAAE,CAAC,CAAC,YAAY;IACvB,cAAc,EAAE,CAAC,CAAC,gBAAgB;CACnC,CAAC,CAAC;AAEH,MAAM,kBAAkB,GACtB,CACE,aAAyC,EACkB,EAAE,CAC/D,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CACrC,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE;IACjB,KAAK,UAAU,IAAI;QACjB,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC,CAAC;QAE/C,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEtD,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC/E,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEvD,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,CAAC;QAE7C,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,GAAkB,KAAK,CAAC;QAClC,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACnC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAED,6BAA6B;QAC7B,MAAM,SAAS,GAAc;YAC3B,EAAE,EAAE,iBAAiB,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;YAC5C,IAAI;YACJ,IAAI;YACJ,KAAK,EAAE,WAAW,CAAC,YAAY;gBAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;gBAC5B,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YAChC,GAAG;YACH,KAAK;YACL,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,IAAI;YACjB,OAAO;YACP,UAAU;YACV,SAAS;YACT,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,yBAAyB,EAAE,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC;SACzD,CAAC;QAEF,CAAC,CAAC,IAAI,CAAC;YACL,IAAI,EAAE,QAAQ;YACd,eAAe,EAAE;gBACf,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,EAAE,CAAC,IAAI,CACT,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAClB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEP,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"signOperation.js","sourceRoot":"","sources":["../../src/bridge/signOperation.ts"],"names":[],"mappings":"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"}

package/lib-es/bridge/synchronisation.d.ts

@@ -1,3 +1,18 @@
 import type { GetAccountShape } from "@ledgerhq/coin-framework/bridge/jsHelpers";
+import { Account, Operation, TokenAccount } from "@ledgerhq/types-live";
+import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { AccountShapeInfo } from "@ledgerhq/coin-framework/bridge/jsHelpers";
+/**
+ * In charge of smartly merging sub accounts while maintaining references as much as possible
+ */
+export declare const mergeSubAccounts: (initialAccount: Account | undefined, newSubAccounts: TokenAccount[]) => Array<TokenAccount>;
+/**
+ * Fetch the balance for a token and creates a TokenAccount based on this and the provided operations
+ */
+export declare const getSubAccountShape: (currency: CryptoCurrency, address: string, parentId: string, token: TokenCurrency, operations: Operation[]) => Promise<TokenAccount>;
+/**
+ * Getting all token related operations in order to provide TokenAccounts
+ */
+export declare const getSubAccounts: (infos: AccountShapeInfo<Account>, address: string, accountId: string, lastTokenOperations: Operation[]) => Promise<TokenAccount[]>;
 export declare const getAccountShape: GetAccountShape;
 //# sourceMappingURL=synchronisation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAMjF,eAAO,MAAM,eAAe,EAAE,eA0C7B,CAAC"}
+{"version":3,"file":"synchronisation.d.ts","sourceRoot":"","sources":["../../src/bridge/synchronisation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAKjF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAM7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAY7E;;GAEG;AACH,eAAO,MAAM,gBAAgB,mBACX,OAAO,GAAG,SAAS,kBACnB,YAAY,EAAE,KAC7B,MAAM,YAAY,CAwDpB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,aACnB,cAAc,WACf,MAAM,YACL,MAAM,SACT,aAAa,cACR,SAAS,EAAE,KACtB,QAAQ,YAAY,CAsBtB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,UAClB,iBAAiB,OAAO,CAAC,WACvB,MAAM,aACJ,MAAM,uBACI,SAAS,EAAE,KAC/B,QAAQ,YAAY,EAAE,CAyBxB,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,eA0D7B,CAAC"}