@ledgerhq/live-common 21.21.0-rc.2 → 21.21.2

package/src/bot/formatters.ts

@@ -18,6 +18,16 @@ const formatDt = (from, to) => (from && to ? formatTime(to - from) : "?");
 export function formatAppCandidate(appCandidate: AppCandidate) {
   return `${appCandidate.appName} ${appCandidate.appVersion} on ${appCandidate.model} ${appCandidate.firmware}`;
 }
+
+export function formatError(e: any) {
+  if (!e || typeof e !== "object" || e instanceof Error) return String(e);
+  try {
+    return "raw object: " + JSON.stringify(e).slice(0, 400);
+  } catch (_e) {
+    return String(e);
+  }
+}
+
 export function formatReportForConsole<T extends Transaction>({
   syncAllAccountsTime,
   appCandidate,
@@ -137,7 +147,7 @@ export function formatReportForConsole<T extends Transaction>({
   }
 
   if (error) {
-    str += `⚠️ ${String(error)}\n`;
+    str += `⚠️ ${formatError(error)}\n`;
   }
 
   return str;

package/src/bot/index.ts

@@ -18,7 +18,7 @@ import {
 } from "../currencies";
 import { isAccountEmpty } from "../account";
 import { runWithAppSpec } from "./engine";
-import { formatReportForConsole } from "./formatters";
+import { formatReportForConsole, formatError } from "./formatters";
 import {
   initialState,
   calculate,
@@ -230,7 +230,7 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
     let subtitle = "";
 
     if (countervaluesError) {
-      subtitle += `> ${String(countervaluesError)}`;
+      subtitle += `> ${formatError(countervaluesError)}`;
     }
 
     let slackBody = "";
@@ -254,8 +254,8 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
       body += `<summary>${specFatals.length} critical spec errors</summary>\n\n`;
       specFatals.forEach(({ spec, fatalError }) => {
         body += `**Spec ${spec.name} failed!**\n`;
-        body += "```\n" + String(fatalError) + "\n```\n\n";
-        slackBody += `❌ *Spec ${spec.name}*: \`${String(fatalError)}\`\n`;
+        body += "```\n" + formatError(fatalError) + "\n```\n\n";
+        slackBody += `❌ *Spec ${spec.name}*: \`${formatError(fatalError)}\`\n`;
       });
       body += "</details>\n\n";
     }
@@ -268,7 +268,7 @@ export async function bot({ currency, family, mutation }: Arg = {}) {
           "```\n" +
           formatReportForConsole(c) +
           "\n" +
-          String(c.error) +
+          formatError(c.error) +
           "\n```\n\n";
       });
       body += "</details>\n\n";

package/src/env.ts

@@ -387,8 +387,7 @@ const envDefinitions = {
     desc: "set the currencies where NFT is active",
   },
   NFT_ETH_METADATA_SERVICE: {
-    // FIXME LL-8001
-    def: "https://nft.staging.aws.ledger.fr/v1/ethereum/1/contracts/tokens/infos",
+    def: "https://nft.api.live.ledger.com/v1/ethereum/1/contracts/tokens/infos",
     parser: stringParser,
     desc: "service uri used to get the metadata of an nft",
   },

package/src/families/crypto_org/js-buildTransaction.ts

@@ -10,8 +10,8 @@ const getTransactionAmount = (a: Account, t: Transaction) => {
   switch (t.mode) {
     case "send":
       if (t.useAllAmount) {
-        const amountMinusFee = t.amount.minus(t.fees || 0);
-        return new croSdk.Coin(amountMinusFee.toString(), Units.BASE);
+        const balanceMinusFee = a.balance.minus(t.fees || 0);
+        return new croSdk.Coin(balanceMinusFee.toString(), Units.BASE);
       } else {
         return new croSdk.Coin(t.amount.toString(), Units.BASE);
       }

package/src/families/filecoin/bridge/account.ts

@@ -2,7 +2,6 @@ import {
   AmountRequired,
   FeeNotLoaded,
   InvalidAddress,
-  InvalidAddressBecauseDestinationIsAlsoSource,
   NotEnoughBalance,
   RecipientRequired,
 } from "@ledgerhq/errors";
@@ -71,8 +70,6 @@ const getTransactionStatus = async (
   const { recipient, amount, gasPremium, gasFeeCap, gasLimit } = t;
 
   if (!recipient) errors.recipient = new RecipientRequired();
-  else if (address === recipient)
-    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
   else if (!validateAddress(recipient).isValid)
     errors.recipient = new InvalidAddress();
   else if (!validateAddress(address).isValid)

package/src/families/filecoin/bridge/utils/types.ts

@@ -23,6 +23,7 @@ export interface TransactionResponse {
   hash: string;
   timestamp: number;
   height: number;
+  fee?: string;
 }
 
 export interface BalanceResponse {

package/src/families/filecoin/bridge/utils/utils.ts

@@ -14,27 +14,59 @@ import { encodeAccountId } from "../../../../account";
 import flatMap from "lodash/flatMap";
 import { Transaction } from "../../types";
 
+type TxsById = {
+  [id: string]: {
+    Send: TransactionResponse;
+    Fee?: TransactionResponse;
+  };
+};
+
 export const getUnit = () => getCryptoCurrencyById("filecoin").units[0];
 
+export const processTxs = (
+  txs: TransactionResponse[]
+): TransactionResponse[] => {
+  const txsById = txs.reduce((result: TxsById, currentTx) => {
+    const { hash, type } = currentTx;
+    const txById = result[hash] || {};
+
+    if (type == "Send" || type == "Fee") txById[type] = currentTx;
+
+    result[hash] = txById;
+    return result;
+  }, {});
+
+  const processedTxs: TransactionResponse[] = [];
+  for (const txId in txsById) {
+    const { Fee: feeTx, Send: sendTx } = txsById[txId];
+
+    if (feeTx) sendTx.fee = feeTx.amount.toString();
+
+    processedTxs.push(sendTx);
+  }
+
+  return processedTxs;
+};
+
 export const mapTxToOps =
   (id, { address }: GetAccountShapeArg0) =>
   (tx: TransactionResponse): Operation[] => {
-    const { to, from, hash, timestamp, amount } = tx;
+    const { to, from, hash, timestamp, amount, fee } = tx;
     const ops: Operation[] = [];
     const date = new Date(timestamp * 1000);
     const value = parseCurrencyUnit(getUnit(), amount.toString());
 
     const isSending = address === from;
     const isReceiving = address === to;
-    const fee = new BigNumber(0);
+    const feeToUse = new BigNumber(fee || 0);
 
     if (isSending) {
       ops.push({
         id: `${id}-${hash}-OUT`,
         hash,
         type: "OUT",
-        value: value.plus(fee),
-        fee,
+        value: value.plus(feeToUse),
+        fee: feeToUse,
         blockHeight: tx.height,
         blockHash: null,
         accountId: id,
@@ -51,7 +83,7 @@ export const mapTxToOps =
         hash,
         type: "IN",
         value,
-        fee,
+        fee: feeToUse,
         blockHeight: tx.height,
         blockHash: null,
         accountId: id,
@@ -120,13 +152,13 @@ export const getAccountShape: GetAccountShape = async (info) => {
 
   const blockHeight = await fetchBlockHeight();
   const balance = await fetchBalances(address);
-  const txs = await fetchTxs(address);
+  const rawTxs = await fetchTxs(address);
 
   const result = {
     id: accountId,
     balance: new BigNumber(balance.total_balance),
     spendableBalance: new BigNumber(balance.spendable_balance),
-    operations: flatMap(txs, mapTxToOps(accountId, info)),
+    operations: flatMap(processTxs(rawTxs), mapTxToOps(accountId, info)),
     blockHeight: blockHeight.current_block_identifier.index,
   };
 

package/src/families/filecoin/test-dataset.ts

@@ -2,7 +2,6 @@ import { BigNumber } from "bignumber.js";
 import {
   AmountRequired,
   InvalidAddress,
-  InvalidAddressBecauseDestinationIsAlsoSource,
   NotEnoughBalance,
 } from "@ledgerhq/errors";
 
@@ -56,27 +55,6 @@ const filecoin = {
         balance: "1000",
       },
       transactions: [
-        {
-          name: "recipient and sender must not be the same",
-          transaction: fromTransactionRaw({
-            family: "filecoin",
-            method: 1,
-            version: 1,
-            nonce: 100,
-            gasFeeCap: "1000",
-            gasLimit: 100,
-            gasPremium: "200",
-            recipient: SEED_IDENTIFIER,
-            amount: "100000000",
-          }),
-          expectedStatus: {
-            amount: new BigNumber("100000000"),
-            errors: {
-              recipient: new InvalidAddressBecauseDestinationIsAlsoSource(),
-            },
-            warnings: {},
-          },
-        },
         {
           name: "Not a valid address",
           transaction: fromTransactionRaw({

package/src/families/polkadot/api/sidecar.types.ts

@@ -1,3 +1,5 @@
+import type { HexString } from "@polkadot/util/types";
+
 interface IAt {
   hash: string;
   height: string;
@@ -137,7 +139,7 @@ export interface SidecarTransactionMaterial {
   specName: string;
   specVersion: string;
   txVersion: string;
-  metadata?: string;
+  metadata?: HexString;
 }
 export interface SidecarTransactionBroadcast {
   hash: string;

package/src/families/solana/errors.ts

@@ -4,10 +4,6 @@ export const SolanaAccountNotFunded = createCustomErrorClass(
   "SolanaAccountNotFunded"
 );
 
-export const SolanaNotEnoughBalanceToPayFees = createCustomErrorClass(
-  "SolanaNotEnoughBalanceToPayFees"
-);
-
 export const SolanaRecipientAssociatedTokenAccountWillBeFunded =
   createCustomErrorClass("SolanaAssociatedTokenAccountWillBeFunded");
 

package/src/families/solana/js-getTransactionStatus.ts

@@ -1,10 +1,10 @@
 import { BigNumber } from "bignumber.js";
 import type { Account, TransactionStatus } from "../../types";
-import type { Command, Transaction } from "./types";
+import type { Command, Transaction, TransactionModel } from "./types";
 import { assertUnreachable } from "./utils";
 
 const getTransactionStatus = async (
-  _: Account,
+  account: Account,
   tx: Transaction
 ): Promise<TransactionStatus> => {
   const txFees = new BigNumber(tx.feeCalculator?.lamportsPerSignature ?? 0);
@@ -12,28 +12,37 @@ const getTransactionStatus = async (
   const { commandDescriptor } = tx.model;
 
   if (commandDescriptor === undefined) {
+    const amount = getAmountForModel(account, tx, txFees);
+    const totalSpent = getTotalSpentForModel(tx.model, amount, txFees);
     return {
-      amount: new BigNumber(tx.amount),
+      amount,
       errors: {},
       warnings: {},
       estimatedFees: txFees,
-      totalSpent: new BigNumber(tx.amount),
+      totalSpent,
     };
   }
   switch (commandDescriptor.status) {
-    case "invalid":
+    case "invalid": {
+      const amount = getAmountForModel(account, tx, txFees);
+      const totalSpent = getTotalSpentForModel(tx.model, amount, txFees);
       return {
-        amount: new BigNumber(tx.amount),
+        amount,
         errors: commandDescriptor.errors,
         warnings: commandDescriptor.warnings ?? {},
         estimatedFees: txFees,
-        totalSpent: new BigNumber(0),
+        totalSpent,
       };
+    }
     case "valid": {
       const { command } = commandDescriptor;
       const estimatedFees = txFees.plus(commandDescriptor.fees ?? 0);
-      const amount = getAmount(tx, command);
-      const totalSpent = getTotalSpent(command, amount, estimatedFees);
+      const amount = getAmountForCommand(command);
+      const totalSpent = getTotalSpentForCommand(
+        command,
+        amount,
+        estimatedFees
+      );
 
       return {
         amount,
@@ -48,17 +57,61 @@ const getTransactionStatus = async (
   }
 };
 
-function getAmount(tx: Transaction, command: Command) {
+function getAmountForModel(
+  account: Account,
+  tx: Transaction,
+  estimatedFees: BigNumber
+) {
+  const { model } = tx;
+  switch (model.kind) {
+    case "transfer": {
+      if (tx.amount.lte(0)) {
+        return tx.amount;
+      }
+      const amount = tx.useAllAmount
+        ? account.balance.minus(estimatedFees)
+        : BigNumber.max(tx.amount, 0);
+      return amount.gte(0) ? amount : account.balance;
+    }
+    case "token.transfer":
+      return tx.useAllAmount ? account.balance : tx.amount;
+    case "token.createATA":
+      return new BigNumber(0);
+    default:
+      return assertUnreachable(model);
+  }
+}
+
+function getTotalSpentForModel(
+  model: TransactionModel,
+  amount: BigNumber,
+  estimatedFees: BigNumber
+) {
+  switch (model.kind) {
+    case "transfer":
+      return amount.plus(estimatedFees);
+    case "token.transfer":
+      return amount;
+    case "token.createATA":
+      return estimatedFees;
+    default:
+      return assertUnreachable(model);
+  }
+}
+
+function getAmountForCommand(command: Command) {
   switch (command.kind) {
     case "transfer":
     case "token.transfer":
       return new BigNumber(command.amount);
+    case "token.createATA":
+      return new BigNumber(0);
     default:
-      return tx.amount;
+      return assertUnreachable(command);
   }
 }
 
-function getTotalSpent(
+function getTotalSpentForCommand(
   command: Command,
   amount: BigNumber,
   estimatedFees: BigNumber

package/src/families/solana/js-prepareTransaction.ts

@@ -17,7 +17,6 @@ import {
   SolanaMemoIsTooLong,
   SolanaTokenAccountHoldsAnotherToken,
   SolanaRecipientAssociatedTokenAccountWillBeFunded,
-  SolanaNotEnoughBalanceToPayFees,
   SolanaTokenRecipientIsSenderATA,
   SolanaTokenAccounNotInitialized,
 } from "./errors";
@@ -64,11 +63,13 @@ async function deriveCommandDescriptor(
       }
 
       if (model.uiState.memo) {
-        const encoder = new TextEncoder();
-        if (encoder.encode(model.uiState.memo).byteLength > MAX_MEMO_LENGTH) {
+        const memoBytes = Buffer.from(model.uiState.memo, "utf-8");
+        if (memoBytes.byteLength > MAX_MEMO_LENGTH) {
           errors.memo = errors.memo = new SolanaMemoIsTooLong(undefined, {
             maxLength: MAX_MEMO_LENGTH,
           });
+          // LLM expects <transaction> as error key to disable continue button
+          errors.transaction = errors.memo;
         }
       }
 
@@ -102,6 +103,8 @@ const prepareTransaction = async (
 
   if (tx.feeCalculator === undefined) {
     patch.feeCalculator = feeCalculator;
+    // LLM requires this field to be truthy to show fees
+    (patch as any).networkInfo = true;
   }
 
   const txToDeriveFrom = {
@@ -137,7 +140,7 @@ const prepareTransaction = async (
       const totalFees =
         feeCalculator.lamportsPerSignature + (commandDescriptor.fees ?? 0);
       if (mainAccount.balance.lt(totalFees)) {
-        errors.amount = new SolanaNotEnoughBalanceToPayFees();
+        errors.amount = new NotEnoughBalance();
       }
     }
   }

package/src/families/solana/js-signOperation.ts

@@ -7,6 +7,7 @@ import type {
 } from "../../types";
 import { open, close } from "../../hw";
 import type {
+  Command,
   TokenCreateATACommand,
   TokenTransferCommand,
   Transaction,
@@ -147,9 +148,7 @@ function optimisticOpForTransfer(
     senders: [account.freshAddress],
     recipients: [transaction.recipient],
     value: new BigNumber(command.amount).plus(commons.fee),
-    extra: {
-      memo: command.memo,
-    },
+    extra: getOpExtras(command),
   };
 }
 
@@ -170,9 +169,7 @@ function optimisticOpForTokenTransfer(
     senders: [account.freshAddress],
     recipients: [transaction.recipient],
     value: new BigNumber(command.amount),
-    extra: {
-      memo: command.memo,
-    },
+    extra: getOpExtras(command),
     subOperations: [
       {
         ...optimisticOpcommons(transaction, commandDescriptor),
@@ -182,9 +179,7 @@ function optimisticOpForTokenTransfer(
         senders: [account.freshAddress],
         recipients: [transaction.recipient],
         value: new BigNumber(command.amount),
-        extra: {
-          memo: command.memo,
-        },
+        extra: getOpExtras(command),
       },
     ],
   };
@@ -228,3 +223,20 @@ function optimisticOpcommons(
     extra: {},
   };
 }
+
+function getOpExtras(command: Command): Record<string, any> {
+  const extra: Record<string, any> = {};
+  switch (command.kind) {
+    case "transfer":
+    case "token.transfer":
+      if (command.memo !== undefined) {
+        extra.memo = command.memo;
+      }
+      break;
+    case "token.createATA":
+      break;
+    default:
+      return assertUnreachable(command);
+  }
+  return extra;
+}

package/src/families/solana/js-synchronization.ts

@@ -299,9 +299,7 @@ function txToMainAccOperation(
     hasFailed: !!tx.info.err,
     blockHeight: tx.info.slot,
     blockHash: message.recentBlockhash,
-    extra: {
-      memo: tx.info.memo ? dropMemoLengthPrefixIfAny(tx.info.memo) : undefined,
-    },
+    extra: getOpExtra(tx),
     type: opType,
     senders,
     recipients,
@@ -311,6 +309,15 @@ function txToMainAccOperation(
   };
 }
 
+function getOpExtra(tx: TransactionDescriptor): Record<string, any> {
+  const extra: Record<string, any> = {};
+  if (tx.info.memo !== null) {
+    extra.memo = dropMemoLengthPrefixIfAny(tx.info.memo);
+  }
+
+  return extra;
+}
+
 function txToTokenAccOperation(
   tx: TransactionDescriptor,
   assocTokenAcc: OnChainTokenAccount,
@@ -364,9 +371,7 @@ function txToTokenAccOperation(
     senders,
     value: delta.abs(),
     hasFailed: !!tx.info.err,
-    extra: {
-      memo: tx.info.memo ? dropMemoLengthPrefixIfAny(tx.info.memo) : undefined,
-    },
+    extra: getOpExtra(tx),
     blockHash: tx.parsed.transaction.message.recentBlockhash,
   };
 }

package/src/families/solana/test-dataset.ts

@@ -110,7 +110,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: zero,
-                totalSpent: zero,
+                totalSpent: fees(1),
               },
             },
             {
@@ -175,7 +175,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: testOnChainData.fundedSenderBalance,
-                totalSpent: zero,
+                totalSpent: testOnChainData.fundedSenderBalance.plus(fees(1)),
               },
             },
             {
@@ -204,7 +204,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: testOnChainData.fundedSenderBalance.plus(1),
                 amount: zero,
-                totalSpent: zero,
+                totalSpent: testOnChainData.fundedSenderBalance.plus(1),
               },
             },
             {
@@ -226,7 +226,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: zero,
-                totalSpent: zero,
+                totalSpent: fees(1),
               },
             },
             {
@@ -248,7 +248,7 @@ const dataset: DatasetTest<Transaction> = {
                 warnings: {},
                 estimatedFees: fees(1),
                 amount: new BigNumber(-1),
-                totalSpent: zero,
+                totalSpent: new BigNumber(-1).plus(fees(1)),
               },
             },
             {
@@ -497,7 +497,7 @@ function recipientRequired(): TransactionTestSpec[] {
         warnings: {},
         estimatedFees: fees(1),
         amount: zero,
-        totalSpent: zero,
+        totalSpent: model.kind === "transfer" ? fees(1) : zero,
       },
     };
   });

package/src/families/tezos/synchronisation.test.ts

@@ -9,8 +9,8 @@ import { makeSync } from "../../bridge/jsHelpers";
 import { getAccountShape } from "./synchronisation";
 
 const accounts = [
-  "tz1cf8diKsP1WoeucTQm1BcVfdyrmaBnL4nC",
-  "tz1ZshTmtorFVkcZ7CpceCAxCn7HBJqTfmpk",
+  //  "tz1cf8diKsP1WoeucTQm1BcVfdyrmaBnL4nC", // FIXME
+  //   "tz1ZshTmtorFVkcZ7CpceCAxCn7HBJqTfmpk", // FIXME
   "tz1ZL36Xw6LJ9RK6tb7QW85o7SVYfFKSMw8c",
   "tz1VacAyLcnHU3pEY3VNNK45F1CvVyTYXA3z",
   "tz1hpWkvAVVgftPy4CW8rD3u6tdVd8g1RU58",

package/src/hw/actions/app.ts

@@ -2,6 +2,7 @@ import invariant from "invariant";
 import {
   concat,
   of,
+  timer,
   interval,
   Observable,
   throwError,
@@ -11,7 +12,6 @@ import {
 import {
   scan,
   debounce,
-  debounceTime,
   catchError,
   timeout,
   switchMap,
@@ -161,7 +161,7 @@ const reducer = (state: State, e: Event): State => {
       return { ...state, unresponsive: true };
 
     case "disconnected":
-      return getInitialState();
+      return { ...getInitialState(), isLoading: !!e.expected };
 
     case "deviceChange":
       return { ...getInitialState(e.device), device: e.device };
@@ -384,13 +384,14 @@ function inferCommandParams(appRequest: AppRequest) {
   };
 }
 
+const DISCONNECT_DEBOUNCE = 5000;
 const implementations = {
   // in this paradigm, we know that deviceSubject is reflecting the device events
   // so we just trust deviceSubject to reflect the device context (switch between apps, dashboard,...)
   event: ({ deviceSubject, connectApp, params }) =>
     deviceSubject.pipe(
-      // debounce a bit the connect/disconnect event that we don't need
-      debounceTime(1000), // each time there is a device change, we pipe to the command
+      // debounce a bit the disconnect events that we don't need
+      debounce((device) => timer(!device ? DISCONNECT_DEBOUNCE : 0)),
       switchMap((device) =>
         concat(
           of({
@@ -406,7 +407,6 @@ const implementations = {
     Observable.create((o) => {
       const POLLING = 2000;
       const INIT_DEBOUNCE = 5000;
-      const DISCONNECT_DEBOUNCE = 5000;
       const DEVICE_POLLING_TIMEOUT = 20000;
       // this pattern allows to actually support events based (like if deviceSubject emits new device changes) but inside polling paradigm
       let pollingOnDevice;
@@ -486,7 +486,6 @@ const implementations = {
                     device,
                   });
                 }
-
                 o.next(event);
               }
             },

package/src/hw/connectApp.ts

@@ -53,6 +53,7 @@ export type ConnectAppEvent =
     }
   | {
       type: "disconnected";
+      expected?: boolean;
     }
   | {
       type: "device-permission-requested";
@@ -144,6 +145,7 @@ const attemptToQuitApp = (
         concatMap(() =>
           of<ConnectAppEvent>({
             type: "disconnected",
+            expected: true,
           })
         ),
         catchError((e) => throwError(e))