@ledgerhq/live-common 21.31.0 → 21.32.3

package/src/families/bitcoin/wallet-btc/crypto/zen.ts

@@ -8,15 +8,15 @@ import bs58check from "bs58check";
 import coininfo from "coininfo";
 import { InvalidAddress } from "@ledgerhq/errors";
 import { DerivationModes } from "../types";
-import { ICrypto } from "./types";
 import Base from "./base";
 
-class Zen implements ICrypto {
+class Zen extends Base {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   network: any;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor({ network }: { network: any }) {
+    super({ network });
     // refer to https://github.com/HorizenOfficial/zen/blob/master/src/chainparams.cpp for the blockchain params
     this.network = network;
     this.network.versions = {
@@ -67,26 +67,13 @@ class Zen implements ICrypto {
     return this.baddrToTaddr(bs58check.encode(Buffer.from(baddr)));
   }
 
-  getAddress(
+  customGetAddress(
     derivationMode: string,
     xpub: string,
     account: number,
     index: number
   ): string {
-    if (
-      Base.addressCache[
-        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-      ]
-    ) {
-      return Base.addressCache[
-        `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-      ];
-    }
-    const address = this.getLegacyAddress(xpub, account, index);
-    Base.addressCache[
-      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-    ] = address;
-    return address;
+    return this.getLegacyAddress(xpub, account, index);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -122,11 +109,6 @@ class Zen implements ICrypto {
       (res[1] === 0x89 || res[1] === 0x96)
     );
   }
-
-  // eslint-disable-next-line
-  isTaprootAddress(address: string): boolean {
-    return false;
-  }
 }
 
 export default Zen;

package/src/families/bitcoin/wallet-btc/explorer/index.ts

@@ -239,6 +239,12 @@ class BitcoinLikeExplorer extends EventEmitter implements IExplorer {
     // @ts-ignore
     // eslint-disable-next-line no-param-reassign
     delete tx.confirmations;
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    delete tx.id;
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    delete tx.lock_time;
 
     // eslint-disable-next-line no-param-reassign
     tx.account = address.account;
@@ -246,7 +252,21 @@ class BitcoinLikeExplorer extends EventEmitter implements IExplorer {
     tx.index = address.index;
     // eslint-disable-next-line no-param-reassign
     tx.address = address.address;
+    tx.inputs.forEach((input) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      delete input.txinwitness;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      delete input.script_signature;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      delete input.input_index;
+    });
     tx.outputs.forEach((output) => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      delete output.script_hex;
       // eslint-disable-next-line no-param-reassign
       output.output_hash = tx.hash;
       // eslint-disable-next-line no-param-reassign

package/src/families/bitcoin/wallet-btc/storage/types.ts

@@ -24,7 +24,6 @@ export interface Output {
   address: string;
   output_hash: string;
   output_index: number;
-  script_hex: string;
   block_height: number | null;
   // TODO Write tests for RBF unconfirmed outputs
   rbf: boolean;

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

@@ -34,7 +34,6 @@ const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
     {
       title: "Max Fees",
       button: "Rr",
-      expectedValue: () => "CELO",
     },
     {
       title: "No Gateway Fee",

package/src/families/ethereum/signOperation.ts

@@ -2,6 +2,7 @@ import invariant from "invariant";
 import { Observable, from, of } from "rxjs";
 import { mergeMap } from "rxjs/operators";
 import eip55 from "eip55";
+import { encode } from "rlp";
 import { BigNumber } from "bignumber.js";
 import { log } from "@ledgerhq/logs";
 import { FeeNotLoaded } from "@ledgerhq/errors";
@@ -17,6 +18,7 @@ import { modes } from "./modules";
 import { isNFTActive } from "../../nft";
 import { getEnv } from "../../env";
 import { LoadConfig } from "@ledgerhq/hw-app-eth/lib/services/types";
+import { Transaction as EthereumTx } from "@ethereumjs/tx";
 export const signOperation = ({
   account,
   deviceId,
@@ -54,18 +56,16 @@ export const signOperation = ({
                 throw new FeeNotLoaded();
               }
 
-              const { tx, fillTransactionDataResult } = buildEthereumTx(
-                account,
-                transaction,
-                nonce
-              );
-              const to = eip55.encode("0x" + tx.to.toString("hex"));
+              const { ethTxObject, tx, common, fillTransactionDataResult } =
+                buildEthereumTx(account, transaction, nonce);
+              const to = eip55.encode((tx.to || "").toString());
               const value = new BigNumber(
                 "0x" + (tx.value.toString("hex") || "0")
               );
-
-              const txHex = tx.serialize().toString("hex");
-
+              // rawData Format: `rlp([nonce, gasPrice, gasLimit, to, value, data, v, r, s])`
+              const rawData = tx.raw();
+              rawData[6] = Buffer.from([common.chainIdBN().toNumber()]);
+              const txHex = Buffer.from(encode(rawData)).toString("hex");
               const loadConfig: LoadConfig = {};
               if (isNFTActive(account.currency)) {
                 loadConfig.nftExplorerBaseURL =
@@ -106,26 +106,27 @@ export const signOperation = ({
                 }
               }
 
-              o.next({
-                type: "device-signature-requested",
-              });
+              o.next({ type: "device-signature-requested" });
               const result = await eth.signTransaction(
                 freshAddressPath,
                 txHex,
                 resolution
               );
               if (cancelled) return;
-              o.next({
-                type: "device-signature-granted",
-              });
+              o.next({ type: "device-signature-granted" });
               // Second, we re-set some tx fields from the device signature
-              const v = result.v;
+              const v = `0x${result.v}`;
+              const r = `0x${result.r}`;
+              const s = `0x${result.s}`;
+
+              const signedTx = new EthereumTx(
+                { ...ethTxObject, v, r, s },
+                { common }
+              );
 
-              tx.v = Buffer.from(v, "hex");
-              tx.r = Buffer.from(result.r, "hex");
-              tx.s = Buffer.from(result.s, "hex");
               // Generate the signature ready to be broadcasted
-              const signature = `0x${tx.serialize().toString("hex")}`;
+              const signature = `0x${signedTx.serialize().toString("hex")}`;
+
               // build optimistic operation
               const txHash = ""; // resolved at broadcast time
 

package/src/families/ethereum/specs.ts

@@ -118,7 +118,6 @@ const ethereum: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.5.0-rc3",
   },
   testTimeout: 4 * 60 * 1000,
   transactionCheck: ({ maxSpendable }) => {
@@ -380,7 +379,6 @@ const ethereumRopsten: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Ethereum",
-    appVersion: "1.5.0-rc3",
   },
   testTimeout: 2 * 60 * 1000,
   transactionCheck: ({ maxSpendable }) => {

package/src/families/ethereum/transaction.ts

@@ -6,8 +6,8 @@ import type {
   TransactionRaw,
   EthereumGasLimitRequest,
 } from "./types";
-import Common from "ethereumjs-common";
-import { Transaction as EthereumTx } from "ethereumjs-tx";
+import Common from "@ethereumjs/common";
+import { Transaction as EthereumTx } from "@ethereumjs/tx";
 import eip55 from "eip55";
 import {
   InvalidAddress,
@@ -196,23 +196,18 @@ function getEthereumjsTxCommon(currency) {
     `currency ${currency.id} did not set ethereumLikeInfo`
   );
   if (ethereumLikeInfo.chainId === 1) {
-    return new Common(
-      // $FlowFixMe
-      ethereumLikeInfo.baseChain || "mainnet",
-      // $FlowFixMe
-      ethereumLikeInfo.hardfork || "petersburg"
-    );
+    return new Common({
+      chain: ethereumLikeInfo.baseChain || "mainnet",
+      hardfork: ethereumLikeInfo.hardfork || "petersburg",
+    });
   }
   return Common.forCustomChain(
-    // $FlowFixMe
     ethereumLikeInfo.baseChain || "mainnet",
     {
       name: currency.ticker,
       chainId: ethereumLikeInfo.chainId,
-      // $FlowFixMe
       networkId: ethereumLikeInfo.networkId || ethereumLikeInfo.chainId,
     },
-    // $FlowFixMe
     ethereumLikeInfo.hardfork || "petersburg"
   );
 }
@@ -239,8 +234,6 @@ export function buildEthereumTx(
     "only token accounts expected"
   );
   const common = getEthereumjsTxCommon(currency);
-  invariant(common, `common not found for currency ${currency.name}`);
-  // FIXME: make sure it doesn't break
   if (!common) {
     throw new Error(`common not found for currency ${currency.name}`);
   }
@@ -258,18 +251,11 @@ export function buildEthereumTx(
     ethTxObject
   );
   log("ethereum", "buildEthereumTx", ethTxObject);
-  const tx = new EthereumTx(ethTxObject, {
-    common,
-  });
-  // these will be filled by device signature
-  tx.raw[6] = Buffer.from([common.chainId()]); // v
-
-  tx.raw[7] = Buffer.from([]); // r
-
-  tx.raw[8] = Buffer.from([]); // s
-
+  const tx = new EthereumTx(ethTxObject, { common });
   return {
     tx,
+    common,
+    ethTxObject,
     fillTransactionDataResult,
   };
 }
@@ -294,7 +280,7 @@ export function inferEthereumGasLimitRequest(
     }
 
     if (to) {
-      r.to = "0x" + to.toString("hex");
+      r.to = to.toString();
     }
 
     if (data) {

package/src/families/solana/specs.ts

@@ -12,7 +12,7 @@ const solana: AppSpec<Transaction> = {
   name: "Solana",
   appQuery: {
     model: DeviceModelId.nanoS,
-    firmware: "<2",
+    firmware: "2",
     appName: "solana",
   },
   currency: getCryptoCurrencyById("solana"),

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

@@ -17,8 +17,6 @@ tz1RCFbB9GpALpsZtu6J58sb74dm8qe6XBzv
 tz1dbfppLAAxXZNtf2SDps7rch3qfUznKSoK
 tz1Q8QkSBS63ZQnH3fBTiAMPes9R666Rn6Sc
 tz2FCNBrERXtaTtNX6iimR1UJ5JSDxvdHM93
-tz1Vyuu4EJ5Nym4JcrfRLnp3hpaq1DSEp1Ke
-tz1S1Aew75hMrPUymqenKfHo8FspppXKpW7h
 tz1SohptP53wDPZhzTWzDUFAUcWF6DMBpaJV
 tz1P2Po7YM526ughEsRbY4oR9zaUPDZjxFrb
 tz1KzSC1J9aBxKp7u8TUnpN8L7S65PBRkgdF

package/src/families/tezos/bridge/js.ts

@@ -1,6 +1,10 @@
 // @flow
 import { BigNumber } from "bignumber.js";
-import { TezosToolkit, DEFAULT_FEE } from "@taquito/taquito";
+import {
+  TezosToolkit,
+  DEFAULT_FEE,
+  DEFAULT_STORAGE_LIMIT,
+} from "@taquito/taquito";
 import {
   AmountRequired,
   NotEnoughBalance,
@@ -201,6 +205,7 @@ const prepareTransaction = async (
           mutez: true,
           to: transaction.recipient,
           amount: amount.toNumber(),
+          storageLimit: DEFAULT_STORAGE_LIMIT.ORIGINATION, // https://github.com/TezTech/eztz/blob/master/PROTO_003_FEES.md for originating an account
         });
         break;
       case "delegate":

package/src/families/tezos/test-specifics.ts

@@ -4,6 +4,7 @@ import { loadAccountDelegation, listBakers } from "./bakers";
 import whitelist from "./bakers.whitelist-default";
 export default () => {
   describe("tezos bakers", () => {
+    // FIXME Flaky test that will fail every time a Tezos baker is discontinued
     test("getting the bakers", async () => {
       const list = await listBakers(whitelist);
       expect(list.map((o) => o.address)).toEqual(whitelist);

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

@@ -6,6 +6,8 @@ import { defaultTronResources } from "./utils";
 import bridge from "./bridge/js";
 import { Account } from "../../types";
 
+jest.setTimeout(30000);
+
 const tron = getCryptoCurrencyById("tron");
 const defaultSyncConfig = {
   paginationConfig: {},

package/src/load/speculos.ts

@@ -412,7 +412,13 @@ function parseAppSearch(query: string):
   };
 }
 
-async function openImplicitSpeculos(query: string) {
+export async function createImplicitSpeculos(query: string): Promise<{
+  device: {
+    transport: SpeculosTransport;
+    id: string;
+  };
+  appCandidate: AppCandidate;
+} | null> {
   const coinapps = getEnv("COINAPPS");
   invariant(coinapps, "COINAPPS folder is missing!");
   const seed = getEnv("SEED");
@@ -438,16 +444,23 @@ async function openImplicitSpeculos(query: string) {
     "speculos",
     "using app " + formatAppCandidate(appCandidate as AppCandidate)
   );
-  const device = appCandidate
-    ? await createSpeculosDevice({
-        ...appCandidate,
-        coinapps,
-        appName,
-        dependency,
-        seed,
-      })
+  return appCandidate
+    ? {
+        device: await createSpeculosDevice({
+          ...appCandidate,
+          coinapps,
+          appName,
+          dependency,
+          seed,
+        }),
+        appCandidate,
+      }
     : null;
-  return device?.transport;
+}
+
+async function openImplicitSpeculos(query: string) {
+  const r = await createImplicitSpeculos(query);
+  return r?.device.transport;
 }
 
 registerTransportModule({