@ledgerhq/coin-aptos 1.4.0-nightly.1 → 1.4.0-nightly.3

package/lib-es/test/bot-specs.d.ts

@@ -1,7 +1,7 @@
-import type { AppSpec } from "@ledgerhq/coin-framework/bot/types";
 import type { Transaction } from "../types";
+import type { AppSpec } from "@ledgerhq/coin-framework/bot/types";
 declare const _default: {
-    aptos: AppSpec<Transaction>;
+    aptosSpecs: AppSpec<Transaction>;
 };
 export default _default;
 //# sourceMappingURL=bot-specs.d.ts.map

package/lib-es/test/bot-specs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot-specs.d.ts","sourceRoot":"","sources":["../../src/test/bot-specs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;;;;AA8E5C,wBAAyB"}
+{"version":3,"file":"bot-specs.d.ts","sourceRoot":"","sources":["../../src/test/bot-specs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAG5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;;;;AAkFlE,wBAEE"}

package/lib-es/test/bot-specs.js

@@ -1,24 +1,24 @@
 import invariant from "invariant";
+import expect from "expect";
 import { DeviceModelId } from "@ledgerhq/devices";
+import BigNumber from "bignumber.js";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
-import { parseCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index";
-import { botTest, genericTestDestination, pickSiblings } from "@ledgerhq/coin-framework/bot/specs";
+import { genericTestDestination, pickSiblings, botTest } from "@ledgerhq/coin-framework/bot/specs";
 import { acceptTransaction } from "./speculos-deviceActions";
-const currency = getCryptoCurrencyById("aptos");
-const minBalanceNewAccount = parseCurrencyUnit(currency.units[0], "0.0001");
-const maxAccountSiblings = 4;
-const aptos = {
+const MIN_SAFE = new BigNumber(0.0001);
+const maxAccount = 6;
+const aptosSpecs = {
     name: "Aptos",
-    currency,
+    currency: getCryptoCurrencyById("aptos"),
     appQuery: {
         model: DeviceModelId.nanoSP,
         appName: "Aptos",
     },
     genericDeviceAction: acceptTransaction,
-    testTimeout: 5 * 60 * 1000,
-    minViableAmount: minBalanceNewAccount,
+    testTimeout: 6 * 60 * 1000,
+    minViableAmount: MIN_SAFE,
     transactionCheck: ({ maxSpendable }) => {
-        invariant(maxSpendable.gt(minBalanceNewAccount), "balance is too low");
+        invariant(maxSpendable.gt(MIN_SAFE), "balance is too low");
     },
     mutations: [
         {
@@ -27,8 +27,8 @@ const aptos = {
             maxRun: 1,
             testDestination: genericTestDestination,
             transaction: ({ account, siblings, bridge, maxSpendable }) => {
-                invariant(maxSpendable.gt(minBalanceNewAccount), "balance is too low");
-                const sibling = pickSiblings(siblings, maxAccountSiblings);
+                invariant(maxSpendable.gt(MIN_SAFE), "balance is too low");
+                const sibling = pickSiblings(siblings, maxAccount);
                 const recipient = sibling.freshAddress;
                 const amount = maxSpendable.div(2).integerValue();
                 const transaction = bridge.createTransaction(account);
@@ -43,30 +43,36 @@ const aptos = {
                     updates,
                 };
             },
-            test: ({ account, accountBeforeTransaction, operation }) => {
-                botTest("account balance moved with operation.value", () => expect(account.balance.toString()).toBe(accountBeforeTransaction.balance.minus(operation.value).toString()));
+            test: ({ accountBeforeTransaction, operation, account }) => {
+                botTest("account spendable balance decreased with operation", () => expect(account.spendableBalance).toEqual(accountBeforeTransaction.spendableBalance.minus(operation.value)));
             },
         },
         {
-            name: "Send max",
-            maxRun: 2,
-            testDestination: genericTestDestination,
+            name: "Transfer Max",
+            feature: "sendMax",
+            maxRun: 1,
             transaction: ({ account, siblings, bridge }) => {
-                const sibling = pickSiblings(siblings, 4);
-                const recipient = sibling.freshAddress;
-                const transaction = bridge.createTransaction(account);
+                const updates = [
+                    {
+                        recipient: pickSiblings(siblings, maxAccount).freshAddress,
+                    },
+                    {
+                        useAllAmount: true,
+                    },
+                ];
                 return {
-                    transaction,
-                    updates: [{ recipient }, { useAllAmount: true }],
+                    transaction: bridge.createTransaction(account),
+                    updates,
                 };
             },
-            test: ({ account, accountBeforeTransaction, operation }) => {
-                botTest("Account balance should have decreased", () => {
-                    expect(account.balance.toNumber()).toEqual(accountBeforeTransaction.balance.minus(operation.value).toNumber());
-                });
+            testDestination: genericTestDestination,
+            test: ({ account }) => {
+                botTest("account spendable balance is zero", () => expect(account.spendableBalance.toString()).toBe("0"));
             },
         },
     ],
 };
-export default { aptos };
+export default {
+    aptosSpecs,
+};
 //# sourceMappingURL=bot-specs.js.map

package/lib-es/test/bot-specs.js.map

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

package/lib-es/test/cli.js

@@ -40,7 +40,11 @@ function inferTransactions(transactions) {
             const isDelisted = account.token.delisted === true;
             invariant(!isDelisted, "token is delisted");
         }
-        return Object.assign(Object.assign({}, transaction), { family: "aptos", subAccountId: account.type === AccountType.TokenAccount ? account.id : null });
+        return {
+            ...transaction,
+            family: "aptos",
+            subAccountId: account.type === AccountType.TokenAccount ? account.id : null,
+        };
     });
 }
 export default function makeCliTools() {

package/lib-es/test/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/test/cli.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,OAAO,GAAG;IACd;QACE,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,8CAA8C;KACrD;CACF,CAAC;AAEF,SAAS,aAAa,CAAC,OAAgB,EAAE,IAAyB;IAChE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,QAAQ,GAAc,CAAC,OAAO,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAEzB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;IAE9C,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACtC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,CACL,KAAK,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,EAAE,CAC7F,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,iBAAiB;gBACf,KAAK;gBACL,0BAA0B;gBAC1B,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChE,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,iBAAiB,CACxB,YAGE;IAEF,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE;QACxD,SAAS,CAAC,WAAW,CAAC,MAAM,KAAK,OAAO,EAAE,cAAc,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;YAC9C,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC;YACnD,SAAS,CAAC,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,gCACF,WAAW,KACd,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAC7D,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,YAAY;IAClC,OAAO;QACL,OAAO;QACP,aAAa;QACb,iBAAiB;KAClB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/test/cli.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,WAAW,CAAC;AAClC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,OAAO,GAAG;IACd;QACE,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,8CAA8C;KACrD;CACF,CAAC;AAEF,SAAS,aAAa,CAAC,OAAgB,EAAE,IAAyB;IAChE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,QAAQ,GAAc,CAAC,OAAO,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IAEzB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;IAE9C,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACtC,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,CACL,KAAK,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,EAAE,CAC7F,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACb,iBAAiB;gBACf,KAAK;gBACL,0BAA0B;gBAC1B,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChE,CAAC;QACJ,CAAC;QAED,OAAO,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,iBAAiB,CACxB,YAGE;IAEF,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE;QACxD,SAAS,CAAC,WAAW,CAAC,MAAM,KAAK,OAAO,EAAE,cAAc,CAAC,CAAC;QAE1D,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC;YAC9C,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC;YACnD,SAAS,CAAC,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO;YACL,GAAG,WAAW;YACd,MAAM,EAAE,OAAO;YACf,YAAY,EAAE,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;SAC7D,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,YAAY;IAClC,OAAO;QACL,OAAO;QACP,aAAa;QACb,iBAAiB;KAClB,CAAC;AACJ,CAAC"}

package/lib-es/test/speculos-deviceActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"speculos-deviceActions.d.ts","sourceRoot":"","sources":["../../src/test/speculos-deviceActions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAM5C,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAa3D,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CA+B1E,CAAC"}
+{"version":3,"file":"speculos-deviceActions.d.ts","sourceRoot":"","sources":["../../src/test/speculos-deviceActions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAE3D,eAAO,MAAM,iBAAiB,EAAE,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAuC1E,CAAC"}

package/lib-es/test/speculos-deviceActions.js

@@ -1,14 +1,4 @@
-import { deviceActionFlow, formatDeviceAmount, SpeculosButton, } from "@ledgerhq/coin-framework/bot/specs";
-const typeWording = {
-    send: "Send",
-    lock: "Lock",
-    unlock: "Unlock",
-    withdraw: "Withdraw",
-    vote: "Vote",
-    revoke: "Revoke",
-    activate: "Activate",
-    register: "Create Account",
-};
+import { deviceActionFlow, SpeculosButton } from "@ledgerhq/coin-framework/bot/specs";
 export const acceptTransaction = deviceActionFlow({
     steps: [
         {
@@ -16,26 +6,35 @@ export const acceptTransaction = deviceActionFlow({
             button: SpeculosButton.RIGHT,
         },
         {
-            title: "Type",
+            title: "Transaction",
+            button: SpeculosButton.RIGHT,
+        },
+        {
+            title: "Function",
+            button: SpeculosButton.RIGHT,
+        },
+        {
+            title: "Coin Type",
+            button: SpeculosButton.RIGHT,
+        },
+        {
+            title: "Receiver (1/2)",
+            button: SpeculosButton.RIGHT,
+        },
+        {
+            title: "Receiver (2/2)",
             button: SpeculosButton.RIGHT,
-            expectedValue: ({ transaction }) => {
-                return typeWording[transaction.mode];
-            },
         },
         {
             title: "Amount",
             button: SpeculosButton.RIGHT,
-            expectedValue: ({ account, status }) => formatDeviceAmount(account.currency, status.amount, {
-                forceFloating: true,
-            }),
         },
         {
-            title: "Address",
+            title: "Gas Fee",
             button: SpeculosButton.RIGHT,
-            expectedValue: ({ transaction }) => transaction.recipient,
         },
         {
-            title: "Accept",
+            title: "Approve",
             button: SpeculosButton.BOTH,
         },
     ],

package/lib-es/test/speculos-deviceActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"speculos-deviceActions.js","sourceRoot":"","sources":["../../src/test/speculos-deviceActions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,GACf,MAAM,oCAAoC,CAAC;AAG5C,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,QAAQ,EAAE,gBAAgB;CAC3B,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAkD,gBAAgB,CAAC;IAC/F,KAAK,EAAE;QACL;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,cAAc,CAAC,KAAK;YAC5B,aAAa,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;gBACjC,OAAO,WAAW,CAAC,WAAW,CAAC,IAAgC,CAAC,CAAC;YACnE,CAAC;SACF;QACD;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,cAAc,CAAC,KAAK;YAC5B,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CACrC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE;gBAClD,aAAa,EAAE,IAAI;aACpB,CAAC;SACL;QACD;YACE,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,cAAc,CAAC,KAAK;YAC5B,aAAa,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS;SAC1D;QACD;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,cAAc,CAAC,IAAI;SAC5B;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"speculos-deviceActions.js","sourceRoot":"","sources":["../../src/test/speculos-deviceActions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGtF,MAAM,CAAC,MAAM,iBAAiB,GAAkD,gBAAgB,CAAC;IAC/F,KAAK,EAAE;QACL;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,UAAU;YACjB,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,QAAQ;YACf,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,cAAc,CAAC,KAAK;SAC7B;QACD;YACE,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,cAAc,CAAC,IAAI;SAC5B;KACF;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-aptos",
-  "version": "1.4.0-nightly.1",
+  "version": "1.4.0-nightly.3",
   "description": "Ledger Aptos Coin integration",
   "keywords": [
     "Ledger",
@@ -87,16 +87,17 @@
     "bignumber.js": "^9.1.2",
     "graphql": "^16.10.0",
     "invariant": "^2.2.4",
+    "expect": "^27.4.6",
     "lodash": "^4.17.21",
     "rxjs": "^7.8.1",
-    "@ledgerhq/coin-framework": "^0.23.0-nightly.2",
-    "@ledgerhq/cryptoassets": "^13.10.0-nightly.0",
+    "@ledgerhq/coin-framework": "^0.24.1-nightly.0",
+    "@ledgerhq/cryptoassets": "^13.10.0-nightly.1",
     "@ledgerhq/devices": "8.4.4",
     "@ledgerhq/errors": "^6.19.1",
     "@ledgerhq/live-env": "^2.5.0",
     "@ledgerhq/live-network": "^2.0.4",
     "@ledgerhq/logs": "^6.12.0",
-    "@ledgerhq/types-live": "^6.58.0-nightly.2"
+    "@ledgerhq/types-live": "^6.58.0"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.4.0",
@@ -111,7 +112,7 @@
   },
   "scripts": {
     "clean": "rimraf lib lib-es",
-    "build": "tsc && tsc -m ES6 --outDir lib-es",
+    "build": "tsc --outDir lib --module commonjs --moduleResolution node10 && tsc -m ES6 --outDir lib-es",
     "coverage": "jest --coverage --testPathIgnorePatterns='/bridge.integration.test.ts|node_modules|lib-es|lib/' --coveragePathIgnorePatterns='src/test|src/types|src/index.ts|src/bridge/bridge.fixture.ts' --passWithNoTests && mv coverage/coverage-final.json coverage/coverage-aptos.json",
     "prewatch": "pnpm build",
     "watch": "tsc --watch",

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

@@ -42,8 +42,8 @@ describe("getFeesForTransaction Test", () => {
             success: false,
             vm_status: ["INSUFFICIENT_BALANCE"],
             expiration_timestamp_secs: 5,
-            gas_used: "201",
-            gas_unit_price: "101",
+            gas_used: "202",
+            gas_unit_price: "102",
           },
         ]);
 
@@ -58,10 +58,10 @@ describe("getFeesForTransaction Test", () => {
         const result = await getFeesForTransaction.getFee(account, transaction, aptosClient);
 
         const expected = {
-          fees: new BigNumber(20301),
+          fees: new BigNumber(20604),
           estimate: {
-            maxGasAmount: "201",
-            gasUnitPrice: "101",
+            maxGasAmount: "202",
+            gasUnitPrice: "102",
           },
           errors: {},
         };
@@ -99,7 +99,7 @@ describe("getFeesForTransaction Test", () => {
 
   describe("when using getEstimatedGas", () => {
     describe("when key not in cache", () => {
-      it("should return cached fee", async () => {
+      it("should return fee", async () => {
         simulateTransaction = jest.fn(() => [
           {
             success: true,
@@ -143,23 +143,21 @@ describe("getFeesForTransaction Test", () => {
       });
 
       it("should return cached fee", async () => {
-        const mocked = jest.spyOn(getFeesForTransaction, "getFee");
-
-        const account = createFixtureAccount();
-        const transaction = createFixtureTransaction();
-        const aptosClient = new AptosAPI(account.currency.id);
-
-        transaction.amount = new BigNumber(10);
-
         simulateTransaction = jest.fn(() => [
           {
             success: true,
             vm_status: [],
             expiration_timestamp_secs: 5,
-            gas_used: "9",
-            gas_unit_price: "100",
+            gas_used: "202",
+            gas_unit_price: "102",
           },
         ]);
+        const account = createFixtureAccount();
+        account.xpub = "xpub";
+        const transaction = createFixtureTransaction();
+        const aptosClient = new AptosAPI(account.currency.id);
+
+        transaction.amount = new BigNumber(10);
 
         const result1 = await getFeesForTransaction.getEstimatedGas(
           account,
@@ -172,15 +170,15 @@ describe("getFeesForTransaction Test", () => {
           aptosClient,
         );
 
-        expect(mocked).toHaveBeenCalledTimes(1);
+        expect(simulateTransaction.mock.calls).toHaveLength(1);
 
         const expected = {
           errors: {},
           estimate: {
-            gasUnitPrice: "101",
-            maxGasAmount: "201",
+            gasUnitPrice: "102",
+            maxGasAmount: "202",
           },
-          fees: new BigNumber("20301"),
+          fees: new BigNumber("20604"),
         };
 
         expect(result1).toEqual(expected);

package/src/api/graphql/queries.ts

@@ -1,3 +1,4 @@
+// We need to target CJS for the CJS build of the lib
 import { gql } from "@apollo/client";
 
 export const GetDelegatedStakingActivities = gql`

package/src/api/index.ts

@@ -1,4 +1,5 @@
 import { ApolloClient, InMemoryCache } from "@apollo/client";
+
 import {
   AccountData,
   Aptos,

package/src/bridge/getFeesForTransaction.ts

@@ -2,6 +2,7 @@ import { Ed25519PublicKey } from "@aptos-labs/ts-sdk";
 import { log } from "@ledgerhq/logs";
 import type { Account } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
+import { makeLRUCache, seconds } from "@ledgerhq/live-network/cache";
 import { AptosAPI } from "../api";
 import buildTransaction from "./buildTransaction";
 import { DEFAULT_GAS, DEFAULT_GAS_PRICE, ESTIMATE_GAS_MUL } from "./logic";
@@ -16,18 +17,6 @@ type IGetEstimatedGasReturnType = {
   errors: TransactionErrors;
 };
 
-const CACHE = {
-  amount: new BigNumber(0),
-  estimate: Promise.resolve({
-    fees: new BigNumber(0),
-    estimate: {
-      maxGasAmount: "",
-      gasUnitPrice: "",
-    },
-    errors: {},
-  }),
-};
-
 export const getFee = async (
   account: Account,
   transaction: Transaction,
@@ -81,20 +70,18 @@ export const getFee = async (
   return res;
 };
 
+const CACHE = makeLRUCache(
+  getFee,
+  (_account: Account, transaction: Transaction, _aptosClient: AptosAPI) => {
+    return transaction.amount.toString();
+  },
+  seconds(30),
+);
+
 export const getEstimatedGas = async (
   account: Account,
   transaction: Transaction,
   aptosClient: AptosAPI,
 ): Promise<IGetEstimatedGasReturnType> => {
-  if (!CACHE.amount.eq(transaction.amount)) {
-    CACHE.estimate = getFee(account, transaction, aptosClient);
-    CACHE.amount = transaction.amount;
-  }
-
-  // XXX: we await Promise form getFee() in this place to make cache work for asynchronous calls
-  // Example [if wee await getFee()]: thread 1 goes to getFee() and awaits there for transaction simulation.
-  // at this moment thread 2 will enter getEstimatedGas() CACHE is not set yet, it will call getFee() as well
-  // Current implementation: CACHE.estimate set immediately after getFee() is called, so thread 2 will not go under if clause
-  // and both treads will wait for promise resolve in return statement.
-  return await CACHE.estimate;
+  return await CACHE(account, transaction, aptosClient);
 };

package/src/test/bot-specs.ts

@@ -1,28 +1,28 @@
 import invariant from "invariant";
+import expect from "expect";
 import { DeviceModelId } from "@ledgerhq/devices";
+import BigNumber from "bignumber.js";
+import type { Transaction } from "../types";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
-import { parseCurrencyUnit } from "@ledgerhq/coin-framework/currencies/index";
-import { botTest, genericTestDestination, pickSiblings } from "@ledgerhq/coin-framework/bot/specs";
+import { genericTestDestination, pickSiblings, botTest } from "@ledgerhq/coin-framework/bot/specs";
 import type { AppSpec } from "@ledgerhq/coin-framework/bot/types";
 import { acceptTransaction } from "./speculos-deviceActions";
-import type { Transaction } from "../types";
 
-const currency = getCryptoCurrencyById("aptos");
-const minBalanceNewAccount = parseCurrencyUnit(currency.units[0], "0.0001");
-const maxAccountSiblings = 4;
+const MIN_SAFE = new BigNumber(0.0001);
+const maxAccount = 6;
 
-const aptos: AppSpec<Transaction> = {
+const aptosSpecs: AppSpec<Transaction> = {
   name: "Aptos",
-  currency,
+  currency: getCryptoCurrencyById("aptos"),
   appQuery: {
     model: DeviceModelId.nanoSP,
     appName: "Aptos",
   },
   genericDeviceAction: acceptTransaction,
-  testTimeout: 5 * 60 * 1000,
-  minViableAmount: minBalanceNewAccount,
+  testTimeout: 6 * 60 * 1000,
+  minViableAmount: MIN_SAFE,
   transactionCheck: ({ maxSpendable }) => {
-    invariant(maxSpendable.gt(minBalanceNewAccount), "balance is too low");
+    invariant(maxSpendable.gt(MIN_SAFE), "balance is too low");
   },
   mutations: [
     {
@@ -31,9 +31,8 @@ const aptos: AppSpec<Transaction> = {
       maxRun: 1,
       testDestination: genericTestDestination,
       transaction: ({ account, siblings, bridge, maxSpendable }) => {
-        invariant(maxSpendable.gt(minBalanceNewAccount), "balance is too low");
-
-        const sibling = pickSiblings(siblings, maxAccountSiblings);
+        invariant(maxSpendable.gt(MIN_SAFE), "balance is too low");
+        const sibling = pickSiblings(siblings, maxAccount);
         const recipient = sibling.freshAddress;
         const amount = maxSpendable.div(2).integerValue();
 
@@ -50,37 +49,44 @@ const aptos: AppSpec<Transaction> = {
           updates,
         };
       },
-      test: ({ account, accountBeforeTransaction, operation }) => {
-        botTest("account balance moved with operation.value", () =>
-          expect(account.balance.toString()).toBe(
-            accountBeforeTransaction.balance.minus(operation.value).toString(),
+
+      test: ({ accountBeforeTransaction, operation, account }) => {
+        botTest("account spendable balance decreased with operation", () =>
+          expect(account.spendableBalance).toEqual(
+            accountBeforeTransaction.spendableBalance.minus(operation.value),
           ),
         );
       },
     },
     {
-      name: "Send max",
-      maxRun: 2,
-      testDestination: genericTestDestination,
+      name: "Transfer Max",
+      feature: "sendMax",
+      maxRun: 1,
       transaction: ({ account, siblings, bridge }) => {
-        const sibling = pickSiblings(siblings, 4);
-        const recipient = sibling.freshAddress;
-        const transaction = bridge.createTransaction(account);
+        const updates: Array<Partial<Transaction>> = [
+          {
+            recipient: pickSiblings(siblings, maxAccount).freshAddress,
+          },
+          {
+            useAllAmount: true,
+          },
+        ];
 
         return {
-          transaction,
-          updates: [{ recipient }, { useAllAmount: true }],
+          transaction: bridge.createTransaction(account),
+          updates,
         };
       },
-      test: ({ account, accountBeforeTransaction, operation }) => {
-        botTest("Account balance should have decreased", () => {
-          expect(account.balance.toNumber()).toEqual(
-            accountBeforeTransaction.balance.minus(operation.value).toNumber(),
-          );
-        });
+      testDestination: genericTestDestination,
+      test: ({ account }) => {
+        botTest("account spendable balance is zero", () =>
+          expect(account.spendableBalance.toString()).toBe("0"),
+        );
       },
     },
   ],
 };
 
-export default { aptos };
+export default {
+  aptosSpecs,
+};

package/src/test/speculos-deviceActions.ts

@@ -1,23 +1,8 @@
 import type { DeviceAction } from "@ledgerhq/coin-framework/bot/types";
 import type { Transaction } from "../types";
-import {
-  deviceActionFlow,
-  formatDeviceAmount,
-  SpeculosButton,
-} from "@ledgerhq/coin-framework/bot/specs";
+import { deviceActionFlow, SpeculosButton } from "@ledgerhq/coin-framework/bot/specs";
 import { State } from "@ledgerhq/coin-framework/bot/types";
 
-const typeWording = {
-  send: "Send",
-  lock: "Lock",
-  unlock: "Unlock",
-  withdraw: "Withdraw",
-  vote: "Vote",
-  revoke: "Revoke",
-  activate: "Activate",
-  register: "Create Account",
-};
-
 export const acceptTransaction: DeviceAction<Transaction, State<Transaction>> = deviceActionFlow({
   steps: [
     {
@@ -25,27 +10,35 @@ export const acceptTransaction: DeviceAction<Transaction, State<Transaction>> =
       button: SpeculosButton.RIGHT,
     },
     {
-      title: "Type",
+      title: "Transaction",
+      button: SpeculosButton.RIGHT,
+    },
+    {
+      title: "Function",
+      button: SpeculosButton.RIGHT,
+    },
+    {
+      title: "Coin Type",
+      button: SpeculosButton.RIGHT,
+    },
+    {
+      title: "Receiver (1/2)",
+      button: SpeculosButton.RIGHT,
+    },
+    {
+      title: "Receiver (2/2)",
       button: SpeculosButton.RIGHT,
-      expectedValue: ({ transaction }) => {
-        return typeWording[transaction.mode as keyof typeof typeWording];
-      },
     },
     {
       title: "Amount",
       button: SpeculosButton.RIGHT,
-      expectedValue: ({ account, status }) =>
-        formatDeviceAmount(account.currency, status.amount, {
-          forceFloating: true,
-        }),
     },
     {
-      title: "Address",
+      title: "Gas Fee",
       button: SpeculosButton.RIGHT,
-      expectedValue: ({ transaction }) => transaction.recipient,
     },
     {
-      title: "Accept",
+      title: "Approve",
       button: SpeculosButton.BOTH,
     },
   ],

package/tsconfig.json

@@ -3,12 +3,13 @@
   "compilerOptions": {
     "declaration": true,
     "declarationMap": true,
-    "module": "commonjs",
     "downlevelIteration": true,
     "lib": ["es2020", "dom"],
     "rootDir": "./src",
     "outDir": "lib",
-    "exactOptionalPropertyTypes": true
+    "exactOptionalPropertyTypes": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
   },
   "include": ["src/**/*", "deviceTransactionConfig.ts", "transaction.ts"]
 }