@ledgerhq/live-common 27.2.0-nightly.3 → 27.2.0

package/src/exchange/swap/getProviders.ts

@@ -2,52 +2,29 @@ import qs from "qs";
 import { getEnv } from "../../env";
 import { SwapNoAvailableProviders } from "../../errors";
 import network from "../../network";
-import {
-  getAvailableProviders,
-  getSwapAPIBaseURL,
-  getSwapAPIVersion,
-} from "./";
+import { getAvailableProviders, getSwapAPIBaseURL } from "./";
 import { mockGetProviders } from "./mock";
-import type { GetProviders, ProvidersResponseV4 } from "./types";
+import type { GetProviders } from "./types";
 
 const getProviders: GetProviders = async () => {
   if (getEnv("MOCK")) return mockGetProviders();
 
-  const version = getSwapAPIVersion();
+  // Rely on the api base to determine the version logic
+  const usesV3 = getSwapAPIBaseURL().endsWith("v3");
 
   const res = await network({
     method: "GET",
     url: `${getSwapAPIBaseURL()}/providers`,
-    params: version >= 3 ? { whitelist: getAvailableProviders() } : undefined,
+    params: usesV3 ? { whitelist: getAvailableProviders() } : undefined,
     paramsSerializer: (params) =>
       qs.stringify(params, { arrayFormat: "comma" }),
   });
 
-  if (version < 4) {
-    if (!res.data.length) {
-      throw new SwapNoAvailableProviders();
-    }
-    return res.data;
-  }
-
-  const responseV4 = res.data as ProvidersResponseV4;
-  if (!responseV4.providers || !Object.keys(responseV4.providers).length) {
+  if (!res.data.length) {
     throw new SwapNoAvailableProviders();
   }
-  return Object.entries(responseV4.providers).flatMap(([provider, groups]) => ({
-    provider: provider,
-    pairs: groups.flatMap((group) =>
-      group.methods.flatMap((tradeMethod) =>
-        Object.entries(group.pairs).flatMap(([from, toArray]) =>
-          (toArray as number[]).map((to) => ({
-            from: responseV4.currencies[from],
-            to: responseV4.currencies[to.toString()],
-            tradeMethod,
-          }))
-        )
-      )
-    ),
-  }));
+
+  return res.data;
 };
 
 export default getProviders;

package/src/exchange/swap/index.test.ts

@@ -1,6 +1,4 @@
-import { isSwapOperationPending, getSwapAPIVersion } from ".";
-
-import { getEnv, setEnv } from "../../env";
+import { isSwapOperationPending } from ".";
 
 describe("swap/index", () => {
   describe("isSwapOperationPending", () => {
@@ -35,37 +33,4 @@ describe("swap/index", () => {
       expect(result).toBe(true);
     });
   });
-
-  describe("getSwapAPIVersion", () => {
-    const DEFAULT_SWAP_API_BASE = getEnv("SWAP_API_BASE");
-
-    afterEach(() => {
-      // Restore DEFAULT_SWAP_API_BASE
-      setEnv("SWAP_API_BASE", DEFAULT_SWAP_API_BASE);
-    });
-
-    test("should return version when SWAP_API_BASE contains one", () => {
-      const result = getSwapAPIVersion();
-
-      expect(result).toBe(4);
-    });
-
-    test("should throw an error if no version in SWAP_API_BASE", () => {
-      setEnv("SWAP_API_BASE", "https://swap.ledger.com");
-
-      expect(getSwapAPIVersion).toThrow(Error);
-      expect(getSwapAPIVersion).toThrow(
-        "Configured swap API base URL is invalid, should end with /v<number>"
-      );
-    });
-
-    test("should throw an error if version is NaN", () => {
-      setEnv("SWAP_API_BASE", "https://swap.ledger.com/vtest");
-
-      expect(getSwapAPIVersion).toThrow(Error);
-      expect(getSwapAPIVersion).toThrow(
-        "Configured swap API base URL is invalid, should end with /v<number>"
-      );
-    });
-  });
 });

package/src/exchange/swap/index.ts

@@ -11,7 +11,6 @@ import {
   JSONRPCResponseError,
   NoIPHeaderError,
   NotImplementedError,
-  SwapGenericAPIError,
   TradeMethodNotSupportedError,
   UnexpectedError,
   ValidationError,
@@ -37,19 +36,6 @@ export const isSwapOperationPending: (status: string) => boolean = (status) =>
 
 const getSwapAPIBaseURL: () => string = () => getEnv("SWAP_API_BASE");
 
-const SWAP_API_BASE_PATTERN = /.*\/v(?<version>\d+)\/*$/;
-const getSwapAPIVersion: () => number = () => {
-  const version = Number(
-    getSwapAPIBaseURL().match(SWAP_API_BASE_PATTERN)?.groups?.version
-  );
-  if (version == null || isNaN(version)) {
-    throw new SwapGenericAPIError(
-      "Configured swap API base URL is invalid, should end with /v<number>"
-    );
-  }
-  return version;
-};
-
 const ftx = {
   nameAndPubkey: Buffer.concat([
     Buffer.from([3]),
@@ -193,7 +179,6 @@ export const getSwapAPIError = (errorCode: number, errorMessage?: string) => {
 
 export {
   getSwapAPIBaseURL,
-  getSwapAPIVersion,
   getProviderConfig,
   getProviders,
   getExchangeRates,

package/src/exchange/swap/mock.ts

@@ -7,7 +7,7 @@ import {
   SwapExchangeRateAmountTooHigh,
   SwapExchangeRateAmountTooLow,
 } from "../../errors";
-import { getSwapAPIVersion } from "./";
+import { getSwapAPIBaseURL } from "./";
 import type {
   CheckQuote,
   Exchange,
@@ -129,7 +129,7 @@ export const mockInitSwap = (
 export const mockGetProviders: GetProviders = async () => {
   //Fake delay to show loading UI
   await new Promise((r) => setTimeout(r, 800));
-  const usesV3 = getSwapAPIVersion() >= 3;
+  const usesV3 = getSwapAPIBaseURL().endsWith("v3");
 
   return usesV3
     ? [

package/src/exchange/swap/types.ts

@@ -83,17 +83,6 @@ export type AvailableProviderV3 = {
   pairs: Array<{ from: string; to: string; tradeMethod: string }>;
 };
 
-type TradeMethodGroup = {
-  methods: TradeMethod[];
-  pairs: {
-    [currencyIndex: number]: number[];
-  };
-};
-export type ProvidersResponseV4 = {
-  currencies: { [currencyIndex: number]: string };
-  providers: { [providerName: string]: TradeMethodGroup[] };
-};
-
 type CheckQuoteOkStatus = {
   codeName: "RATE_VALID";
 };

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

@@ -1,10 +1,26 @@
 import type { DeviceAction } from "../../bot/types";
 import type { AlgorandTransaction } from "./types";
-import { findTokenById } from "../../currencies";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit, findTokenById } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
 import { extractTokenId, addPrefixToken } from "./tokens";
 import { displayTokenValue } from "./deviceTransactionConfig";
 
+// Will be useful when unit is gonna be algo
+const expectedAmount = ({ account, status }) =>
+  formatCurrencyUnit(
+    {
+      ...account.unit,
+      code: account.currency.deviceTicker || account.unit.code,
+      prefixCode: true,
+    },
+    status.amount,
+    {
+      showCode: true,
+      disableRounding: true,
+      joinFragmentsSeparator: " ",
+    }
+  );
+
 export const acceptTransaction: DeviceAction<AlgorandTransaction, any> =
   deviceActionFlow({
     steps: [
@@ -26,7 +42,19 @@ export const acceptTransaction: DeviceAction<AlgorandTransaction, any> =
         title: "Fee",
         button: "Rr",
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.estimatedFees),
+          formatCurrencyUnit(
+            {
+              ...account.unit,
+              code: account.currency.deviceTicker || account.unit.code,
+              prefixCode: true,
+            },
+            status.estimatedFees,
+            {
+              showCode: true,
+              disableRounding: true,
+              joinFragmentsSeparator: " ",
+            }
+          ),
       },
       {
         title: "Asset ID",
@@ -67,7 +95,10 @@ export const acceptTransaction: DeviceAction<AlgorandTransaction, any> =
         expectedValue: ({ account, status, transaction }) =>
           transaction.mode === "claimReward"
             ? "0"
-            : formatDeviceAmount(account.currency, status.amount),
+            : expectedAmount({
+                account,
+                status,
+              }),
       },
       {
         title: "APPROVE",

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

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
 import { perCoinLogic } from "./logic";
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
@@ -10,15 +11,37 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         title: "Amount",
         button: "Rr",
         ignoreAssertionFailure: true,
+        // https://ledgerhq.atlassian.net/browse/LLC-676
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.amount),
+          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 }) =>
-          formatDeviceAmount(account.currency, status.estimatedFees),
+          formatCurrencyUnit(
+            {
+              ...account.unit,
+              code: account.currency.deviceTicker || account.unit.code,
+            },
+            status.estimatedFees,
+            {
+              showCode: true,
+              disableRounding: true,
+            }
+          ).replace(/\s/g, " "),
       },
       {
         title: "Address",

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

@@ -1,6 +1,17 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
+import type { Unit } from "@ledgerhq/types-cryptoassets";
+import BigNumber from "bignumber.js";
+
+function expectedValue(unit: Unit, value: BigNumber) {
+  return formatCurrencyUnit(unit, value, {
+    showCode: true,
+    disableRounding: true,
+    showAllDigits: true,
+  });
+}
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -27,7 +38,7 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         button: "LRlr",
         ignoreAssertionFailure: true,
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.amount),
+          expectedValue(account.unit, status.amount),
       },
       {
         title: "Asset fingerprint",
@@ -49,7 +60,7 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         button: "LRlr",
         ignoreAssertionFailure: true,
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.estimatedFees),
+          expectedValue(account.unit, status.estimatedFees),
       },
       {
         title: "Transaction TTL",

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

@@ -1,7 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
-
+import { deviceActionFlow } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
 const typeWording = {
   send: "Send",
   lock: "Lock",
@@ -23,10 +23,18 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
       {
         title: "Amount",
         button: "Rr",
-        expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.amount, {
-            forceFloating: true,
-          }),
+        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;
+        },
       },
       {
         title: "Address",

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

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { deviceActionFlow } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -14,9 +15,13 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         title: "Amount",
         button: "Rr",
         expectedValue: ({ account, transaction }) =>
-          formatDeviceAmount(account.currency, transaction.amount, {
-            postfixCode: true,
-          }),
+          formatCurrencyUnit(account.unit, transaction.amount, {
+            showCode: true,
+            disableRounding: true,
+            joinFragmentsSeparator: " ",
+          })
+            .replace(/\s+/g, " ")
+            .replace("egld", "EGLD"), // FIXME
       },
       {
         title: "Fee",

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

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit, findCompoundToken } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
 
 function subAccount(subAccountId, account) {
   const sub = (account.subAccounts || []).find((a) => a.id === subAccountId);
@@ -9,8 +10,28 @@ function subAccount(subAccountId, account) {
   return sub;
 }
 
+function expectedCompoundToken(t) {
+  if (!t) {
+    throw new Error("compound token was expected");
+  }
+
+  return t;
+}
+
 const maxFeesExpectedValue = ({ account, status }) =>
-  formatDeviceAmount(account.currency, status.estimatedFees);
+  formatCurrencyUnit(
+    {
+      ...account.unit,
+      code: account.currency.deviceTicker || account.unit.code,
+      prefixCode: true,
+    },
+    status.estimatedFees,
+    {
+      showCode: true,
+      disableRounding: true,
+      joinFragmentsSeparator: " ",
+    }
+  ).replace(/\s/g, " ");
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -45,6 +66,16 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
             return "Unlimited " + a.token.ticker;
           }
 
+          const unit = !a
+            ? {
+                ...account.unit,
+                code: account.currency.deviceTicker || account.unit.code,
+              }
+            : (transaction.mode === "compound.withdraw" &&
+              transaction.useAllAmount
+                ? expectedCompoundToken(findCompoundToken(a.token))
+                : a.token
+              ).units[0];
           const amount =
             a &&
             a.compoundBalance &&
@@ -52,20 +83,19 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
             transaction.useAllAmount
               ? a.compoundBalance
               : status.amount;
-
-          if (
-            a &&
-            transaction.mode === "compound.withdraw" &&
-            transaction.useAllAmount
-          ) {
-            return formatDeviceAmount(a.compoundBalance, amount);
-          }
-
-          if (a) {
-            return formatDeviceAmount(a.token, amount);
-          }
-
-          return formatDeviceAmount(account.currency, amount);
+          return formatCurrencyUnit(
+            {
+              ...unit,
+              code: account.currency.deviceTicker || account.unit.code,
+              prefixCode: true,
+            },
+            amount,
+            {
+              showCode: true,
+              disableRounding: true,
+              joinFragmentsSeparator: " ",
+            }
+          ).replace(/\s/g, " ");
         },
       },
       {

package/src/families/evm/specs.ts

@@ -3,7 +3,7 @@ import invariant from "invariant";
 import { DeviceModelId } from "@ledgerhq/devices";
 import { getCryptoCurrencyById, parseCurrencyUnit } from "../../currencies";
 import { acceptTransaction } from "./speculos-deviceActions";
-import { botTest, pickSiblings } from "../../bot/specs";
+import { pickSiblings } from "../../bot/specs";
 import type { AppSpec } from "../../bot/types";
 import type { Transaction } from "./types";
 
@@ -45,17 +45,13 @@ const evmBasicMutations = ({ maxAccount }) => [
         "operation time to be older than 60s"
       );
       const estimatedGas = transaction.gasLimit.times(
-        transaction.gasPrice || transaction.maxFeePerGas || 0
+        transaction.gasPrice || 0
       );
-      botTest("operation fee is not exceeding estimated gas", () =>
-        expect(operation.fee.toNumber()).toBeLessThanOrEqual(
-          estimatedGas.toNumber()
-        )
+      expect(operation.fee.toNumber()).toBeLessThanOrEqual(
+        estimatedGas.toNumber()
       );
-      botTest("account balance moved with operation value", () =>
-        expect(account.balance.toString()).toBe(
-          accountBeforeTransaction.balance.minus(operation.value).toString()
-        )
+      expect(account.balance.toString()).toBe(
+        accountBeforeTransaction.balance.minus(operation.value).toString()
       );
     },
   },

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

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
+import { deviceActionFlow } from "../../bot/specs";
 
 function subAccount(subAccountId, account) {
   const sub = (account.subAccounts || []).find((a) => a.id === subAccountId);
@@ -10,7 +11,19 @@ function subAccount(subAccountId, account) {
 }
 
 const maxFeesExpectedValue = ({ account, status }) =>
-  formatDeviceAmount(account.currency, status.estimatedFees);
+  formatCurrencyUnit(
+    {
+      ...account.unit,
+      code: account.currency.deviceTicker || account.unit.code,
+      prefixCode: true,
+    },
+    status.estimatedFees,
+    {
+      showCode: true,
+      disableRounding: true,
+      joinFragmentsSeparator: " ",
+    }
+  ).replace(/\s/g, " ");
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -31,11 +44,26 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
             ? subAccount(transaction.subAccountId, account)
             : null;
 
-          if (a) {
-            return formatDeviceAmount(a.token, status.amount);
-          }
-
-          return formatDeviceAmount(account.currency, status.amount);
+          const unit = !a
+            ? {
+                ...account.unit,
+                code: account.currency.deviceTicker || account.unit.code,
+              }
+            : a.token.units[0];
+          const amount = status.amount;
+          return formatCurrencyUnit(
+            {
+              ...unit,
+              code: account.currency.deviceTicker || account.unit.code,
+              prefixCode: true,
+            },
+            amount,
+            {
+              showCode: true,
+              disableRounding: true,
+              joinFragmentsSeparator: " ",
+            }
+          ).replace(/\s/g, " ");
         },
       },
       {

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

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { deviceActionFlow } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -24,8 +25,9 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         title: "Value",
         button: "Rr",
         expectedValue: ({ account, status }) =>
-          formatDeviceAmount(account.currency, status.amount, {
-            hideCode: true,
+          formatCurrencyUnit(account.unit, status.amount, {
+            disableRounding: true,
+            showAllDigits: true,
           }),
       },
       {
@@ -37,16 +39,18 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
         title: "Gas Premium",
         button: "Rr",
         expectedValue: ({ account, transaction }) =>
-          formatDeviceAmount(account.currency, transaction.gasPremium, {
-            hideCode: true,
+          formatCurrencyUnit(account.unit, transaction.gasPremium, {
+            disableRounding: true,
+            showAllDigits: true,
           }),
       },
       {
         title: "Gas Fee Cap",
         button: "Rr",
         expectedValue: ({ account, transaction }) =>
-          formatDeviceAmount(account.currency, transaction.gasFeeCap, {
-            hideCode: true,
+          formatCurrencyUnit(account.unit, transaction.gasFeeCap, {
+            disableRounding: true,
+            showAllDigits: true,
           }),
       },
       {

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

@@ -1,6 +1,7 @@
 import type { DeviceAction } from "../../bot/types";
 import type { PolkadotAccount, Transaction } from "./types";
-import { deviceActionFlow, formatDeviceAmount } from "../../bot/specs";
+import { deviceActionFlow } from "../../bot/specs";
+import { formatCurrencyUnit } from "../../currencies";
 
 export const acceptTransaction: DeviceAction<Transaction, any> =
   deviceActionFlow({
@@ -21,10 +22,20 @@ export const acceptTransaction: DeviceAction<Transaction, any> =
       {
         title: "Amount",
         button: "Rr",
-        expectedValue: ({ account, transaction }) =>
-          formatDeviceAmount(account.currency, transaction.amount, {
-            forceFloating: true,
-          }),
+        expectedValue: ({ account, transaction }) => {
+          const formattedValue =
+            "DOT " +
+            formatCurrencyUnit(account.unit, transaction.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;
+        },
       },
       {
         title: "Chain",