@ledgerhq/live-common 27.0.0 → 27.0.1-next.0

package/src/families/bitcoin/speculos-deviceActions.ts

@@ -3,75 +3,74 @@ import type { Transaction } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
 import { deviceActionFlow } from "../../bot/specs";
 import { perCoinLogic } from "./logic";
-const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
-  steps: [
-    {
-      title: "Amount",
-      button: "Rr",
-      ignoreAssertionFailure: true,
-      // https://ledgerhq.atlassian.net/browse/LLC-676
-      expectedValue: ({ account, status }) =>
-        formatCurrencyUnit(
-          {
-            ...account.unit,
-            code: account.currency.deviceTicker || account.unit.code,
-          },
-          status.amount,
-          {
-            showCode: true,
-            disableRounding: true,
-          }
-        ).replace(/\s/g, " "),
-    },
-    {
-      title: "Fees",
-      button: "Rr",
-      ignoreAssertionFailure: true,
-      // https://ledgerhq.atlassian.net/browse/LLC-676
-      expectedValue: ({ account, status }) =>
-        formatCurrencyUnit(
-          {
-            ...account.unit,
-            code: account.currency.deviceTicker || account.unit.code,
-          },
-          status.estimatedFees,
-          {
-            showCode: true,
-            disableRounding: true,
-          }
-        ).replace(/\s/g, " "),
-    },
-    {
-      title: "Address",
-      button: "Rr",
-      expectedValue: ({ transaction, account }) => {
-        const perCoin = perCoinLogic[account.currency.id];
 
-        if (perCoin?.onScreenTransactionRecipient) {
-          return perCoin.onScreenTransactionRecipient(transaction.recipient);
-        }
+export const acceptTransaction: DeviceAction<Transaction, any> =
+  deviceActionFlow({
+    steps: [
+      {
+        title: "Amount",
+        button: "Rr",
+        ignoreAssertionFailure: true,
+        // https://ledgerhq.atlassian.net/browse/LLC-676
+        expectedValue: ({ account, status }) =>
+          formatCurrencyUnit(
+            {
+              ...account.unit,
+              code: account.currency.deviceTicker || account.unit.code,
+            },
+            status.amount,
+            {
+              showCode: true,
+              disableRounding: true,
+            }
+          ).replace(/\s/g, " "),
+      },
+      {
+        title: "Fees",
+        button: "Rr",
+        ignoreAssertionFailure: true,
+        // https://ledgerhq.atlassian.net/browse/LLC-676
+        expectedValue: ({ account, status }) =>
+          formatCurrencyUnit(
+            {
+              ...account.unit,
+              code: account.currency.deviceTicker || account.unit.code,
+            },
+            status.estimatedFees,
+            {
+              showCode: true,
+              disableRounding: true,
+            }
+          ).replace(/\s/g, " "),
+      },
+      {
+        title: "Address",
+        button: "Rr",
+        expectedValue: ({ transaction, account }) => {
+          const perCoin = perCoinLogic[account.currency.id];
+
+          if (perCoin?.onScreenTransactionRecipient) {
+            return perCoin.onScreenTransactionRecipient(transaction.recipient);
+          }
 
-        return transaction.recipient;
+          return transaction.recipient;
+        },
+      },
+      {
+        title: "Review",
+        button: "Rr",
+      },
+      {
+        title: "Confirm",
+        button: "Rr",
+      },
+      {
+        title: "Accept",
+        button: "LRlr",
+      },
+      {
+        title: "Approve",
+        button: "LRlr",
       },
-    },
-    {
-      title: "Review",
-      button: "Rr",
-    },
-    {
-      title: "Confirm",
-      button: "Rr",
-    },
-    {
-      title: "Accept",
-      button: "LRlr",
-    },
-    {
-      title: "Approve",
-      button: "LRlr",
-    },
-  ],
-});
-export default {
-  acceptTransaction,
-};
+    ],
+  });

package/src/families/cardano/js-estimateMaxSpendable.ts

@@ -29,7 +29,7 @@ const estimateMaxSpendable = async ({
   }
 
   const dummyRecipient =
-    "addr_test1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq0uk53y";
+    "addr1qyqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqv2t5am";
   const a = getMainAccount(account, parentAccount);
   const t: Transaction = {
     ...createTransaction(),

package/src/families/cardano/specs.ts

@@ -1,7 +1,7 @@
 import expect from "expect";
 import type { AppSpec } from "../../bot/types";
 import type { CardanoAccount, CardanoResources, Transaction } from "./types";
-import { pickSiblings } from "../../bot/specs";
+import { botTest, pickSiblings } from "../../bot/specs";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets";
 import { DeviceModelId } from "@ledgerhq/devices";
 import BigNumber from "bignumber.js";
@@ -10,6 +10,7 @@ import { utils as TyphonUtils } from "@stricahq/typhonjs";
 import { mergeTokens } from "./logic";
 import { parseCurrencyUnit } from "../../currencies";
 import { SubAccount } from "@ledgerhq/types-live";
+import { acceptTransaction } from "./speculos-deviceActions";
 
 const currency = getCryptoCurrencyById("cardano");
 const minBalanceRequired = parseCurrencyUnit(currency.units[0], "2.2");
@@ -26,6 +27,7 @@ const cardano: AppSpec<Transaction> = {
     model: DeviceModelId.nanoS,
     appName: "CardanoADA",
   },
+  genericDeviceAction: acceptTransaction,
   testTimeout: 2 * 60 * 1000,
   mutations: [
     {
@@ -54,11 +56,16 @@ const cardano: AppSpec<Transaction> = {
         };
       },
       test: ({ operation, transaction }): void => {
-        expect(operation.extra).toEqual({
-          memo: transaction.memo,
-        });
-        expect(transaction.amount).toEqual(
-          operation.value.minus(operation.fee)
+        botTest("operation extra matches memo", () =>
+          expect(operation.extra).toEqual({
+            memo: transaction.memo,
+          })
+        );
+
+        botTest("optimistic value matches transaction amount", () =>
+          expect(transaction.amount).toEqual(
+            operation.value.minus(operation.fee)
+          )
         );
       },
     },
@@ -95,8 +102,10 @@ const cardano: AppSpec<Transaction> = {
               false
             )
           : new BigNumber(0);
-        expect(operation.value).toEqual(
-          accountBeforeTransaction.balance.minus(requiredAdaForTokens)
+        botTest("operation value matches (balance-requiredAdaForTokens)", () =>
+          expect(operation.value).toEqual(
+            accountBeforeTransaction.balance.minus(requiredAdaForTokens)
+          )
         );
       },
     },
@@ -134,12 +143,20 @@ const cardano: AppSpec<Transaction> = {
         };
       },
       test: ({ operation, transaction }): void => {
-        expect(operation.subOperations).toBeTruthy();
-        expect(operation.subOperations?.length).toEqual(1);
+        botTest("subOperations is defined", () =>
+          expect(operation.subOperations).toBeTruthy()
+        );
+
+        botTest("there are one subOperation", () =>
+          expect(operation.subOperations?.length).toEqual(1)
+        );
 
         const subOperation =
           operation.subOperations && operation.subOperations[0];
-        expect(subOperation?.value).toEqual(transaction.amount);
+
+        botTest("subOperation have correct tx amount", () =>
+          expect(subOperation?.value).toEqual(transaction.amount)
+        );
       },
     },
   ],

package/src/families/cardano/speculos-deviceActions.ts

@@ -13,69 +13,68 @@ function expectedValue(unit: Unit, value: BigNumber) {
   });
 }
 
-const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
-  steps: [
-    {
-      title: "Start new",
-    },
-    {
-      title: "ordinary transaction?",
-      button: "Rr",
-    },
-    {
-      title: "Auxiliary data hash",
-      button: "LRlr",
-    },
-    {
-      title: "Send to address",
-      button: "LRlr",
-      ignoreAssertionFailure: true,
-      expectedValue: ({ transaction }) => transaction.recipient,
-    },
-    {
-      title: "Send",
-      button: "LRlr",
-      ignoreAssertionFailure: true,
-      expectedValue: ({ account, status }) =>
-        expectedValue(account.unit, status.amount),
-    },
-    {
-      title: "Asset fingerprint",
-      button: "LRlr",
-    },
-    {
-      title: "Token amount",
-      button: "LRlr",
-    },
-    {
-      title: "Confirm",
-    },
-    {
-      title: "output?",
-      button: "Rr",
-    },
-    {
-      title: "Transaction fee",
-      button: "LRlr",
-      ignoreAssertionFailure: true,
-      expectedValue: ({ account, status }) =>
-        expectedValue(account.unit, status.estimatedFees),
-    },
-    {
-      title: "Transaction TTL",
-      button: "LRlr",
-    },
-    {
-      title: "...",
-    },
-    {
-      title: "Confirm",
-    },
-    {
-      title: "transaction?",
-      button: "Rr",
-    },
-  ],
-});
-
-export default { acceptTransaction };
+export const acceptTransaction: DeviceAction<Transaction, any> =
+  deviceActionFlow({
+    steps: [
+      {
+        title: "Start new",
+      },
+      {
+        title: "ordinary transaction?",
+        button: "Rr",
+      },
+      {
+        title: "Auxiliary data hash",
+        button: "LRlr",
+      },
+      {
+        title: "Send to address",
+        button: "LRlr",
+        ignoreAssertionFailure: true,
+        expectedValue: ({ transaction }) => transaction.recipient,
+      },
+      {
+        title: "Send",
+        button: "LRlr",
+        ignoreAssertionFailure: true,
+        expectedValue: ({ account, status }) =>
+          expectedValue(account.unit, status.amount),
+      },
+      {
+        title: "Asset fingerprint",
+        button: "LRlr",
+      },
+      {
+        title: "Token amount",
+        button: "LRlr",
+      },
+      {
+        title: "Confirm",
+      },
+      {
+        title: "output?",
+        button: "Rr",
+      },
+      {
+        title: "Transaction fee",
+        button: "LRlr",
+        ignoreAssertionFailure: true,
+        expectedValue: ({ account, status }) =>
+          expectedValue(account.unit, status.estimatedFees),
+      },
+      {
+        title: "Transaction TTL",
+        button: "LRlr",
+      },
+      {
+        title: "...",
+      },
+      {
+        title: "Confirm",
+      },
+      {
+        title: "transaction?",
+        button: "Rr",
+      },
+    ],
+  });

package/src/families/celo/specs.ts

@@ -4,6 +4,7 @@ import { getCryptoCurrencyById, parseCurrencyUnit } from "../../currencies";
 import { pickSiblings } from "../../bot/specs";
 import type { AppSpec } from "../../bot/types";
 import { DeviceModelId } from "@ledgerhq/devices";
+import { acceptTransaction } from "./speculos-deviceActions";
 
 const currency = getCryptoCurrencyById("celo");
 const minimalAmount = parseCurrencyUnit(currency.units[0], "0.001");
@@ -17,6 +18,7 @@ const celo: AppSpec<Transaction> = {
     appName: "Celo",
   },
   testTimeout: 2 * 60 * 1000,
+  genericDeviceAction: acceptTransaction,
   mutations: [
     {
       name: "move 50% to another account",

package/src/families/celo/speculos-deviceActions.ts

@@ -2,49 +2,48 @@ import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
 import { deviceActionFlow } from "../../bot/specs";
 import { formatCurrencyUnit } from "../../currencies";
-const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
-  steps: [
-    {
-      title: "Review",
-      button: "Rr",
-    },
-    {
-      title: "Amount",
-      button: "Rr",
-      expectedValue: ({ account, status }) => {
-        const formattedValue =
-          "CELO " +
-          formatCurrencyUnit(account.unit, status.amount, {
-            disableRounding: true,
-          });
 
-        if (!formattedValue.includes(".")) {
-          // if the value is pure integer, in the app it will automatically add an .0
-          return formattedValue + ".0";
-        }
+export const acceptTransaction: DeviceAction<Transaction, any> =
+  deviceActionFlow({
+    steps: [
+      {
+        title: "Review",
+        button: "Rr",
+      },
+      {
+        title: "Amount",
+        button: "Rr",
+        expectedValue: ({ account, status }) => {
+          const formattedValue =
+            "CELO " +
+            formatCurrencyUnit(account.unit, status.amount, {
+              disableRounding: true,
+            });
+
+          if (!formattedValue.includes(".")) {
+            // if the value is pure integer, in the app it will automatically add an .0
+            return formattedValue + ".0";
+          }
 
-        return formattedValue;
+          return formattedValue;
+        },
+      },
+      {
+        title: "Address",
+        button: "Rr",
+        expectedValue: ({ transaction }) => transaction.recipient,
+      },
+      {
+        title: "Max Fees",
+        button: "Rr",
+      },
+      {
+        title: "No Gateway Fee",
+        button: "Rr",
+      },
+      {
+        title: "Accept",
+        button: "LRlr",
       },
-    },
-    {
-      title: "Address",
-      button: "Rr",
-      expectedValue: ({ transaction }) => transaction.recipient,
-    },
-    {
-      title: "Max Fees",
-      button: "Rr",
-    },
-    {
-      title: "No Gateway Fee",
-      button: "Rr",
-    },
-    {
-      title: "Accept",
-      button: "LRlr",
-    },
-  ],
-});
-export default {
-  acceptTransaction,
-};
+    ],
+  });