@ledgerhq/live-common 21.21.0 → 21.21.4

package/src/api/Ethereum.ts

@@ -210,7 +210,9 @@ export const apiForCurrency = (currency: CryptoCurrency): API => {
     async getNFTMetadata(input) {
       const { data }: { data: NFTMetadataResponse[] } = await network({
         method: "POST",
-        url: getEnv("NFT_ETH_METADATA_SERVICE"),
+        url:
+          getEnv("NFT_ETH_METADATA_SERVICE") +
+          "/v1/ethereum/1/contracts/tokens/infos",
         data: input,
       });
 

package/src/apps/support.ts

@@ -29,7 +29,7 @@ export function shouldUpgrade(
 const appVersionsRequired = {
   Cosmos: ">= 2.14",
   Algorand: ">= 1.2.9",
-  Polkadot: ">= 8.9100.0",
+  Polkadot: ">= 9.9140.0",
   Elrond: ">= 1.0.11",
 };
 export function mustUpgrade(

package/src/bot/engine.ts

@@ -39,6 +39,7 @@ import {
   formatReportForConsole,
   formatTime,
   formatAppCandidate,
+  formatError,
 } from "./formatters";
 import type {
   AppSpec,
@@ -510,7 +511,8 @@ export async function runOnAccount<T extends Transaction>({
       `spec ${spec.name}/${account.name}/${optimisticOperation.hash} confirmed`
     );
   } catch (error: any) {
-    log("mutation-error", spec.name + ": " + String(error));
+    console.error(error);
+    log("mutation-error", spec.name + ": " + formatError(error));
     report.error = error;
   }
 

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",
     parser: stringParser,
     desc: "service uri used to get the metadata of an nft",
   },

package/src/families/ethereum/signOperation.ts

@@ -14,6 +14,7 @@ import { apiForCurrency } from "../../api/Ethereum";
 import { withDevice } from "../../hw/deviceAccess";
 import { modes } from "./modules";
 import { isNFTActive } from "../../nft";
+import { getEnv } from "../../env";
 export const signOperation = ({
   account,
   deviceId,
@@ -63,9 +64,8 @@ export const signOperation = ({
               const eth = new Eth(transport);
               if (isNFTActive(account.currency)) {
                 eth.setLoadConfig({
-                  // FIXME drop this after LL-8001
                   nftExplorerBaseURL:
-                    "https://nft.staging.aws.ledger.fr/v1/ethereum",
+                    getEnv("NFT_ETH_METADATA_SERVICE") + "/v1/ethereum",
                 });
               }
               // FIXME this part is still required for compound to correctly display info on the device

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,
       },
     };
   });