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

package/src/test/bot-specs.ts

@@ -5,9 +5,8 @@ import BigNumber from "bignumber.js";
 import type { Transaction } from "../types";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { genericTestDestination, pickSiblings, botTest } from "@ledgerhq/coin-framework/bot/specs";
-import type { AppSpec, TransactionTestInput } from "@ledgerhq/coin-framework/bot/types";
-import { acceptTokenTransaction, acceptTransaction } from "./speculos-deviceActions";
-import { Account, TokenAccount } from "@ledgerhq/types-live";
+import type { AppSpec } from "@ledgerhq/coin-framework/bot/types";
+import { acceptTransaction } from "./speculos-deviceActions";
 
 const MIN_SAFE = new BigNumber(0.0001);
 const maxAccount = 6;
@@ -20,7 +19,7 @@ const aptosSpecs: AppSpec<Transaction> = {
     appName: "Aptos",
   },
   genericDeviceAction: acceptTransaction,
-  testTimeout: 2 * 60 * 1000,
+  testTimeout: 6 * 60 * 1000,
   minViableAmount: MIN_SAFE,
   transactionCheck: ({ maxSpendable }) => {
     invariant(maxSpendable.gt(MIN_SAFE), "balance is too low");
@@ -85,68 +84,9 @@ const aptosSpecs: AppSpec<Transaction> = {
         );
       },
     },
-    {
-      name: "Send ~50% of token amount",
-      feature: "tokens",
-      maxRun: 1,
-      deviceAction: acceptTokenTransaction,
-      transaction: ({ account, bridge, siblings, maxSpendable }) => {
-        invariant(maxSpendable.gt(MIN_SAFE), "Balance is too low");
-
-        const senderTokenAcc = findTokenSubAccountWithBalance(account);
-        invariant(senderTokenAcc, "Sender token account with available balance not found");
-
-        const sibling = pickSiblings(siblings, maxAccount);
-
-        const recipientTokenAcc = findTokenSubAccountWithBalance(sibling);
-        invariant(recipientTokenAcc, "Receiver token account with available balance not found");
-
-        const amount = senderTokenAcc.spendableBalance.div(2).integerValue();
-        const recipient = sibling.freshAddress;
-        const transaction = bridge.createTransaction(account);
-        const subAccountId = senderTokenAcc.id;
-
-        return {
-          transaction,
-          updates: [{ subAccountId }, { recipient }, { amount }],
-        };
-      },
-      test: input => {
-        expectTokenAccountCorrectBalanceChange(input);
-      },
-    },
   ],
 };
 
-function findTokenSubAccountWithBalance(account: Account) {
-  return account.subAccounts?.find(acc => acc.type === "TokenAccount" && acc.balance.gt(0)) as
-    | TokenAccount
-    | undefined;
-}
-
-function expectTokenAccountCorrectBalanceChange({
-  account,
-  accountBeforeTransaction,
-  status,
-  transaction,
-}: TransactionTestInput<Transaction>) {
-  const tokenAccId = transaction.subAccountId;
-  if (!tokenAccId) throw new Error("Wrong subAccountId");
-
-  const tokenAccAfterTx = account.subAccounts?.find(acc => acc.id === tokenAccId);
-  const tokenAccBeforeTx = accountBeforeTransaction.subAccounts?.find(acc => acc.id === tokenAccId);
-
-  if (!tokenAccAfterTx || !tokenAccBeforeTx) {
-    throw new Error("Token sub accounts not found!");
-  }
-
-  botTest("Token balance decreased with operation", () =>
-    expect(tokenAccAfterTx.balance.toString()).toBe(
-      tokenAccBeforeTx.balance.minus(status.amount).toString(),
-    ),
-  );
-}
-
 export default {
   aptosSpecs,
 };

package/src/test/bridgeDatasetTest.ts

@@ -1,4 +1,6 @@
 import { CurrenciesData, DatasetTest } from "@ledgerhq/types-live";
+import BigNumber from "bignumber.js";
+import { fromTransactionRaw } from "../bridge/transaction";
 import { Transaction } from "../types";
 
 const aptos: CurrenciesData<Transaction> = {
@@ -20,73 +22,85 @@ const aptos: CurrenciesData<Transaction> = {
   accounts: [
     {
       raw: {
-        id: "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos",
+        id: "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:",
         seedIdentifier: "d6816f4f22f867b56cf9304b776f452a16d107835d73ee8a33c4ced210300583",
         used: true,
-        derivationMode: "aptos",
+        derivationMode: "",
         index: 0,
         freshAddress: "0x445fa0013887abd1a0c14acdec6e48090e0ad3fed3e08202aac15ca14f3be26b",
         freshAddressPath: "44'/637'/0'/0'/0'",
-        blockHeight: 302459501,
+        blockHeight: 286066372,
         creationDate: "2024-12-18T12:26:31.070Z",
-        operationsCount: 6,
+        operationsCount: 5,
         operations: [],
         pendingOperations: [],
         currencyId: "aptos",
-        lastSyncDate: "2025-03-12T10:42:53.570Z",
-        balance: "19949100",
-        spendableBalance: "19949100",
+        lastSyncDate: "2025-02-04T14:00:46.693Z",
+        balance: "30100",
+        spendableBalance: "30100",
         balanceHistoryCache: {
           HOUR: {
             balances: [
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 19949100, 19949100, 19949100, 19949100, 19949100, 19949100, 19949100, 19949100,
-              19949100, 19949100, 19949100, 19949100, 19949100, 19949100, 19949100, 19949100,
-              19949100, 19949100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100,
             ],
-            latestDate: 1741773600000,
+            latestDate: 1738677600000,
           },
           DAY: {
             balances: [
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-              19949100,
+              0, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
+              30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100, 30100,
             ],
-            latestDate: 1741737600000,
+            latestDate: 1738627200000,
+          },
+          WEEK: {
+            balances: [0, 30100, 30100, 30100, 30100, 30100, 30100, 30100],
+            latestDate: 1738454400000,
           },
-          WEEK: { balances: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], latestDate: 1741478400000 },
         },
         xpub: "d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956",
-        subAccounts: [
-          {
-            type: "TokenAccountRaw",
-            id: "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos+aptos%2Fcoin%2Fdstapt~!underscore!~0xd11107bdf0d6d7040c6c0bfbdecb6545191fdf13e8d8d259952f53e1713f61b5%3A%3Astaked~!underscore!~coin%3A%3Astakedaptos",
-            parentId:
-              "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos",
-            tokenId:
-              "aptos/coin/dstapt_0xd11107bdf0d6d7040c6c0bfbdecb6545191fdf13e8d8d259952f53e1713f61b5::staked_coin::stakedaptos",
-            balance: "30000000",
-            spendableBalance: "30000000",
-            balanceHistoryCache: {
-              HOUR: { latestDate: null, balances: [] },
-              DAY: { latestDate: null, balances: [] },
-              WEEK: { latestDate: null, balances: [] },
-            },
-            creationDate: "2025-03-12T10:42:53.570Z",
-            operationsCount: 2,
-            operations: [],
-            pendingOperations: [],
-            swapHistory: [],
-          },
-        ],
         swapHistory: [],
       },
+      transactions: [
+        {
+          name: "NO_NAME",
+          transaction: fromTransactionRaw({
+            amount: "1000",
+            recipient: "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
+            useAllAmount: false,
+            subAccountId: null,
+            family: "aptos",
+            mode: "send",
+            fees: "900",
+            options: '{"maxGasAmount":"9","gasUnitPrice":"100"}',
+            errors: "{}",
+          }),
+          expectedStatus: () =>
+            // you can use account and transaction for smart logic. drop the =>fn otherwise
+            ({
+              errors: {},
+              warnings: {},
+              amount: BigNumber("1000"),
+            }),
+        },
+      ],
     },
   ],
 };

package/src/test/speculos-deviceActions.ts

@@ -10,7 +10,7 @@ export const acceptTransaction: DeviceAction<Transaction, State<Transaction>> =
       button: SpeculosButton.RIGHT,
     },
     {
-      title: "Transaction Type",
+      title: "Transaction",
       button: SpeculosButton.RIGHT,
     },
     {
@@ -18,57 +18,21 @@ export const acceptTransaction: DeviceAction<Transaction, State<Transaction>> =
       button: SpeculosButton.RIGHT,
     },
     {
-      title: "Amount",
-      button: SpeculosButton.RIGHT,
-    },
-    {
-      title: "To (1/2)",
-      button: SpeculosButton.RIGHT,
-    },
-    {
-      title: "To (2/2)",
-      button: SpeculosButton.RIGHT,
-    },
-    {
-      title: "Gas Fee",
-      button: SpeculosButton.RIGHT,
-    },
-    {
-      title: "Approve",
-      button: SpeculosButton.BOTH,
-    },
-  ],
-});
-
-export const acceptTokenTransaction: DeviceAction<
-  Transaction,
-  State<Transaction>
-> = deviceActionFlow({
-  steps: [
-    {
-      title: "Review",
+      title: "Coin Type",
       button: SpeculosButton.RIGHT,
     },
     {
-      title: "Transaction Type",
+      title: "Receiver (1/2)",
       button: SpeculosButton.RIGHT,
     },
     {
-      title: "Function",
+      title: "Receiver (2/2)",
       button: SpeculosButton.RIGHT,
     },
     {
       title: "Amount",
       button: SpeculosButton.RIGHT,
     },
-    {
-      title: "To (1/2)",
-      button: SpeculosButton.RIGHT,
-    },
-    {
-      title: "To (2/2)",
-      button: SpeculosButton.RIGHT,
-    },
     {
       title: "Gas Fee",
       button: SpeculosButton.RIGHT,

package/src/types/index.ts

@@ -69,20 +69,6 @@ export type TransactionRaw = TransactionCommonRaw & {
   errors?: string;
 };
 
-export type AptosFungibleStoreResourceData = {
-  balance: BigNumber;
-  frozen: boolean;
-  metadata: { inner: string };
-};
-
-export type AptosFungibleoObjectCoreResourceData = {
-  owner: string;
-};
-
-export type AptosMoveResourceData = {
-  guid: { id: { addr: string; creation_num: string } };
-};
-
 export type AptosMoveResource = {
-  [key: string]: AptosMoveResourceData;
+  [key: string]: { guid: { id: { addr: string; creation_num: string } } };
 };