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

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

@@ -1,98 +1,44 @@
 import { AptosAPI } from "../../network";
-import { APTOS_ASSET_ID, TOKEN_TYPE } from "../../constants";
-import type { AptosConfig } from "../../config";
-import { createApi } from "../../api";
-
-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;
+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(),
+    })),
+  };
+});
 
 describe("getBalance", () => {
-  beforeEach(() => {
-    mockedAptosApi = jest.mocked(AptosAPI);
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  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" } },
-    ]);
-  });
+  let mockGetBalances: jest.Mock;
 
-  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";
+  beforeEach(() => {
+    jest.clearAllMocks();
 
-    const api = createApi(mockAptosConfig);
-    expect(await api.getBalance(accountAddress)).toStrictEqual([]);
-  });
+    mockGetBalances = jest
+      .fn()
+      .mockResolvedValue([{ asset_type: APTOS_ASSET_ID, amount: 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 }]),
+    (AptosAPI as jest.Mock).mockImplementation(() => ({
+      getBalances: mockGetBalances,
     }));
-
-    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 },
-      },
-    ]);
+  afterEach(() => {
+    jest.clearAllMocks();
   });
 
-  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 }]),
-    }));
+  it("should returns balance with value 10", async () => {
+    mockGetBalances.mockResolvedValue([{ asset_type: APTOS_ASSET_ID, amount: new BigNumber(10) }]);
 
-    const api = createApi(mockAptosConfig);
     const accountAddress = "0x4be47904b31063d60ac0dfde06e5dc203e647edbe853bae0e666ae5a763c3906";
+    const client = new AptosAPI("aptos");
+    const balance = await getBalance(client, accountAddress);
 
-    expect(await api.getBalance(accountAddress)).toStrictEqual([
-      {
-        value: 25n,
-        asset: {
-          type: "token",
-          contractAddress: TOKEN_ASSET_ID,
-          standard: TOKEN_TYPE.FUNGIBLE_ASSET,
-        },
-      },
-    ]);
+    expect(balance).toBeDefined();
+    expect(balance).toMatchObject([{ value: BigInt(10), asset: { type: "native" } }]);
+    expect(mockGetBalances).toHaveBeenCalledWith(accountAddress);
   });
 });

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

@@ -1,6 +1,7 @@
 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", () => {
@@ -11,20 +12,18 @@ describe("createApi", () => {
       indexer: getEnv("APTOS_INDEXER_ENDPOINT"),
     },
   });
-  const assetTypeNative = "native";
-  const assetTypeToken = "token";
 
-  const sender = {
+  const sender: AptosSender = {
     xpub: "0x934887885b27a0407bf8a5e0bbc6b6371254bea94de5510e948bcc92dc0a519b",
     freshAddress: "0x0ef3b40f6ecd5583218d1985e0d54b54e8785ad2ec2d27ed1720ec16bb11686f",
   };
 
-  const recipient = {
+  const recipient: AptosSender = {
     xpub: "0x7fd6bfaac17c2c763f624b1f95cd4911e3646a5b777b03cc24f93ed0ac3f3e2b",
     freshAddress: "0x4859a161dfe13081cf5a5eac409cd38f707c06176a21ddc875260c2ce63f3a28",
   };
 
-  const tokenAccount = {
+  const tokenAccount: AptosSender = {
     xpub: "0xeacada8192f15185637e475d7783e14486e232d8b9978ffa127383847ffc5318",
     freshAddress: "0xb8922507317d85197d70c2bc1afc949c759fd0a62c8841a4300d1e2b63649bf6",
   };
@@ -57,8 +56,7 @@ describe("createApi", () => {
           type: "native",
         },
         type: "send",
-        sender: sender.freshAddress,
-        senderPublicKey: sender.xpub,
+        sender,
         amount,
         recipient: recipient.freshAddress,
       });
@@ -77,8 +75,7 @@ describe("createApi", () => {
             "0x50788befc1107c0cc4473848a92e5c783c635866ce3c98de71d2eeb7d2a34f85::usdc_coin::USDCoin",
         },
         type: "send",
-        sender: sender.freshAddress,
-        senderPublicKey: sender.xpub,
+        sender,
         amount,
         recipient: recipient.freshAddress,
       });
@@ -96,8 +93,7 @@ describe("createApi", () => {
           contractAddress: "0x357b0b74bc833e95a115ad22604854d6b0fca151cecd94111770e5d6ffc9dc2b",
         },
         type: "send",
-        sender: sender.freshAddress,
-        senderPublicKey: sender.xpub,
+        sender,
         amount,
         recipient: recipient.freshAddress,
       });
@@ -111,8 +107,7 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 1n,
-          sender: sender.freshAddress,
-          senderPublicKey: sender.xpub,
+          sender: sender,
           recipient: recipient.freshAddress,
           type: "send",
           asset: { type: "native" },
@@ -133,8 +128,7 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 1n,
-          sender: sender.freshAddress,
-          senderPublicKey: sender.xpub,
+          sender: sender,
           recipient: recipient.freshAddress,
           type: "send",
           asset: {
@@ -160,8 +154,7 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 0n,
-          sender: sender.freshAddress,
-          senderPublicKey: sender.xpub,
+          sender: sender,
           recipient: recipient.freshAddress,
           type: "send",
           asset: {
@@ -189,8 +182,7 @@ describe("createApi", () => {
       const hex = await api.craftTransaction(
         {
           amount: 0n,
-          sender: s.freshAddress,
-          senderPublicKey: s.xpub,
+          sender: s,
           recipient: r.freshAddress,
           type: "send",
           asset: {
@@ -212,25 +204,12 @@ describe("createApi", () => {
     });
   });
 
-  describe("getBalances", () => {
-    it("returned balances should have one native asset", async () => {
+  describe("getBalance", () => {
+    it("return balances from account", 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);
-    });
 
-    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);
+      expect(balances.length).toBeGreaterThan(0);
+      expect(balances[0].value).toBeGreaterThanOrEqual(0);
     });
   });
 

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

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

package/src/__tests__/bridge/synchronisation.test.ts

@@ -798,15 +798,10 @@ describe("getAccountShape", () => {
       blockHeight: 316278241,
     }));
 
-    const TOKEN_CONTRACT_ADDRESS = "0xd111::staked_coin::StakedAptos";
-
-    const mockGetBalances = jest
-      .fn()
-      .mockResolvedValue([{ contractAddress: TOKEN_CONTRACT_ADDRESS, amount: BigNumber(1234567) }]);
-
+    const mockGetBalance = jest.fn().mockImplementation(() => BigNumber(5000000));
     mockedAptosAPI.mockImplementation(() => ({
-      getBalances: mockGetBalances,
       getAccountInfo: mockGetAccountInfo,
+      getBalance: mockGetBalance,
     }));
 
     const mockGetAccountSpy = jest.spyOn({ getAccount: mockGetAccountInfo }, "getAccount");
@@ -1317,14 +1312,9 @@ describe("getSubAccountShape", () => {
   ] as Operation[];
 
   it("returns the correct information", async () => {
-    const TOKEN_CONTRACT_ADDRESS = "0xd111::staked_coin::StakedAptos";
-
-    const mockGetBalances = jest
-      .fn()
-      .mockResolvedValue([{ contractAddress: TOKEN_CONTRACT_ADDRESS, amount: BigNumber(1234567) }]);
-
+    const mockGetBalance = jest.fn().mockImplementation(() => BigNumber(1234567));
     mockedAptosAPI.mockImplementation(() => ({
-      getBalances: mockGetBalances,
+      getBalance: mockGetBalance,
     }));
 
     const subAccount = await getSubAccountShape(currency, address, parentId, token, operations);
@@ -1431,14 +1421,9 @@ describe("getSubAccounts", () => {
   ] as Operation[];
 
   it("returns the correct information", async () => {
-    const TOKEN_CONTRACT_ADDRESS = "0xd111::staked_coin::StakedAptos";
-
-    const mockGetBalances = jest
-      .fn()
-      .mockResolvedValue([{ contractAddress: TOKEN_CONTRACT_ADDRESS, amount: BigNumber(1234567) }]);
-
+    const mockGetBalance = jest.fn().mockImplementation(() => BigNumber(1234567));
     mockedAptosAPI.mockImplementation(() => ({
-      getBalances: mockGetBalances,
+      getBalance: mockGetBalance,
     }));
 
     mockedDecodeTokenAccountId.mockReturnValue({