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

package/lib-es/network/client.js

@@ -42,12 +42,12 @@ export class AptosAPI {
     }
     async getAccountInfo(address, startAt) {
         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,
         };
@@ -103,12 +103,6 @@ export class AptosAPI {
         });
         return pendingTx.data.hash;
     }
-    async getBalance(address, token) {
-        if (token.tokenType === "coin") {
-            return await this.getCoinBalance(address, token.contractAddress);
-        }
-        return await this.getFABalance(address, token.contractAddress);
-    }
     async getLastBlock() {
         const { block_height } = await this.aptosClient.getLedgerInfo();
         const block = await this.aptosClient.getBlockByHeight({ blockHeight: Number(block_height) });
@@ -118,46 +112,8 @@ export class AptosAPI {
             time: new Date(Number(block.block_timestamp) / 1_000),
         };
     }
-    async getCoinBalance(address, contract_address) {
-        try {
-            const [balanceStr] = await this.aptosClient.view({
-                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, contract_address) {
-        try {
-            const [balanceStr] = await this.aptosClient.view({
-                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) {
-        const publicKeyEd = new Ed25519PublicKey(transactionIntent.sender.xpub);
+        const publicKeyEd = new Ed25519PublicKey(transactionIntent?.senderPublicKey ?? "");
         const txPayload = {
             function: "0x1::aptos_account::transfer_coins",
             typeArguments: [APTOS_ASSET_ID],
@@ -183,7 +139,7 @@ export class AptosAPI {
             maxGasAmount: DEFAULT_GAS.toString(),
             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];
         const gasLimit = new BigNumber(completedTx.gas_used).multipliedBy(ESTIMATE_GAS_MUL);
@@ -192,6 +148,7 @@ export class AptosAPI {
         return {
             value: BigInt(expectedGas.toString()),
             parameters: {
+                storageLimit: BigInt(0),
                 gasLimit: BigInt(gasLimit.toString()),
                 gasPrice: BigInt(gasPrice.toString()),
             },
@@ -256,21 +213,30 @@ export class AptosAPI {
             hash: block.block_hash,
         };
     }
-    async getBalances(address) {
-        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, contractAddress) {
+        try {
+            const whereCondition = {
+                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: "" }];
+        }
     }
 }
 //# sourceMappingURL=client.js.map

package/lib-es/network/client.js.map

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

package/lib-es/types/assets.d.ts

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

package/lib-es/types/assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAEhE,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAEtD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/types/assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAEhE,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAEtD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-aptos",
-  "version": "2.2.0-next.1",
+  "version": "2.2.0-nightly.1",
   "description": "Ledger Aptos Coin integration",
   "keywords": [
     "Ledger",
@@ -90,14 +90,14 @@
     "invariant": "^2.2.4",
     "lodash": "^4.17.21",
     "rxjs": "^7.8.1",
-    "@ledgerhq/coin-framework": "^5.3.0-next.1",
-    "@ledgerhq/cryptoassets": "^13.18.1-next.0",
+    "@ledgerhq/coin-framework": "^5.3.0-nightly.1",
+    "@ledgerhq/cryptoassets": "^13.18.1-nightly.0",
     "@ledgerhq/devices": "8.4.6",
     "@ledgerhq/errors": "^6.21.0",
-    "@ledgerhq/live-env": "^2.10.0-next.0",
-    "@ledgerhq/live-network": "^2.0.10-next.0",
+    "@ledgerhq/live-env": "^2.9.1-nightly.0",
+    "@ledgerhq/live-network": "^2.0.9",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/types-live": "^6.73.0-next.0"
+    "@ledgerhq/types-live": "^6.73.0-nightly.1"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.4.0",

package/src/__tests__/api/craftTransaction.unit.test.ts

@@ -1,7 +1,7 @@
 import { Hex, RawTransaction, Deserializer } from "@aptos-labs/ts-sdk";
-import type { TransactionIntent } from "@ledgerhq/coin-framework/lib/api/types";
+import type { TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import { createApi } from "../../api";
-import type { AptosAsset, AptosExtra, AptosSender } from "../../types/assets";
+import type { AptosAsset } from "../../types/assets";
 import { AptosAPI } from "../../network";
 import { APTOS_ASSET_ID } from "../../constants";
 
@@ -41,20 +41,17 @@ describe("craftTransaction", () => {
       getBalances: mockGetBalances,
     }));
 
-    const SENDER: AptosSender = {
-      xpub: "public-key",
-      freshAddress: SENDER_ADDR,
-    };
     const api = createApi({
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
+    const txArg: TransactionIntent<AptosAsset> = {
       type: "send",
-      sender: SENDER,
+      sender: SENDER_ADDR,
+      senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 10n,
-      asset: { type: "native" },
+      asset: { type: "token", standard: "coin", contractAddress: "0x42::token::Token" },
     };
 
     const tx = await api.craftTransaction(txArg);
@@ -65,10 +62,10 @@ describe("craftTransaction", () => {
     expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
 
     expect(mockGenerateTransaction).toHaveBeenCalledWith(
-      SENDER.freshAddress,
+      SENDER_ADDR,
       expect.objectContaining({
         function: "0x1::aptos_account::transfer_coins",
-        typeArguments: [APTOS_ASSET_ID],
+        typeArguments: ["0x42::token::Token"],
         functionArguments: [RECIPIENT_ADDR, txArg.amount.toString()],
       }),
       expect.anything(),
@@ -85,17 +82,14 @@ describe("craftTransaction", () => {
       getBalances: mockGetBalances,
     }));
 
-    const SENDER: AptosSender = {
-      xpub: "public-key",
-      freshAddress: SENDER_ADDR,
-    };
     const api = createApi({
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
+    const txArg: TransactionIntent<AptosAsset> = {
       type: "send",
-      sender: SENDER,
+      sender: SENDER_ADDR,
+      senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 0n,
       asset: { type: "native" },
@@ -109,7 +103,7 @@ describe("craftTransaction", () => {
     expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
 
     expect(mockGenerateTransaction).toHaveBeenCalledWith(
-      SENDER.freshAddress,
+      SENDER_ADDR,
       expect.objectContaining({
         function: "0x1::aptos_account::transfer_coins",
         typeArguments: [APTOS_ASSET_ID],
@@ -129,17 +123,14 @@ describe("craftTransaction", () => {
       getBalances: mockGetBalances,
     }));
 
-    const SENDER: AptosSender = {
-      xpub: "public-key",
-      freshAddress: SENDER_ADDR,
-    };
     const api = createApi({
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
+    const txArg: TransactionIntent<AptosAsset> = {
       type: "send",
-      sender: SENDER,
+      sender: SENDER_ADDR,
+      senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 10n,
       asset: { type: "token", standard: "coin", contractAddress: "0x42::token::Token" },
@@ -153,7 +144,7 @@ describe("craftTransaction", () => {
     expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
 
     expect(mockGenerateTransaction).toHaveBeenCalledWith(
-      SENDER.freshAddress,
+      SENDER_ADDR,
       expect.objectContaining({
         function: "0x1::aptos_account::transfer_coins",
         typeArguments: ["0x42::token::Token"],
@@ -173,17 +164,14 @@ describe("craftTransaction", () => {
       getBalances: mockGetBalances,
     }));
 
-    const SENDER: AptosSender = {
-      xpub: "public-key",
-      freshAddress: SENDER_ADDR,
-    };
     const api = createApi({
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
+    const txArg: TransactionIntent<AptosAsset> = {
       type: "send",
-      sender: SENDER,
+      sender: SENDER_ADDR,
+      senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 0n,
       asset: { type: "token", standard: "fungible_asset", contractAddress: "0x42" },
@@ -197,7 +185,7 @@ describe("craftTransaction", () => {
     expect(mockGenerateTransaction).toHaveBeenCalledTimes(1);
 
     expect(mockGenerateTransaction).toHaveBeenCalledWith(
-      SENDER.freshAddress,
+      SENDER_ADDR,
       expect.objectContaining({
         function: "0x1::primary_fungible_store::transfer",
         typeArguments: ["0x1::fungible_asset::Metadata"],
@@ -217,17 +205,14 @@ describe("craftTransaction", () => {
       getBalances: mockGetBalances,
     }));
 
-    const SENDER: AptosSender = {
-      xpub: "public-key",
-      freshAddress: SENDER_ADDR,
-    };
     const api = createApi({
       aptosSettings: {},
     });
 
-    const txArg: TransactionIntent<AptosAsset, AptosExtra, AptosSender> = {
+    const txArg: TransactionIntent<AptosAsset> = {
       type: "send",
-      sender: SENDER,
+      sender: SENDER_ADDR,
+      senderPublicKey: "public-key",
       recipient: RECIPIENT_ADDR,
       amount: 10n,
       asset: { type: "token", standard: "asset", contractAddress: "0x42::token::Token" },

package/src/__tests__/api/getBalance.unit.test.ts

@@ -1,44 +1,98 @@
 import { AptosAPI } from "../../network";
-import { getBalance } from "../../logic/getBalance";
-import { APTOS_ASSET_ID } from "../../constants";
-import BigNumber from "bignumber.js";
-
-jest.mock("../../network", () => {
-  return {
-    AptosAPI: jest.fn().mockImplementation(() => ({
-      getBalances: jest.fn(),
-    })),
-  };
-});
+import { APTOS_ASSET_ID, TOKEN_TYPE } from "../../constants";
+import type { AptosConfig } from "../../config";
+import { createApi } from "../../api";
 
-describe("getBalance", () => {
-  let mockGetBalances: jest.Mock;
+jest.mock("@aptos-labs/ts-sdk");
+let mockedAptosApi: jest.Mocked<any>;
+jest.mock("../../network");
+jest.mock("../../config", () => ({
+  setCoinConfig: jest.fn(),
+}));
 
+const mockAptosConfig: AptosConfig = {} as AptosConfig;
+
+describe("getBalance", () => {
   beforeEach(() => {
-    jest.clearAllMocks();
+    mockedAptosApi = jest.mocked(AptosAPI);
+  });
 
-    mockGetBalances = jest
-      .fn()
-      .mockResolvedValue([{ asset_type: APTOS_ASSET_ID, amount: BigNumber(10) }]);
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
 
-    (AptosAPI as jest.Mock).mockImplementation(() => ({
-      getBalances: mockGetBalances,
+  it("should return balance with value 10", async () => {
+    mockedAptosApi.mockImplementation(() => ({
+      getBalances: jest.fn().mockResolvedValue([{ contractAddress: APTOS_ASSET_ID, amount: 10n }]),
     }));
+
+    const api = createApi(mockAptosConfig);
+    const accountAddress = "0x4be47904b31063d60ac0dfde06e5dc203e647edbe853bae0e666ae5a763c3906";
+
+    expect(await api.getBalance(accountAddress)).toStrictEqual([
+      { value: 10n, asset: { type: "native" } },
+    ]);
   });
 
-  afterEach(() => {
-    jest.clearAllMocks();
+  it("should return empty array when no contract_address and no data", async () => {
+    mockedAptosApi.mockImplementation(() => ({
+      getBalances: jest.fn().mockResolvedValue([]),
+    }));
+
+    const accountAddress = "0xno_contract_and_no_data";
+
+    const api = createApi(mockAptosConfig);
+    expect(await api.getBalance(accountAddress)).toStrictEqual([]);
   });
 
-  it("should returns balance with value 10", async () => {
-    mockGetBalances.mockResolvedValue([{ asset_type: APTOS_ASSET_ID, amount: new BigNumber(10) }]);
+  it("should return balance with 'native' contract_address (APTOS_ASSET_ID)", async () => {
+    mockedAptosApi.mockImplementation(() => ({
+      getBalances: jest.fn().mockResolvedValue([{ contractAddress: APTOS_ASSET_ID, amount: 15n }]),
+    }));
+
+    const api = createApi(mockAptosConfig);
+    const accountAddress = "0x4be47904b31063d60ac0dfde06e5dc203e647edbe853bae0e666ae5a763c3906";
+
+    expect(await api.getBalance(accountAddress)).toStrictEqual([
+      { value: 15n, asset: { type: "native" } },
+    ]);
+  });
+
+  it("should return token balance when contract_address is a coin token", async () => {
+    const TOKEN_ASSET_ID = "0x1::my_token::Token";
+    mockedAptosApi.mockImplementation(() => ({
+      getBalances: jest.fn().mockResolvedValue([{ contractAddress: TOKEN_ASSET_ID, amount: 25n }]),
+    }));
+
+    const api = createApi(mockAptosConfig);
+    const accountAddress = "0x4be47904b31063d60ac0dfde06e5dc203e647edbe853bae0e666ae5a763c3906";
+
+    expect(await api.getBalance(accountAddress)).toStrictEqual([
+      {
+        value: 25n,
+        asset: { type: "token", contractAddress: TOKEN_ASSET_ID, standard: TOKEN_TYPE.COIN },
+      },
+    ]);
+  });
+
+  it("should return token balance when contract_address is a fungible_asset token", async () => {
+    const TOKEN_ASSET_ID = "0x1";
+    mockedAptosApi.mockImplementation(() => ({
+      getBalances: jest.fn().mockResolvedValue([{ contractAddress: TOKEN_ASSET_ID, amount: 25n }]),
+    }));
 
+    const api = createApi(mockAptosConfig);
     const accountAddress = "0x4be47904b31063d60ac0dfde06e5dc203e647edbe853bae0e666ae5a763c3906";
-    const client = new AptosAPI("aptos");
-    const balance = await getBalance(client, accountAddress);
 
-    expect(balance).toBeDefined();
-    expect(balance).toMatchObject([{ value: BigInt(10), asset: { type: "native" } }]);
-    expect(mockGetBalances).toHaveBeenCalledWith(accountAddress);
+    expect(await api.getBalance(accountAddress)).toStrictEqual([
+      {
+        value: 25n,
+        asset: {
+          type: "token",
+          contractAddress: TOKEN_ASSET_ID,
+          standard: TOKEN_TYPE.FUNGIBLE_ASSET,
+        },
+      },
+    ]);
   });
 });

package/src/__tests__/api/index.integ.test.ts

@@ -1,7 +1,6 @@
 import { Deserializer, Hex, Network, RawTransaction } from "@aptos-labs/ts-sdk";
 import { createApi } from "../../api";
 import { getEnv } from "@ledgerhq/live-env";
-import type { AptosSender } from "../../types/assets";
 import { DEFAULT_GAS, DEFAULT_GAS_PRICE } from "../../constants";
 
 describe("createApi", () => {
@@ -12,18 +11,20 @@ describe("createApi", () => {
       indexer: getEnv("APTOS_INDEXER_ENDPOINT"),
     },
   });
+  const assetTypeNative = "native";
+  const assetTypeToken = "token";
 
-  const sender: AptosSender = {
+  const sender = {
     xpub: "0x934887885b27a0407bf8a5e0bbc6b6371254bea94de5510e948bcc92dc0a519b",
     freshAddress: "0x0ef3b40f6ecd5583218d1985e0d54b54e8785ad2ec2d27ed1720ec16bb11686f",
   };
 
-  const recipient: AptosSender = {
+  const recipient = {
     xpub: "0x7fd6bfaac17c2c763f624b1f95cd4911e3646a5b777b03cc24f93ed0ac3f3e2b",
     freshAddress: "0x4859a161dfe13081cf5a5eac409cd38f707c06176a21ddc875260c2ce63f3a28",
   };
 
-  const tokenAccount: AptosSender = {
+  const tokenAccount = {
     xpub: "0xeacada8192f15185637e475d7783e14486e232d8b9978ffa127383847ffc5318",
     freshAddress: "0xb8922507317d85197d70c2bc1afc949c759fd0a62c8841a4300d1e2b63649bf6",
   };
@@ -56,7 +57,8 @@ describe("createApi", () => {
           type: "native",
         },
         type: "send",
-        sender,
+        sender: sender.freshAddress,
+        senderPublicKey: sender.xpub,
         amount,
         recipient: recipient.freshAddress,
       });
@@ -75,7 +77,8 @@ describe("createApi", () => {
             "0x50788befc1107c0cc4473848a92e5c783c635866ce3c98de71d2eeb7d2a34f85::usdc_coin::USDCoin",
         },
         type: "send",
-        sender,
+        sender: sender.freshAddress,
+        senderPublicKey: sender.xpub,
         amount,
         recipient: recipient.freshAddress,
       });
@@ -93,7 +96,8 @@ describe("createApi", () => {
           contractAddress: "0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b",
         },
         type: "send",
-        sender,
+        sender: sender.freshAddress,
+        senderPublicKey: sender.xpub,
         amount,
         recipient: recipient.freshAddress,
       });
@@ -107,7 +111,8 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 1n,
-          sender: sender,
+          sender: sender.freshAddress,
+          senderPublicKey: sender.xpub,
           recipient: recipient.freshAddress,
           type: "send",
           asset: { type: "native" },
@@ -128,7 +133,8 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 1n,
-          sender: sender,
+          sender: sender.freshAddress,
+          senderPublicKey: sender.xpub,
           recipient: recipient.freshAddress,
           type: "send",
           asset: {
@@ -154,7 +160,8 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 0n,
-          sender: sender,
+          sender: sender.freshAddress,
+          senderPublicKey: sender.xpub,
           recipient: recipient.freshAddress,
           type: "send",
           asset: {
@@ -182,7 +189,8 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 0n,
-          sender: s,
+          sender: s.freshAddress,
+          senderPublicKey: s.xpub,
           recipient: r.freshAddress,
           type: "send",
           asset: {
@@ -204,12 +212,25 @@ describe("createApi", () => {
     });
   });
 
-  describe("getBalance", () => {
-    it("return balances from account", async () => {
+  describe("getBalances", () => {
+    it("returned balances should have one native asset", async () => {
       const balances = await api.getBalance(sender.freshAddress);
+      const nativeBalance = balances.filter(b => b.asset.type === assetTypeNative);
+      expect(nativeBalance.length).toBe(1);
+      expect(nativeBalance[0].value).toBeGreaterThan(0);
+    });
 
-      expect(balances.length).toBeGreaterThan(0);
-      expect(balances[0].value).toBeGreaterThanOrEqual(0);
+    it("returned balances should have a token asset", async () => {
+      const balances = await api.getBalance(tokenAccount.freshAddress);
+      const tokenBalances = balances.filter(
+        b =>
+          b.asset.type === assetTypeToken &&
+          b.asset.contractAddress ===
+            "0x2ebb2ccac5e027a87fa0e2e5f656a3a4238d6a48d93ec9b610d570fc0aa0df12",
+      );
+      expect(tokenBalances.length).toBeGreaterThan(0);
+      expect(balances.length).toBeGreaterThan(1);
+      expect(balances[0].value).toBeGreaterThan(0);
     });
   });
 

package/src/__tests__/api/index.test.ts

@@ -1,6 +1,6 @@
 import { Aptos } from "@aptos-labs/ts-sdk";
-import type { Api } from "@ledgerhq/coin-framework/api/types";
-import type { AptosAsset, AptosExtra, AptosFeeParameters, AptosSender } from "../../types/assets";
+import type { AlpacaApi } from "@ledgerhq/coin-framework/api/types";
+import type { AptosAsset } from "../../types/assets";
 import type { AptosConfig } from "../../config";
 import { createApi } from "../../api";
 import coinConfig from "../../config";
@@ -33,8 +33,7 @@ describe("createApi", () => {
   });
 
   it("should return an API object with alpaca api methods", () => {
-    const api: Api<AptosAsset, AptosExtra, AptosSender, AptosFeeParameters> =
-      createApi(mockAptosConfig);
+    const api: AlpacaApi<AptosAsset> = createApi(mockAptosConfig);
 
     // Check that methods are set with what we expect
     expect(api.broadcast).toBeDefined();
@@ -70,8 +69,7 @@ describe("lastBlock", () => {
       }),
     }));
 
-    const api: Api<AptosAsset, AptosExtra, AptosSender, AptosFeeParameters> =
-      createApi(mockAptosConfig);
+    const api: AlpacaApi<AptosAsset> = createApi(mockAptosConfig);
 
     expect(await api.lastBlock()).toStrictEqual({
       height: 123,