@ledgerhq/coin-aptos 1.10.0-nightly.2 → 1.10.0-nightly.3

package/src/logic/craftTransaction.ts

@@ -1,26 +1,65 @@
 import type { TransactionIntent } from "@ledgerhq/coin-framework/lib/api/types";
 import type { AptosAsset, AptosExtra, AptosSender } from "../types/assets";
-import type { Account } from "@ledgerhq/types-live";
+import type { Account, TokenAccount } from "@ledgerhq/types-live";
 import type { AptosAPI } from "../network";
-import buildTransaction from "./buildTransaction";
+import buildTransaction, { isTokenType } from "./buildTransaction";
 import createTransaction from "./createTransaction";
 import BigNumber from "bignumber.js";
+import { APTOS_ASSET_ID, type TOKEN_TYPE } from "../constants";
+import type { AptosBalance } from "../types";
 
 export async function craftTransaction(
   aptosClient: AptosAPI,
   transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>,
 ): Promise<string> {
+  const newTx = createTransaction();
+  newTx.amount = BigNumber(transactionIntent.amount.toString());
+  newTx.recipient = transactionIntent.recipient;
+  newTx.mode = transactionIntent.type;
+  newTx.useAllAmount = transactionIntent.amount === BigInt(0);
+
   const account = {
     freshAddress: transactionIntent.sender.freshAddress,
     xpub: transactionIntent.sender.xpub,
+    subAccounts: new Array<TokenAccount>(),
   } as Account;
 
-  const newTx = createTransaction();
-  newTx.amount = BigNumber(transactionIntent.amount.toString());
-  newTx.recipient = transactionIntent.recipient;
-  newTx.mode = transactionIntent.type;
+  let tokenType: TOKEN_TYPE | undefined;
+  const contractAddress = getContractAddress(transactionIntent);
+  let balance: AptosBalance | undefined;
+
+  if (newTx.useAllAmount === true) {
+    const balances = await aptosClient.getBalances(transactionIntent.sender.freshAddress);
+    balance = balances?.find(
+      b => b.contractAddress.toLowerCase() === contractAddress?.toLowerCase(),
+    );
+
+    if (balance !== undefined) {
+      newTx.amount = BigNumber(balance.amount.toString());
+    }
+  }
+
+  if (transactionIntent.asset.type === "token") {
+    tokenType = transactionIntent.asset.standard as TOKEN_TYPE;
+  }
 
-  const aptosTx = await buildTransaction(account, newTx, aptosClient);
+  const aptosTx = await buildTransaction(
+    account,
+    newTx,
+    aptosClient,
+    contractAddress,
+    tokenType ?? undefined,
+  );
 
   return aptosTx.bcsToHex().toString();
 }
+
+function getContractAddress(
+  txIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>,
+): string {
+  if (txIntent.asset.type === "token" && isTokenType(txIntent.asset.standard)) {
+    return txIntent.asset.contractAddress;
+  }
+
+  return APTOS_ASSET_ID;
+}

package/src/logic/transactionsToOperations.ts

@@ -32,8 +32,8 @@ const detectType = (address: string, tx: AptosTransaction, value: BigNumber): DI
 export function transactionsToOperations(
   address: string,
   txs: (AptosTransaction | null)[],
-): [Operation<AptosAsset>[], Operation<AptosAsset>[]] {
-  const operations: [Operation<AptosAsset>[], Operation<AptosAsset>[]] = [[], []];
+): Operation<AptosAsset>[] {
+  const operations: Operation<AptosAsset>[] = [];
 
   return txs.reduce((acc, tx) => {
     if (tx === null) {
@@ -82,22 +82,19 @@ export function transactionsToOperations(
 
     if (op.type !== DIRECTION.UNKNOWN && coin_id !== null) {
       if (coin_id === APTOS_ASSET_ID) {
-        acc[0].push(op);
+        acc.push(op);
         return acc;
       }
 
       const token = findTokenByAddressInCurrency(coin_id.toLowerCase(), "aptos");
 
       if (token !== undefined) {
-        acc[1].push(op);
-
-        if (op.type === DIRECTION.OUT) {
-          acc[0].push({
-            ...op,
-            value: op.tx.fees,
-            type: "FEES",
-          });
-        }
+        op.asset = {
+          type: "token",
+          standard: token.tokenType,
+          contractAddress: token.contractAddress,
+        };
+        acc.push(op);
       }
     }
     return acc;

package/src/network/client.ts

@@ -262,7 +262,7 @@ export class AptosAPI {
     pagination: Pagination,
   ): Promise<[Operation<AptosAsset>[], string]> {
     const transactions = await this.getAccountInfo(address, pagination.minHeight.toString());
-    const [newOperations, _] = transactionsToOperations(address, transactions.transactions);
+    const newOperations = transactionsToOperations(address, transactions.transactions);
 
     return [newOperations, ""];
   }
@@ -344,7 +344,7 @@ export class AptosAPI {
     });
 
     return response.map(x => ({
-      asset_type: x.asset_type ?? "-",
+      contractAddress: x.asset_type ?? "-",
       amount: BigNumber(x.amount),
     }));
   }

package/src/types/assets.ts

@@ -1,6 +1,8 @@
 import type { Asset } from "@ledgerhq/coin-framework/api/types";
 
-export type AptosAsset = Asset;
+export type AptosAsset = Asset<AptosTokenInformation>;
+
+export type AptosTokenInformation = { standard: string; contractAddress: string };
 
 export type AptosExtra = Record<string, unknown>;
 

package/src/types/index.ts

@@ -88,6 +88,6 @@ export type AptosMoveResource = {
 };
 
 export type AptosBalance = {
-  asset_type: string;
+  contractAddress: string;
   amount: BigNumber;
 };