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

package/lib-es/api/index.d.ts

@@ -1,31 +1,5 @@
-import { AccountData, Ed25519PublicKey, GasEstimation, InputEntryFunctionData, RawTransaction, UserTransactionResponse } from "@aptos-labs/ts-sdk";
-import BigNumber from "bignumber.js";
-import type { AptosTransaction, TransactionOptions } from "../types";
-export declare class AptosAPI {
-    private apiUrl;
-    private indexerUrl;
-    private aptosConfig;
-    private aptosClient;
-    private apolloClient;
-    constructor(currencyId: string);
-    getAccount(address: string): Promise<AccountData>;
-    getAccountInfo(address: string, startAt: string): Promise<{
-        balance: BigNumber;
-        transactions: (AptosTransaction | null)[];
-        blockHeight: number;
-    }>;
-    estimateGasPrice(): Promise<GasEstimation>;
-    generateTransaction(address: string, payload: InputEntryFunctionData, options: TransactionOptions): Promise<RawTransaction>;
-    simulateTransaction(address: Ed25519PublicKey, tx: RawTransaction, options?: {
-        estimateGasUnitPrice: boolean;
-        estimateMaxGasAmount: boolean;
-        estimatePrioritizedGasUnitPrice: boolean;
-    }): Promise<UserTransactionResponse[]>;
-    broadcast(signature: string): Promise<string>;
-    private getBalance;
-    private fetchTransactions;
-    private richItemByVersion;
-    private getHeight;
-    private getBlock;
-}
+import type { Api } from "@ledgerhq/coin-framework/api/index";
+import type { AptosConfig as AptosConfigApi } from "../config";
+import type { AptosAsset, AptosExtra, AptosFeeParameters, AptosSender } from "../types/assets";
+export declare function createApi(config: AptosConfigApi): Api<AptosAsset, AptosExtra, AptosSender, AptosFeeParameters>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EAIX,gBAAgB,EAChB,aAAa,EACb,sBAAsB,EAItB,cAAc,EAGd,uBAAuB,EAGxB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAcrE,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAuB;gBAE/B,UAAU,EAAE,MAAM;IAiBxB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAIjD,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;;;;;IAc/C,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC;IAI1C,mBAAmB,CACvB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,cAAc,CAAC;IA6BpB,mBAAmB,CACvB,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,cAAc,EAClB,OAAO;;;;KAIN,GACA,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAQ/B,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAarC,UAAU;YAgBV,iBAAiB;YA8BjB,iBAAiB;YAejB,SAAS;YAQT,QAAQ;CAOvB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,IAAI,cAAc,EAAE,MAAM,WAAW,CAAC;AAG/D,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG/F,wBAAgB,SAAS,CACvB,MAAM,EAAE,cAAc,GACrB,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAuB9D"}

package/lib-es/api/index.js

@@ -1,170 +1,24 @@
-import { ApolloClient, InMemoryCache } from "@apollo/client";
-import { Aptos, AptosApiType, AptosConfig, MimeType, post, } from "@aptos-labs/ts-sdk";
-import { getEnv } from "@ledgerhq/live-env";
-import network from "@ledgerhq/live-network";
-import BigNumber from "bignumber.js";
-import isUndefined from "lodash/isUndefined";
-import { APTOS_ASSET_ID } from "../constants";
-import { isTestnet } from "../bridge/logic";
-import { GetAccountTransactionsData, GetAccountTransactionsDataGt } from "./graphql/queries";
-const getApiEndpoint = (currencyId) => isTestnet(currencyId) ? getEnv("APTOS_TESTNET_API_ENDPOINT") : getEnv("APTOS_API_ENDPOINT");
-const getIndexerEndpoint = (currencyId) => isTestnet(currencyId)
-    ? getEnv("APTOS_TESTNET_INDEXER_ENDPOINT")
-    : getEnv("APTOS_INDEXER_ENDPOINT");
-export class AptosAPI {
-    apiUrl;
-    indexerUrl;
-    aptosConfig;
-    aptosClient;
-    apolloClient;
-    constructor(currencyId) {
-        this.apiUrl = getApiEndpoint(currencyId);
-        this.indexerUrl = getIndexerEndpoint(currencyId);
-        this.aptosConfig = new AptosConfig({
-            fullnode: this.apiUrl,
-            indexer: this.indexerUrl,
-        });
-        this.aptosClient = new Aptos(this.aptosConfig);
-        this.apolloClient = new ApolloClient({
-            uri: this.indexerUrl,
-            cache: new InMemoryCache(),
-            headers: {
-                "x-client": "ledger-live",
-            },
-        });
-    }
-    async getAccount(address) {
-        return this.aptosClient.getAccountInfo({ accountAddress: address });
-    }
-    async getAccountInfo(address, startAt) {
-        const [balance, transactions, blockHeight] = await Promise.all([
-            this.getBalance(address),
-            this.fetchTransactions(address, startAt),
-            this.getHeight(),
-        ]);
-        return {
-            balance,
-            transactions,
-            blockHeight,
-        };
-    }
-    async estimateGasPrice() {
-        return this.aptosClient.getGasPriceEstimation();
-    }
-    async generateTransaction(address, payload, options) {
-        const opts = {};
-        if (!isUndefined(options.maxGasAmount)) {
-            opts.maxGasAmount = Number(options.maxGasAmount);
-        }
-        if (!isUndefined(options.gasUnitPrice)) {
-            opts.gasUnitPrice = Number(options.gasUnitPrice);
-        }
-        try {
-            const { ledger_timestamp } = await this.aptosClient.getLedgerInfo();
-            opts.expireTimestamp = Number(Math.ceil(+ledger_timestamp / 1_000_000 + 2 * 60)); // in milliseconds
-        }
-        catch {
-            // skip
-        }
-        return this.aptosClient.transaction.build
-            .simple({
-            sender: address,
-            data: payload,
-            options: opts,
-        })
-            .then(t => t.rawTransaction)
-            .catch(error => {
-            throw error;
-        });
-    }
-    async simulateTransaction(address, tx, options = {
-        estimateGasUnitPrice: true,
-        estimateMaxGasAmount: true,
-        estimatePrioritizedGasUnitPrice: false,
-    }) {
-        return this.aptosClient.transaction.simulate.simple({
-            signerPublicKey: address,
-            transaction: { rawTransaction: tx },
-            options,
-        });
-    }
-    async broadcast(signature) {
-        const txBytes = Uint8Array.from(Buffer.from(signature, "hex"));
-        const pendingTx = await post({
-            contentType: MimeType.BCS_SIGNED_TRANSACTION,
-            aptosConfig: this.aptosClient.config,
-            body: txBytes,
-            path: "transactions",
-            type: AptosApiType.FULLNODE,
-            originMethod: "",
-        });
-        return pendingTx.data.hash;
-    }
-    async getBalance(address) {
-        try {
-            const [balanceStr] = await this.aptosClient.view({
-                payload: {
-                    function: "0x1::coin::balance",
-                    typeArguments: [APTOS_ASSET_ID],
-                    functionArguments: [address],
-                },
-            });
-            const balance = parseInt(balanceStr, 10);
-            return new BigNumber(balance);
-        }
-        catch (_) {
-            return new BigNumber(0);
-        }
-    }
-    async fetchTransactions(address, gt) {
-        if (!address) {
-            return [];
-        }
-        let query = GetAccountTransactionsData;
-        if (gt) {
-            query = GetAccountTransactionsDataGt;
-        }
-        const queryResponse = await this.apolloClient.query({
-            query,
-            variables: {
-                address,
-                limit: 1000,
-                gt,
-            },
-            fetchPolicy: "network-only",
-        });
-        return Promise.all(queryResponse.data.address_version_from_move_resources.map(({ transaction_version }) => {
-            return this.richItemByVersion(transaction_version);
-        }));
-    }
-    async richItemByVersion(version) {
-        try {
-            const tx = await this.aptosClient.getTransactionByVersion({
-                ledgerVersion: version,
-            });
-            const block = await this.getBlock(version);
-            return {
-                ...tx,
-                block,
-            };
-        }
-        catch (error) {
-            return null;
-        }
-    }
-    async getHeight() {
-        const { data } = await network({
-            method: "GET",
-            url: this.apiUrl,
-        });
-        return parseInt(data.block_height);
-    }
-    async getBlock(version) {
-        const block = await this.aptosClient.getBlockByVersion({ ledgerVersion: version });
-        return {
-            height: parseInt(block.block_height),
-            hash: block.block_hash,
-        };
-    }
+import coinConfig from "../config";
+import { AptosAPI } from "../network";
+export function createApi(config) {
+    coinConfig.setCoinConfig(() => ({ ...config, status: { type: "active" } }));
+    const client = new AptosAPI(config.aptosSettings);
+    return {
+        broadcast: (tx) => client.broadcast(tx),
+        combine: (_tx, _signature, _pubkey) => {
+            throw new Error("Not Implemented");
+        },
+        craftTransaction: (_transactionIntent, _customFees) => {
+            throw new Error("Not Implemented");
+        },
+        estimateFees: (transactionIntent) => client.estimateFees(transactionIntent),
+        getBalance: (_address) => {
+            throw new Error("Not Implemented");
+        },
+        lastBlock: () => client.getLastBlock(),
+        listOperations: (_address, _pagination) => {
+            throw new Error("Not Implemented");
+        },
+    };
 }
 //# sourceMappingURL=index.js.map

package/lib-es/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":"AAGA,OAAO,UAAU,MAAM,WAAW,CAAC;AAEnC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,UAAU,SAAS,CACvB,MAAsB;IAEtB,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IAE5E,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAElD,OAAO;QACL,SAAS,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAU,EAAE;YAC5C,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QACD,gBAAgB,EAAE,CAAC,kBAAkB,EAAE,WAAW,EAAmB,EAAE;YACrE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QACD,YAAY,EAAE,CAAC,iBAAyE,EAAE,EAAE,CAC1F,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC;QACxC,UAAU,EAAE,CAAC,QAAQ,EAAkC,EAAE;YACvD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE;QACtC,cAAc,EAAE,CAAC,QAAQ,EAAE,WAAW,EAA8C,EAAE;YACpF,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACrC,CAAC;KACF,CAAC;AACJ,CAAC"}

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

@@ -1,4 +1,6 @@
 import type { AptosAccount, Transaction } from "../types/index";
 export declare function createFixtureAccount(account?: Partial<AptosAccount>): AptosAccount;
+export declare function createFixtureAccountWithSubAccount(tokenType: string, account?: Partial<AptosAccount>): AptosAccount;
 export declare function createFixtureTransaction(tx?: Partial<Transaction>): Transaction;
+export declare function createFixtureTransactionWithSubAccount(tx?: Partial<Transaction>): Transaction;
 //# sourceMappingURL=bridge.fixture.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bridge.fixture.d.ts","sourceRoot":"","sources":["../../src/bridge/bridge.fixture.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAMhE,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,YAAY,CA2BlF;AAED,wBAAgB,wBAAwB,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,CAe/E"}
+{"version":3,"file":"bridge.fixture.d.ts","sourceRoot":"","sources":["../../src/bridge/bridge.fixture.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAOhE,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,YAAY,CA4BlF;AAED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAC9B,YAAY,CAoDd;AAED,wBAAgB,wBAAwB,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,CAgB/E;AAED,wBAAgB,sCAAsC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,CAiB7F"}

package/lib-es/bridge/bridge.fixture.js

@@ -14,34 +14,104 @@ export function createFixtureAccount(account) {
         seedIdentifier: faker.string.uuid(),
         derivationMode: "",
         index: faker.number.int(),
-        freshAddress: account?.freshAddress || freshAddress.address,
-        freshAddressPath: account?.freshAddressPath || freshAddress.derivationPath,
+        freshAddress: freshAddress.address,
+        freshAddressPath: freshAddress.derivationPath,
         used: true,
-        balance: account?.balance || new BigNumber(0),
-        spendableBalance: account?.spendableBalance || new BigNumber(0),
+        balance: new BigNumber(0),
+        spendableBalance: new BigNumber(0),
         creationDate: faker.date.past(),
         blockHeight: faker.number.int({ min: 100_000, max: 200_000 }),
         currency,
-        operationsCount: account?.operationsCount || 0,
-        operations: account?.operations || [],
-        pendingOperations: account?.pendingOperations || [],
+        operationsCount: 0,
+        operations: [],
+        pendingOperations: [],
         lastSyncDate: new Date(),
         balanceHistoryCache: emptyHistoryCache,
         swapHistory: [],
+        ...account,
+    };
+}
+export function createFixtureAccountWithSubAccount(tokenType, account) {
+    const freshAddress = {
+        address: "address",
+        derivationPath: "derivation_path",
+    };
+    const id = faker.string.uuid();
+    return {
+        type: "Account",
+        id,
+        seedIdentifier: faker.string.uuid(),
+        derivationMode: "",
+        index: faker.number.int(),
+        freshAddress: freshAddress.address,
+        freshAddressPath: freshAddress.derivationPath,
+        used: true,
+        balance: new BigNumber(0),
+        spendableBalance: new BigNumber(0),
+        creationDate: faker.date.past(),
+        blockHeight: faker.number.int({ min: 100_000, max: 200_000 }),
+        currency,
+        operationsCount: 0,
+        operations: [],
+        pendingOperations: [],
+        lastSyncDate: new Date(),
+        balanceHistoryCache: emptyHistoryCache,
+        swapHistory: [],
+        subAccounts: [
+            {
+                id: "1",
+                parentId: id,
+                type: "TokenAccount",
+                token: {
+                    type: "TokenCurrency",
+                    id: "aptToken",
+                    contractAddress: "contract_address",
+                    parentCurrency: currency,
+                    tokenType,
+                },
+                balance: BigNumber(1000),
+                spendableBalance: BigNumber(1000),
+                creationDate: new Date(),
+                operationsCount: 0,
+                operations: [],
+                pendingOperations: [],
+                balanceHistoryCache: emptyHistoryCache,
+                swapHistory: [],
+            },
+        ],
+        ...account,
     };
 }
 export function createFixtureTransaction(tx) {
     const transaction = {
-        amount: tx?.amount || new BigNumber(0),
-        recipient: tx?.recipient || "",
-        useAllAmount: tx?.useAllAmount || false,
+        amount: new BigNumber(0),
+        recipient: "recipient",
+        useAllAmount: false,
+        family: "aptos",
+        mode: "send",
+        fees: null,
+        options: {
+            maxGasAmount: BigNumber(0).toString(),
+            gasUnitPrice: BigNumber(0).toString(),
+        },
+        ...tx,
+    };
+    return transaction;
+}
+export function createFixtureTransactionWithSubAccount(tx) {
+    const transaction = {
+        amount: new BigNumber(0),
+        recipient: "recipient",
+        useAllAmount: false,
         family: "aptos",
-        mode: tx?.mode || "send",
-        fees: tx?.fees || null,
+        mode: "send",
+        fees: null,
         options: {
             maxGasAmount: BigNumber(0).toString(),
             gasUnitPrice: BigNumber(0).toString(),
         },
+        subAccountId: "1",
+        ...tx,
     };
     return transaction;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"bridge.fixture.js","sourceRoot":"","sources":["../../src/bridge/bridge.fixture.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,MAAM,QAAQ,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;AAEhD,MAAM,UAAU,oBAAoB,CAAC,OAA+B;IAClE,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE,SAAS;QAClB,cAAc,EAAE,iBAAiB;KAClC,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,SAAS;QACf,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE;QACvB,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE;QACnC,cAAc,EAAE,EAAE;QAClB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE;QACzB,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,YAAY,CAAC,OAAO;QAC3D,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,IAAI,YAAY,CAAC,cAAc;QAC1E,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC;QAC7C,gBAAgB,EAAE,OAAO,EAAE,gBAAgB,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC;QAC/D,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;QAC/B,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;QAC7D,QAAQ;QACR,eAAe,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC;QAC9C,UAAU,EAAE,OAAO,EAAE,UAAU,IAAI,EAAE;QACrC,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,IAAI,EAAE;QACnD,YAAY,EAAE,IAAI,IAAI,EAAE;QACxB,mBAAmB,EAAE,iBAAiB;QACtC,WAAW,EAAE,EAAE;KAChB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EAAyB;IAChE,MAAM,WAAW,GAAgB;QAC/B,MAAM,EAAE,EAAE,EAAE,MAAM,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC;QACtC,SAAS,EAAE,EAAE,EAAE,SAAS,IAAI,EAAE;QAC9B,YAAY,EAAE,EAAE,EAAE,YAAY,IAAI,KAAK;QACvC,MAAM,EAAE,OAAO;QACf,IAAI,EAAE,EAAE,EAAE,IAAI,IAAI,MAAM;QACxB,IAAI,EAAE,EAAE,EAAE,IAAI,IAAI,IAAI;QACtB,OAAO,EAAE;YACP,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;YACrC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;SACtC;KACF,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC"}
+{"version":3,"file":"bridge.fixture.js","sourceRoot":"","sources":["../../src/bridge/bridge.fixture.ts"],"names":[],"mappings":"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"}

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

@@ -1,7 +1,8 @@
 import type { Account, Operation, SignedOperation } from "@ledgerhq/types-live";
-declare const broadcast: ({ signedOperation, account, }: {
+type broadcastFunc = {
     signedOperation: SignedOperation;
     account: Account;
-}) => Promise<Operation>;
+};
+declare const broadcast: ({ signedOperation, account }: broadcastFunc) => Promise<Operation>;
 export default broadcast;
 //# sourceMappingURL=broadcast.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIhF,QAAA,MAAM,SAAS;qBAII,eAAe;aACvB,OAAO;MACd,QAAQ,SAAS,CAIpB,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"broadcast.d.ts","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIhF,KAAK,aAAa,GAAG;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,QAAA,MAAM,SAAS,iCAAwC,aAAa,KAAG,QAAQ,SAAS,CAKvF,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib-es/bridge/broadcast.js

@@ -1,8 +1,9 @@
 import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
-import { AptosAPI } from "../api";
-const broadcast = async ({ signedOperation, account, }) => {
+import { AptosAPI } from "../network";
+const broadcast = async ({ signedOperation, account }) => {
     const { signature, operation } = signedOperation;
-    const hash = await new AptosAPI(account.currency.id).broadcast(signature);
+    const client = new AptosAPI(account.currency.id);
+    const hash = await client.broadcast(signature);
     return patchOperationWithHash(operation, hash);
 };
 export default broadcast;

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

@@ -1 +1 @@
-{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,MAAM,SAAS,GAAG,KAAK,EAAE,EACvB,eAAe,EACf,OAAO,GAIR,EAAsB,EAAE;IACvB,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IACjD,MAAM,IAAI,GAAG,MAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC1E,OAAO,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"broadcast.js","sourceRoot":"","sources":["../../src/bridge/broadcast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAOtC,MAAM,SAAS,GAAG,KAAK,EAAE,EAAE,eAAe,EAAE,OAAO,EAAiB,EAAsB,EAAE;IAC1F,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,eAAe,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACjD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC/C,OAAO,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

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

@@ -1,6 +1,6 @@
 import { RawTransaction } from "@aptos-labs/ts-sdk";
 import type { Account } from "@ledgerhq/types-live";
-import { AptosAPI } from "../api";
+import { AptosAPI } from "../network";
 import type { Transaction } from "../types";
 declare const buildTransaction: (account: Account, transaction: Transaction, aptosClient: AptosAPI) => Promise<RawTransaction>;
 export default buildTransaction;

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

@@ -1 +1 @@
-{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,QAAA,MAAM,gBAAgB,YACX,OAAO,eACH,WAAW,eACX,QAAQ,KACpB,QAAQ,cAAc,CAMxB,CAAC;AAUF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,KAAK,EAAE,OAAO,EAAgB,MAAM,sBAAsB,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,QAAA,MAAM,gBAAgB,YACX,OAAO,eACH,WAAW,eACX,QAAQ,KACpB,QAAQ,cAAc,CAQxB,CAAC;AAyCF,eAAe,gBAAgB,CAAC"}

package/lib-es/bridge/buildTransaction.js

@@ -1,16 +1,42 @@
-import { APTOS_ASSET_ID } from "../constants";
+import { findSubAccountById, isTokenAccount } from "@ledgerhq/coin-framework/account/index";
+import { APTOS_ASSET_ID, SUPPORTED_TOKEN_TYPES } from "../constants";
 import { normalizeTransactionOptions } from "./logic";
 const buildTransaction = async (account, transaction, aptosClient) => {
-    const txPayload = getPayload(transaction.recipient, transaction.amount);
+    const subAccount = findSubAccountById(account, transaction.subAccountId ?? "");
+    const txPayload = getPayload(subAccount, transaction);
     const txOptions = normalizeTransactionOptions(transaction.options);
     const tx = await aptosClient.generateTransaction(account.freshAddress, txPayload, txOptions);
     return tx;
 };
-const getPayload = (sendTo, amount) => {
+const getPayload = (tokenAccount, transaction) => {
+    if (tokenAccount && isTokenAccount(tokenAccount)) {
+        const { tokenType } = tokenAccount.token;
+        if (!SUPPORTED_TOKEN_TYPES.includes(tokenType)) {
+            throw new Error(`Token type ${tokenType} not supported`);
+        }
+        if (tokenType === "fungible_asset") {
+            return {
+                function: `0x1::primary_fungible_store::transfer`,
+                typeArguments: ["0x1::fungible_asset::Metadata"],
+                functionArguments: [
+                    tokenAccount.token.contractAddress,
+                    transaction.recipient,
+                    transaction.amount.toString(),
+                ],
+            };
+        }
+        if (tokenType === "coin") {
+            return {
+                function: `0x1::aptos_account::transfer_coins`,
+                typeArguments: [tokenAccount.token.contractAddress],
+                functionArguments: [transaction.recipient, transaction.amount.toString()],
+            };
+        }
+    }
     return {
         function: "0x1::aptos_account::transfer_coins",
         typeArguments: [APTOS_ASSET_ID],
-        functionArguments: [sendTo, amount.toString()],
+        functionArguments: [transaction.recipient, transaction.amount.toString()],
     };
 };
 export default buildTransaction;

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

@@ -1 +1 @@
-{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAGtD,MAAM,gBAAgB,GAAG,KAAK,EAC5B,OAAgB,EAChB,WAAwB,EACxB,WAAqB,EACI,EAAE;IAC3B,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACxE,MAAM,SAAS,GAAG,2BAA2B,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAE7F,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,MAAiB,EAA0B,EAAE;IAC/E,OAAO;QACL,QAAQ,EAAE,oCAAoC;QAC9C,aAAa,EAAE,CAAC,cAAc,CAAC;QAC/B,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;KAC/C,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"buildTransaction.js","sourceRoot":"","sources":["../../src/bridge/buildTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErE,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAGtD,MAAM,gBAAgB,GAAG,KAAK,EAC5B,OAAgB,EAChB,WAAwB,EACxB,WAAqB,EACI,EAAE;IAC3B,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAE/E,MAAM,SAAS,GAAG,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,2BAA2B,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAE7F,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CACjB,YAAsC,EACtC,WAAwB,EACA,EAAE;IAC1B,IAAI,YAAY,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QACjD,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC;QAEzC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,KAAK,CAAC,cAAc,SAAS,gBAAgB,CAAC,CAAC;QAC3D,CAAC;QAED,IAAI,SAAS,KAAK,gBAAgB,EAAE,CAAC;YACnC,OAAO;gBACL,QAAQ,EAAE,uCAAuC;gBACjD,aAAa,EAAE,CAAC,+BAA+B,CAAC;gBAChD,iBAAiB,EAAE;oBACjB,YAAY,CAAC,KAAK,CAAC,eAAe;oBAClC,WAAW,CAAC,SAAS;oBACrB,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE;iBAC9B;aACF,CAAC;QACJ,CAAC;QAED,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YACzB,OAAO;gBACL,QAAQ,EAAE,oCAAoC;gBAC9C,aAAa,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC;gBACnD,iBAAiB,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;aAC1E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,oCAAoC;QAC9C,aAAa,EAAE,CAAC,cAAc,CAAC;QAC/B,iBAAiB,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;KAC1E,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib-es/bridge/createTransaction.js

@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { DEFAULT_GAS, DEFAULT_GAS_PRICE } from "./logic";
+import { DEFAULT_GAS, DEFAULT_GAS_PRICE } from "../constants";
 const createTransaction = () => ({
     family: "aptos",
     mode: "send",

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

@@ -1 +1 @@
-{"version":3,"file":"createTransaction.js","sourceRoot":"","sources":["../../src/bridge/createTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEzD,MAAM,iBAAiB,GAAG,GAAgB,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,OAAO;IACf,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACpB,SAAS,EAAE,EAAE;IACb,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE;QACP,YAAY,EAAE,WAAW,CAAC,QAAQ,EAAE;QACpC,YAAY,EAAE,iBAAiB,CAAC,QAAQ,EAAE;KAC3C;CACF,CAAC,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"createTransaction.js","sourceRoot":"","sources":["../../src/bridge/createTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,iBAAiB,GAAG,GAAgB,EAAE,CAAC,CAAC;IAC5C,MAAM,EAAE,OAAO;IACf,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACpB,SAAS,EAAE,EAAE;IACb,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE;QACP,YAAY,EAAE,WAAW,CAAC,QAAQ,EAAE;QACpC,YAAY,EAAE,iBAAiB,CAAC,QAAQ,EAAE;KAC3C;CACF,CAAC,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAKzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,QAAA,MAAM,oBAAoB;aAKf,WAAW;oBACJ,OAAO;kBACT,WAAW;MACvB,QAAQ,SAAS,CAgBpB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"estimateMaxSpendable.d.ts","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,QAAA,MAAM,oBAAoB;aAKf,WAAW;oBACJ,OAAO;kBACT,WAAW;MACvB,QAAQ,SAAS,CAgBpB,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/lib-es/bridge/estimateMaxSpendable.js

@@ -1,8 +1,9 @@
 import { BigNumber } from "bignumber.js";
 import { getMainAccount } from "@ledgerhq/coin-framework/account/index";
-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 estimateMaxSpendable = async ({ account, parentAccount, transaction, }) => {
     const mainAccount = getMainAccount(account, parentAccount);
     const aptosClient = new AptosAPI(mainAccount.currency.id);
@@ -13,7 +14,7 @@ const estimateMaxSpendable = async ({ account, parentAccount, transaction, }) =>
         maxGasAmount = BigNumber(estimate.maxGasAmount);
         gasUnitPrice = BigNumber(estimate.gasUnitPrice);
     }
-    return getMaxSendBalance(mainAccount.spendableBalance, maxGasAmount, gasUnitPrice);
+    return getMaxSendBalance(maxGasAmount, gasUnitPrice, mainAccount, transaction);
 };
 export default estimateMaxSpendable;
 //# sourceMappingURL=estimateMaxSpendable.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG5E,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAClC,OAAO,EACP,aAAa,EACb,WAAW,GAKZ,EAAsB,EAAE;IACvB,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE3D,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE1D,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAC9C,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAEpD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAElF,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,iBAAiB,CAAC,WAAW,CAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACrF,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"estimateMaxSpendable.js","sourceRoot":"","sources":["../../src/bridge/estimateMaxSpendable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAG9D,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAClC,OAAO,EACP,aAAa,EACb,WAAW,GAKZ,EAAsB,EAAE;IACvB,MAAM,WAAW,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAE3D,MAAM,WAAW,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE1D,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;IAC9C,IAAI,YAAY,GAAG,IAAI,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAEpD,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAElF,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAChD,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,iBAAiB,CAAC,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AACjF,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

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

@@ -1,6 +1,6 @@
 import type { Account } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
-import { AptosAPI } from "../api";
+import { AptosAPI } from "../network";
 import type { Transaction, TransactionErrors } from "../types";
 type IGetEstimatedGasReturnType = {
     fees: BigNumber;

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

@@ -1 +1 @@
-{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/D,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE;QACR,YAAY,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,MAAM,YACR,OAAO,eACH,WAAW,eACX,QAAQ,KACpB,QAAQ,0BAA0B,CA+CpC,CAAC;AAQF,eAAO,MAAM,eAAe,YACjB,OAAO,eACH,WAAW,eACX,QAAQ,KACpB,QAAQ,0BAA0B,CAEpC,CAAC"}
+{"version":3,"file":"getFeesForTransaction.d.ts","sourceRoot":"","sources":["../../src/bridge/getFeesForTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/D,KAAK,0BAA0B,GAAG;IAChC,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE;QACR,YAAY,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,MAAM,YACR,OAAO,eACH,WAAW,eACX,QAAQ,KACpB,QAAQ,0BAA0B,CAiDpC,CAAC;AAWF,eAAO,MAAM,eAAe,YACjB,OAAO,eACH,WAAW,eACX,QAAQ,KACpB,QAAQ,0BAA0B,CAEpC,CAAC"}

package/lib-es/bridge/getFeesForTransaction.js

@@ -3,7 +3,8 @@ import { log } from "@ledgerhq/logs";
 import BigNumber from "bignumber.js";
 import { makeLRUCache, seconds } from "@ledgerhq/live-network/cache";
 import buildTransaction from "./buildTransaction";
-import { DEFAULT_GAS, DEFAULT_GAS_PRICE, ESTIMATE_GAS_MUL } from "./logic";
+import { getTokenAccount } from "./logic";
+import { DEFAULT_GAS, DEFAULT_GAS_PRICE, ESTIMATE_GAS_MUL } from "../constants";
 export const getFee = async (account, transaction, aptosClient) => {
     const res = {
         fees: new BigNumber(DEFAULT_GAS).multipliedBy(DEFAULT_GAS_PRICE),
@@ -28,12 +29,14 @@ export const getFee = async (account, transaction, aptosClient) => {
             gasLimit = new BigNumber(completedTx.gas_used).multipliedBy(ESTIMATE_GAS_MUL);
             gasPrice = new BigNumber(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}`);
                 }
             }
@@ -48,7 +51,10 @@ export const getFee = async (account, transaction, aptosClient) => {
     }
     return res;
 };
-const CACHE = makeLRUCache(getFee, (account, transaction) => `${account.id}-${transaction.amount.toString()}}`, seconds(30));
+const CACHE = makeLRUCache(getFee, (account, transaction) => {
+    const tokenAccount = getTokenAccount(account, transaction);
+    return `${tokenAccount ? tokenAccount.id : account.id}-${transaction.amount.toString()}}`;
+}, seconds(30));
 export const getEstimatedGas = async (account, transaction, aptosClient) => {
     return await CACHE(account, transaction, aptosClient);
 };