@ledgerhq/coin-aptos 2.2.0-next.1 → 2.2.0-nightly.2

package/src/network/client.ts

@@ -36,7 +36,6 @@ import type {
   GetAccountTransactionsDataQuery,
   GetAccountTransactionsDataGtQueryVariables,
 } from "./graphql/types";
-import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import {
   BlockInfo,
   FeeEstimation,
@@ -44,7 +43,7 @@ import {
   Pagination,
   TransactionIntent,
 } from "@ledgerhq/coin-framework/api/types";
-import { AptosAsset, AptosExtra, AptosFeeParameters, AptosSender } from "../types/assets";
+import { AptosAsset } from "../types/assets";
 import { log } from "@ledgerhq/logs";
 import { transactionsToOperations } from "../logic/transactionsToOperations";
 import { isTestnet } from "../logic/isTestnet";
@@ -88,13 +87,12 @@ export class AptosAPI {
 
   async getAccountInfo(address: string, startAt?: string) {
     const [balance, transactions, blockHeight] = await Promise.all([
-      this.getCoinBalance(address, APTOS_ASSET_ID),
+      this.getBalances(address, APTOS_ASSET_ID),
       this.fetchTransactions(address, startAt),
       this.getHeight(),
     ]);
-
     return {
-      balance,
+      balance: balance[0].amount ?? BigInt(0),
       transactions,
       blockHeight,
     };
@@ -167,14 +165,6 @@ export class AptosAPI {
     return pendingTx.data.hash;
   }
 
-  async getBalance(address: string, token: TokenCurrency): Promise<BigNumber> {
-    if (token.tokenType === "coin") {
-      return await this.getCoinBalance(address, token.contractAddress);
-    }
-
-    return await this.getFABalance(address, token.contractAddress);
-  }
-
   async getLastBlock(): Promise<BlockInfo> {
     const { block_height } = await this.aptosClient.getLedgerInfo();
     const block = await this.aptosClient.getBlockByHeight({ blockHeight: Number(block_height) });
@@ -185,48 +175,8 @@ export class AptosAPI {
     };
   }
 
-  async getCoinBalance(address: string, contract_address: string): Promise<BigNumber> {
-    try {
-      const [balanceStr] = await this.aptosClient.view<[string]>({
-        payload: {
-          function: "0x1::coin::balance",
-          typeArguments: [contract_address],
-          functionArguments: [address],
-        },
-      });
-      const balance = parseInt(balanceStr, 10);
-      return new BigNumber(balance);
-    } catch (error) {
-      log("error", "getCoinBalance", {
-        error,
-      });
-      return new BigNumber(0);
-    }
-  }
-
-  async getFABalance(address: string, contract_address: string): Promise<BigNumber> {
-    try {
-      const [balanceStr] = await this.aptosClient.view<[string]>({
-        payload: {
-          function: "0x1::primary_fungible_store::balance",
-          typeArguments: ["0x1::object::ObjectCore"],
-          functionArguments: [address, contract_address],
-        },
-      });
-      const balance = parseInt(balanceStr, 10);
-      return new BigNumber(balance);
-    } catch (error) {
-      log("error", "getFABalance", {
-        error,
-      });
-      return new BigNumber(0);
-    }
-  }
-
-  async estimateFees(
-    transactionIntent: TransactionIntent<AptosAsset, AptosExtra, AptosSender>,
-  ): Promise<FeeEstimation<AptosFeeParameters>> {
-    const publicKeyEd = new Ed25519PublicKey(transactionIntent.sender.xpub);
+  async estimateFees(transactionIntent: TransactionIntent<AptosAsset>): Promise<FeeEstimation> {
+    const publicKeyEd = new Ed25519PublicKey(transactionIntent?.senderPublicKey ?? "");
 
     const txPayload: InputEntryFunctionData = {
       function: "0x1::aptos_account::transfer_coins",
@@ -256,11 +206,7 @@ export class AptosAPI {
       gasUnitPrice: DEFAULT_GAS_PRICE.toString(),
     };
 
-    const tx = await this.generateTransaction(
-      transactionIntent.sender.freshAddress,
-      txPayload,
-      txOptions,
-    );
+    const tx = await this.generateTransaction(transactionIntent.sender, txPayload, txOptions);
 
     const simulation = await this.simulateTransaction(publicKeyEd, tx);
     const completedTx = simulation[0];
@@ -273,6 +219,7 @@ export class AptosAPI {
     return {
       value: BigInt(expectedGas.toString()),
       parameters: {
+        storageLimit: BigInt(0),
         gasLimit: BigInt(gasLimit.toString()),
         gasPrice: BigInt(gasPrice.toString()),
       },
@@ -354,21 +301,31 @@ export class AptosAPI {
     };
   }
 
-  async getBalances(address: string): Promise<AptosBalance[]> {
-    const response = await this.aptosClient.getCurrentFungibleAssetBalances({
-      options: {
-        offset: 0,
-        limit: 1000,
-        where: {
-          asset_type: { _eq: APTOS_ASSET_ID }, // to return all asset balances (native / token) we should remove this filter
-          owner_address: { _eq: address },
+  async getBalances(address: string, contractAddress?: string): Promise<AptosBalance[]> {
+    try {
+      const whereCondition: any = {
+        owner_address: { _eq: address },
+      };
+
+      if (contractAddress !== undefined && contractAddress !== "") {
+        whereCondition.asset_type = { _eq: contractAddress };
+      }
+
+      const response = await this.aptosClient.getCurrentFungibleAssetBalances({
+        options: {
+          where: whereCondition,
         },
-      },
-    });
+      });
 
-    return response.map(x => ({
-      contractAddress: x.asset_type ?? "-",
-      amount: BigNumber(x.amount),
-    }));
+      return response.map(x => ({
+        contractAddress: x.asset_type ?? "",
+        amount: BigNumber(x.amount),
+      }));
+    } catch (error) {
+      log("error", "getCoinBalance", {
+        error,
+      });
+      return [{ amount: BigNumber(0), contractAddress: "" }];
+    }
   }
 }

package/src/types/assets.ts

@@ -9,11 +9,6 @@ export type AptosTokenInformation = {
 
 export type AptosExtra = Record<string, unknown>;
 
-export type AptosSender = {
-  xpub: string;
-  freshAddress: string;
-};
-
 export type AptosFeeParameters = {
   gasLimit: bigint;
   gasPrice: bigint;

package/lib/logic/getBalance.d.ts

@@ -1,5 +0,0 @@
-import type { Balance } from "@ledgerhq/coin-framework/lib/api/types";
-import type { AptosAsset } from "../types/assets";
-import type { AptosAPI } from "../network";
-export declare function getBalance(aptosClient: AptosAPI, address: string): Promise<Balance<AptosAsset>[]>;
-//# sourceMappingURL=getBalance.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"getBalance.d.ts","sourceRoot":"","sources":["../../src/logic/getBalance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,wBAAsB,UAAU,CAC9B,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAOhC"}

package/lib/logic/getBalance.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBalance = void 0;
-async function getBalance(aptosClient, address) {
-    const balance = await aptosClient.getBalances(address);
-    return balance.map(x => ({
-        value: BigInt(x.amount.toString()),
-        asset: { type: "native" },
-    }));
-}
-exports.getBalance = getBalance;
-//# sourceMappingURL=getBalance.js.map

package/lib/logic/getBalance.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../src/logic/getBalance.ts"],"names":[],"mappings":";;;AAIO,KAAK,UAAU,UAAU,CAC9B,WAAqB,EACrB,OAAe;IAEf,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC1B,CAAC,CAAC,CAAC;AACN,CAAC;AAVD,gCAUC"}

package/lib-es/logic/getBalance.d.ts

@@ -1,5 +0,0 @@
-import type { Balance } from "@ledgerhq/coin-framework/lib/api/types";
-import type { AptosAsset } from "../types/assets";
-import type { AptosAPI } from "../network";
-export declare function getBalance(aptosClient: AptosAPI, address: string): Promise<Balance<AptosAsset>[]>;
-//# sourceMappingURL=getBalance.d.ts.map

package/lib-es/logic/getBalance.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBalance.d.ts","sourceRoot":"","sources":["../../src/logic/getBalance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,wBAAsB,UAAU,CAC9B,WAAW,EAAE,QAAQ,EACrB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAOhC"}

package/lib-es/logic/getBalance.js

@@ -1,8 +0,0 @@
-export async function getBalance(aptosClient, address) {
-    const balance = await aptosClient.getBalances(address);
-    return balance.map(x => ({
-        value: BigInt(x.amount.toString()),
-        asset: { type: "native" },
-    }));
-}
-//# sourceMappingURL=getBalance.js.map

package/lib-es/logic/getBalance.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getBalance.js","sourceRoot":"","sources":["../../src/logic/getBalance.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,WAAqB,EACrB,OAAe;IAEf,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAEvD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QAClC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;KAC1B,CAAC,CAAC,CAAC;AACN,CAAC"}

package/src/logic/getBalance.ts

@@ -1,15 +0,0 @@
-import type { Balance } from "@ledgerhq/coin-framework/lib/api/types";
-import type { AptosAsset } from "../types/assets";
-import type { AptosAPI } from "../network";
-
-export async function getBalance(
-  aptosClient: AptosAPI,
-  address: string,
-): Promise<Balance<AptosAsset>[]> {
-  const balance = await aptosClient.getBalances(address);
-
-  return balance.map(x => ({
-    value: BigInt(x.amount.toString()),
-    asset: { type: "native" },
-  }));
-}