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

package/src/families/stellar/specs.ts

@@ -7,11 +7,12 @@ import {
   parseCurrencyUnit,
   listTokensForCryptoCurrency,
 } from "../../currencies";
-import { pickSiblings } from "../../bot/specs";
+import { botTest, pickSiblings } from "../../bot/specs";
 import type { AppSpec } from "../../bot/types";
 import { DeviceModelId } from "@ledgerhq/devices";
 import type { SubAccount } from "@ledgerhq/types-live";
 import type { TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { acceptTransaction } from "./speculos-deviceActions";
 
 const currency = getCryptoCurrencyById("stellar");
 const minAmountCutoff = parseCurrencyUnit(currency.units[0], "0.1");
@@ -33,6 +34,7 @@ const stellar: AppSpec<Transaction> = {
     model: DeviceModelId.nanoS,
     appName: "Stellar",
   },
+  genericDeviceAction: acceptTransaction,
   testTimeout: 2 * 60 * 1000,
   mutations: [
     {
@@ -81,14 +83,18 @@ const stellar: AppSpec<Transaction> = {
       test: ({ account, accountBeforeTransaction, operation, transaction }) => {
         // We don't know what the final fee will be until after the tx is
         // submitted. Using higher max fee to make sure tx doesn't time out.
-        expect(account.balance.toNumber()).toBeLessThanOrEqual(
-          accountBeforeTransaction.balance.minus(operation.value).toNumber()
+        botTest("account balance decreased with operation", () =>
+          expect(account.balance.toNumber()).toBeLessThanOrEqual(
+            accountBeforeTransaction.balance.minus(operation.value).toNumber()
+          )
         );
 
         if (transaction.memoValue) {
-          expect(operation.extra).toMatchObject({
-            memo: transaction.memoValue,
-          });
+          botTest("operation memo", () =>
+            expect(operation.extra).toMatchObject({
+              memo: transaction.memoValue,
+            })
+          );
         }
 
         const getType = () => {
@@ -102,7 +108,9 @@ const stellar: AppSpec<Transaction> = {
           }
         };
 
-        expect(transaction.mode).toMatch(getType());
+        botTest("transaction mode", () =>
+          expect(transaction.mode).toMatch(getType())
+        );
       },
     },
     {
@@ -142,14 +150,18 @@ const stellar: AppSpec<Transaction> = {
       test: ({ account, accountBeforeTransaction, operation, transaction }) => {
         // We don't know what the final fee will be until after the tx is
         // submitted. Using higher max fee to make sure tx doesn't time out.
-        expect(account.balance.toNumber()).toBeLessThanOrEqual(
-          accountBeforeTransaction.balance.minus(operation.value).toNumber()
+        botTest("balance decreased with operation", () =>
+          expect(account.balance.toNumber()).toBeLessThanOrEqual(
+            accountBeforeTransaction.balance.minus(operation.value).toNumber()
+          )
         );
 
         if (transaction.memoValue) {
-          expect(operation.extra).toMatchObject({
-            memo: transaction.memoValue,
-          });
+          botTest("operation memo", () =>
+            expect(operation.extra).toMatchObject({
+              memo: transaction.memoValue,
+            })
+          );
         }
 
         const getType = () => {
@@ -163,7 +175,9 @@ const stellar: AppSpec<Transaction> = {
           }
         };
 
-        expect(transaction.mode).toMatch(getType());
+        botTest("transaction mode", () =>
+          expect(transaction.mode).toMatch(getType())
+        );
       },
     },
     {
@@ -205,7 +219,7 @@ const stellar: AppSpec<Transaction> = {
         const hasAsset = account.subAccounts?.find((a) =>
           a.id.endsWith(assetId)
         );
-        expect(hasAsset).toBeTruthy();
+        botTest("has asset", () => expect(hasAsset).toBeTruthy());
       },
     },
     {
@@ -276,14 +290,18 @@ const stellar: AppSpec<Transaction> = {
           accountBeforeTransaction?.subAccounts
         );
 
-        expect(asset?.balance.toString()).toBe(
-          assetBeforeTx?.balance.minus(status.amount).toString()
+        botTest("asset balance decreased with operation", () =>
+          expect(asset?.balance.toString()).toBe(
+            assetBeforeTx?.balance.minus(status.amount).toString()
+          )
         );
 
         if (transaction.memoValue) {
-          expect(operation.extra).toMatchObject({
-            memo: transaction.memoValue,
-          });
+          botTest("operation memo", () =>
+            expect(operation.extra).toMatchObject({
+              memo: transaction.memoValue,
+            })
+          );
         }
       },
     },

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

@@ -28,90 +28,88 @@ const expectedAmount = ({ account, status, transaction }) => {
 const truncateAddress = (stellarAddress: string, start = 6, end = 6) =>
   `${stellarAddress.slice(0, start)}..${stellarAddress.slice(-end)}`;
 
-const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
-  steps: [
-    {
-      title: "Review",
-      button: "Rr",
-    },
-    {
-      title: "Memo Text",
-      button: "Rr",
-      expectedValue: ({ transaction }) => transaction.memoValue || "",
-    },
-    {
-      title: "Max Fee",
-      button: "Rr",
-      expectedValue: ({ account, status }) =>
-        formatCurrencyUnit(account.unit, status.estimatedFees, {
-          disableRounding: true,
-        }) + " XLM",
-    },
-    {
-      title: "Sequence Num",
-      button: "Rr",
-    },
-    {
-      title: "Tx Source",
-      button: "Rr",
-      expectedValue: ({ account }) => truncateAddress(account.freshAddress),
-    },
-    {
-      title: "Operation Type",
-      button: "Rr",
-      // Operation type can be Payment (or Create Account) or Change Trust.
-      // Create Account type is coming from operation, not transaction.
-      // Testing in `specs.ts`.
-    },
-    {
-      title: "Change Trust",
-      button: "Rr",
-      expectedValue: ({ transaction }) =>
-        `${transaction.assetCode || ""}@${truncateAddress(
-          transaction.assetIssuer || "",
-          3,
-          4
-        )}`,
-      maxY: 5,
-    },
-    {
-      title: "Create Account",
-      button: "Rr",
-      expectedValue: ({ transaction }) => transaction.recipient,
-      maxY: 5,
-    },
-    {
-      title: "Send",
-      button: "Rr",
-      expectedValue: expectedAmount,
-    },
-    {
-      title: "Destination",
-      button: "Rr",
-      expectedValue: ({ transaction }) => transaction.recipient,
-    },
-    {
-      title: "Finalize",
-      button: "LRlr",
-    },
-    {
-      title: "Starting Balance",
-      button: "Rr",
-    },
-    {
-      title: "Network",
-      button: "Rr",
-    },
-    {
-      title: "Valid Before (UTC)",
-      button: "Rr",
-    },
-    {
-      title: "Valid After (UTC)",
-      button: "Rr",
-    },
-  ],
-});
-export default {
-  acceptTransaction,
-};
+export const acceptTransaction: DeviceAction<Transaction, any> =
+  deviceActionFlow({
+    steps: [
+      {
+        title: "Review",
+        button: "Rr",
+      },
+      {
+        title: "Memo Text",
+        button: "Rr",
+        expectedValue: ({ transaction }) => transaction.memoValue || "",
+      },
+      {
+        title: "Max Fee",
+        button: "Rr",
+        expectedValue: ({ account, status }) =>
+          formatCurrencyUnit(account.unit, status.estimatedFees, {
+            disableRounding: true,
+          }) + " XLM",
+      },
+      {
+        title: "Sequence Num",
+        button: "Rr",
+      },
+      {
+        title: "Tx Source",
+        button: "Rr",
+        expectedValue: ({ account }) => truncateAddress(account.freshAddress),
+      },
+      {
+        title: "Operation Type",
+        button: "Rr",
+        // Operation type can be Payment (or Create Account) or Change Trust.
+        // Create Account type is coming from operation, not transaction.
+        // Testing in `specs.ts`.
+      },
+      {
+        title: "Change Trust",
+        button: "Rr",
+        expectedValue: ({ transaction }) =>
+          `${transaction.assetCode || ""}@${truncateAddress(
+            transaction.assetIssuer || "",
+            3,
+            4
+          )}`,
+        maxY: 5,
+      },
+      {
+        title: "Create Account",
+        button: "Rr",
+        expectedValue: ({ transaction }) => transaction.recipient,
+        maxY: 5,
+      },
+      {
+        title: "Send",
+        button: "Rr",
+        expectedValue: expectedAmount,
+      },
+      {
+        title: "Destination",
+        button: "Rr",
+        expectedValue: ({ transaction }) => transaction.recipient,
+      },
+      {
+        title: "Finalize",
+        button: "LRlr",
+      },
+      {
+        title: "Starting Balance",
+        button: "Rr",
+      },
+      {
+        title: "Network",
+        button: "Rr",
+      },
+      {
+        title: "Valid Before (UTC)",
+        button: "Rr",
+      },
+      {
+        title: "Valid After (UTC)",
+        button: "Rr",
+      },
+    ],
+  });

package/src/families/tezos/bakers.whitelist-default.ts

@@ -20,7 +20,6 @@ tz2FCNBrERXtaTtNX6iimR1UJ5JSDxvdHM93
 tz1SohptP53wDPZhzTWzDUFAUcWF6DMBpaJV
 tz1P2Po7YM526ughEsRbY4oR9zaUPDZjxFrb
 tz1KzSC1J9aBxKp7u8TUnpN8L7S65PBRkgdF
-tz1STeamwbp68THcny9zk3LsbG3H36DMvbRK
 tz1fJHFn6sWEd3NnBPngACuw2dggTv6nQZ7g
 tz1NEKxGEHsFufk87CVZcrqWu8o22qh46GK6
 tz1V3yg82mcrPJbegqVCPn6bC8w1CSTRp3f8

package/src/families/tezos/specs.ts

@@ -8,6 +8,7 @@ import type { AppSpec } from "../../bot/types";
 import { DeviceModelId } from "@ledgerhq/devices";
 import { getAccountDelegationSync, isAccountDelegating } from "./bakers";
 import whitelist from "./bakers.whitelist-default";
+import { acceptTransaction } from "./speculos-deviceActions";
 
 const maxAccount = 12;
 
@@ -35,6 +36,7 @@ const tezos: AppSpec<Transaction> = {
     model: DeviceModelId.nanoS,
     appName: "TezosWallet",
   },
+  genericDeviceAction: acceptTransaction,
   testTimeout: 2 * 60 * 1000,
   transactionCheck: ({ maxSpendable }) => {
     invariant(

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

@@ -4,83 +4,82 @@ import type { Transaction } from "./types";
 import { formatCurrencyUnit } from "../../currencies";
 import { deviceActionFlow } from "../../bot/specs";
 
-const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
-  steps: [
-    {
-      title: "Review",
-      button: "Rr",
-    },
-    {
-      title: "Withdraw",
-      button: "Rr",
-    },
-    {
-      title: "Custom Delegate",
-      button: "Rr",
-    },
-    {
-      // device sometimes know the text of a given delegator, we're not validating the actual text
-      title: "Delegate",
-      button: "Rr",
-    },
-    {
-      title: "Delegate Name",
-      button: "Rr",
-    },
-    {
-      title: "Confirm",
-      button: "Rr",
-      expectedValue: ({ transaction }) => {
-        return transaction.mode === "send" ? "Transaction" : "Delegation";
+export const acceptTransaction: DeviceAction<Transaction, any> =
+  deviceActionFlow({
+    steps: [
+      {
+        title: "Review",
+        button: "Rr",
       },
-    },
-    {
-      title: "Amount",
-      button: "Rr",
-      expectedValue: ({ account, transaction }) => {
-        const amount = transaction.amount;
-        return formatCurrencyUnit(account.unit, amount, {
-          disableRounding: true,
-          joinFragmentsSeparator: " ",
-        }).replace(/\s/g, " ");
+      {
+        title: "Withdraw",
+        button: "Rr",
       },
-    },
-    {
-      title: "Fee",
-      button: "Rr",
-      expectedValue: ({ account, status }) => {
-        const amount = status.estimatedFees;
-        return formatCurrencyUnit(account.currency.units[0], amount, {
-          disableRounding: true,
-          joinFragmentsSeparator: " ",
-        }).replace(/\s/g, " ");
+      {
+        title: "Custom Delegate",
+        button: "Rr",
       },
-    },
-    {
-      title: "Source",
-      button: "Rr",
-      expectedValue: ({ account }) => account.freshAddress,
-    },
-    {
-      title: "Destination",
-      button: "Rr",
-      expectedValue: ({ transaction }) => transaction.recipient,
-    },
-    {
-      title: "Storage Limit",
-      button: "Rr",
-      expectedValue: ({ transaction }) =>
-        transaction.storageLimit?.toString() || "",
-    },
-    {
-      title: "Reject",
-      button: "Rr",
-    },
-    {
-      title: "Accept",
-      button: "LRlr",
-    },
-  ],
-});
-
-export default { acceptTransaction };
+      {
+        // device sometimes know the text of a given delegator, we're not validating the actual text
+        title: "Delegate",
+        button: "Rr",
+      },
+      {
+        title: "Delegate Name",
+        button: "Rr",
+      },
+      {
+        title: "Confirm",
+        button: "Rr",
+        expectedValue: ({ transaction }) => {
+          return transaction.mode === "send" ? "Transaction" : "Delegation";
+        },
+      },
+      {
+        title: "Amount",
+        button: "Rr",
+        expectedValue: ({ account, transaction }) => {
+          const amount = transaction.amount;
+          return formatCurrencyUnit(account.unit, amount, {
+            disableRounding: true,
+            joinFragmentsSeparator: " ",
+          }).replace(/\s/g, " ");
+        },
+      },
+      {
+        title: "Fee",
+        button: "Rr",
+        expectedValue: ({ account, status }) => {
+          const amount = status.estimatedFees;
+          return formatCurrencyUnit(account.currency.units[0], amount, {
+            disableRounding: true,
+            joinFragmentsSeparator: " ",
+          }).replace(/\s/g, " ");
+        },
+      },
+      {
+        title: "Source",
+        button: "Rr",
+        expectedValue: ({ account }) => account.freshAddress,
+      },
+      {
+        title: "Destination",
+        button: "Rr",
+        expectedValue: ({ transaction }) => transaction.recipient,
+      },
+      {
+        title: "Storage Limit",
+        button: "Rr",
+        expectedValue: ({ transaction }) =>
+          transaction.storageLimit?.toString() || "",
+      },
+      {
+        title: "Reject",
+        button: "Rr",
+      },
+      {
+        title: "Accept",
+        button: "LRlr",
+      },
+    ],
+  });