@ledgerhq/live-common 21.32.1 → 21.32.5

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

@@ -1,4 +1,4 @@
-import ecc from "tiny-secp256k1";
+import { publicKeyTweakAdd } from "secp256k1";
 import createHmac from "create-hmac";
 
 // the BIP32 class is inspired from https://github.com/bitcoinjs/bip32/blob/master/src/bip32.js
@@ -28,7 +28,7 @@ class BIP32 {
     const I = createHmac("sha512", this.chainCode).update(data).digest();
     const IL = I.slice(0, 32);
     const IR = I.slice(32);
-    const Ki = ecc.pointAddScalar(this.publicKey, IL, true);
+    const Ki = Buffer.from(publicKeyTweakAdd(this.publicKey, IL));
     return new BIP32(Ki, IR, this.network, this.depth + 1, index);
   }
 }

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

@@ -119,31 +119,17 @@ class Bitcoin extends Base {
   }
 
   // get address given an address type
-  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}`
-      ];
-    }
     switch (derivationMode) {
       case DerivationModes.TAPROOT:
-        Base.addressCache[
-          `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-        ] = this.getTaprootAddress(xpub, account, index);
-        return Base.addressCache[
-          `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-        ];
+        return this.getTaprootAddress(xpub, account, index);
       default:
-        return super.getAddress(derivationMode, xpub, account, index);
+        return super.customGetAddress(derivationMode, xpub, account, index);
     }
   }
 

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

@@ -1,73 +1,44 @@
-// Fix the "More than one instance of bitcore-lib-cash" issue. Refer to https://github.com/bitpay/bitcore/issues/1457
-delete global._bitcoreCash;
-import * as bch from "bitcore-lib-cash";
 import bchaddr from "bchaddrjs";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { toOutputScript } from "bitcoinjs-lib/src/address";
 import { InvalidAddress } from "@ledgerhq/errors";
 import { DerivationModes } from "../types";
-import { ICrypto } from "./types";
 import Base from "./base";
 
 // a mock explorer class that just use js objects
-class BitcoinCash implements ICrypto {
+class BitcoinCash 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 });
     this.network = network;
     this.network.dustThreshold = 5430;
     this.network.dustPolicy = "FIXED";
     this.network.usesTimestampedTransaction = false;
   }
 
-  // Based on https://github.com/go-faast/bitcoin-cash-payments/blob/54397eb97c7a9bf08b32e10bef23d5f27aa5ab01/index.js#L63-L73
   // eslint-disable-next-line
   getLegacyBitcoinCashAddress(
     xpub: string,
     account: number,
     index: number
   ): string {
-    const node = new bch.HDPublicKey(xpub);
-    const child = node.derive(account).derive(index);
-    const address = new bch.Address(child.publicKey, bch.Networks.livenet);
-    const addrstr = address.toString().split(":");
-    if (addrstr.length === 2) {
-      return bchaddr.toCashAddress(bchaddr.toLegacyAddress(addrstr[1]));
-    }
-    throw new Error(`Unable to derive cash address for ${address}`);
+    return bchaddr.toCashAddress(super.getLegacyAddress(xpub, account, index));
   }
 
   // get address given an address type
-  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.getLegacyBitcoinCashAddress(xpub, account, index);
-    Base.addressCache[
-      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-    ] = address;
-    return address;
+    return this.getLegacyBitcoinCashAddress(xpub, account, index);
   }
 
-  // infer address type from its syntax
-  //
-  // TODO: improve the prefix matching: make the expected prefix
-  // correspond to the actual type (currently, a `ltc1` prefix
-  // could match a native Bitcoin address type for instance)
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   getDerivationMode(address: string) {
     return DerivationModes.LEGACY;
@@ -85,11 +56,6 @@ class BitcoinCash implements ICrypto {
   validateAddress(address: string): boolean {
     return bchaddr.isValidAddress(address);
   }
-
-  // eslint-disable-next-line
-  isTaprootAddress(address: string): boolean {
-    return false;
-  }
 }
 
 export default BitcoinCash;

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

@@ -68,21 +68,12 @@ class Decred extends Base {
   }
 
   // get address given an address type
-  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}`
-      ];
-    }
     let buffer: Buffer;
     try {
       buffer = Decred.bs58check.decode(xpub);
@@ -95,11 +86,7 @@ class Decred extends Base {
     const X = buffer.slice(45, 78);
     const hd = new BIP32(X, chainCode, this.network, depth, i);
     const publicKey = hd.derive(account).derive(index).publicKey;
-    const address = Decred.getAddressFromPk(publicKey);
-    Base.addressCache[
-      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-    ] = address;
-    return address;
+    return Decred.getAddressFromPk(publicKey);
   }
 }
 

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

@@ -1,15 +1,12 @@
-import * as bjs from "bitcoinjs-lib";
-import * as bip32 from "bip32";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import { toOutputScript } from "bitcoinjs-lib/src/address";
 import * as bech32 from "bech32";
 import { DerivationModes } from "../types";
-import { ICrypto } from "./types";
 import Base from "./base";
 
 // Todo copy paste from bitcoin.ts. we can merge them later
-class Litecoin extends Base implements ICrypto {
+class Litecoin extends Base {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   network: any;
 
@@ -21,73 +18,6 @@ class Litecoin extends Base implements ICrypto {
     this.network.usesTimestampedTransaction = false;
   }
 
-  getLegacyAddress(xpub: string, account: number, index: number): string {
-    const { address } = bjs.payments.p2pkh({
-      pubkey: bip32.fromBase58(xpub, this.network).derive(account).derive(index)
-        .publicKey,
-      network: this.network,
-    });
-    return String(address);
-  }
-
-  getSegWitAddress(xpub: string, account: number, index: number): string {
-    const { address } = bjs.payments.p2sh({
-      redeem: bjs.payments.p2wpkh({
-        pubkey: bip32
-          .fromBase58(xpub, this.network)
-          .derive(account)
-          .derive(index).publicKey,
-        network: this.network,
-      }),
-    });
-    return String(address);
-  }
-
-  getNativeSegWitAddress(xpub: string, account: number, index: number): string {
-    const { address } = bjs.payments.p2wpkh({
-      pubkey: bip32.fromBase58(xpub, this.network).derive(account).derive(index)
-        .publicKey,
-      network: this.network,
-    });
-
-    return String(address);
-  }
-
-  getAddress(
-    derivationMode: DerivationModes,
-    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}`
-      ];
-    }
-    let address: string;
-    switch (derivationMode) {
-      case DerivationModes.LEGACY:
-        address = this.getLegacyAddress(xpub, account, index);
-        break;
-      case DerivationModes.SEGWIT:
-        address = this.getSegWitAddress(xpub, account, index);
-        break;
-      case DerivationModes.NATIVE_SEGWIT:
-        address = this.getNativeSegWitAddress(xpub, account, index);
-        break;
-      default:
-        throw new Error("Should not be reachable");
-    }
-    Base.addressCache[
-      `${this.network.name}-${derivationMode}-${xpub}-${account}-${index}`
-    ] = address;
-    return address;
-  }
-
   // infer address type from its syntax
   getDerivationMode(address: string) {
     if (address.match("^(ltc1).*")) {

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

@@ -7,6 +7,13 @@ export interface ICrypto {
     account: number,
     index: number
   ): string;
+  customGetAddress(
+    derivationMode: string,
+    xpub: string,
+    account: number,
+    index: number
+  ): string;
+
   getDerivationMode(address: string): string;
 
   toOutputScript(address: string): Buffer;

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

@@ -1,22 +1,19 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import { toOutputScript } from "bitcoinjs-lib/src/address";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 import zec from "zcash-bitcore-lib";
 import bs58check from "bs58check";
-import coininfo from "coininfo";
+import * as bjs from "bitcoinjs-lib";
 import { InvalidAddress } from "@ledgerhq/errors";
 import { DerivationModes } from "../types";
-import { ICrypto } from "./types";
 import Base from "./base";
 
-class ZCash implements ICrypto {
+class ZCash 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 });
     this.network = network;
     this.network.dustThreshold = 10000;
     this.network.dustPolicy = "FIXED";
@@ -32,41 +29,22 @@ class ZCash implements ICrypto {
     return bs58check.encode(Buffer.from(taddr));
   }
 
-  private static toBitcoinAddr(taddr: string) {
-    // refer to https://runkitcdn.com/gojomo/baddr2taddr/1.0.2
-    const baddr = new Uint8Array(21);
-    baddr.set(bs58check.decode(taddr).slice(2), 1);
-    return bs58check.encode(Buffer.from(baddr));
-  }
-
   // eslint-disable-next-line
   getLegacyAddress(xpub: string, account: number, index: number): string {
-    const pubkey = new zec.HDPublicKey(xpub);
-    const child = pubkey.derive(account).derive(index);
-    const address = new zec.Address(child.publicKey, zec.Networks.livenet);
-    return address.toString();
+    const pk = bjs.crypto.hash160(this.getPubkeyAt(xpub, account, index));
+    const payload = Buffer.allocUnsafe(22);
+    payload.writeUInt16BE(this.network.pubKeyHash, 0);
+    pk.copy(payload, 2);
+    return bs58check.encode(payload);
   }
 
-  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
@@ -78,22 +56,26 @@ class ZCash implements ICrypto {
     if (!this.validateAddress(address)) {
       throw new InvalidAddress();
     }
-    // TODO find a better way to calculate the script from zec address instead of converting to bitcoin address
-    return toOutputScript(
-      ZCash.toBitcoinAddr(address),
-      coininfo.bitcoin.main.toBitcoinJS()
+    const version = Number(
+      "0x" + bs58check.decode(address).slice(0, 2).toString("hex")
     );
+    if (version === this.network.pubKeyHash) {
+      //Pay-to-PubkeyHash
+      return bjs.payments.p2pkh({ hash: bs58check.decode(address).slice(2) })
+        .output as Buffer;
+    }
+    if (version === this.network.scriptHash) {
+      //Pay-to-Script-Hash
+      return bjs.payments.p2sh({ hash: bs58check.decode(address).slice(2) })
+        .output as Buffer;
+    }
+    throw new InvalidAddress();
   }
 
   // eslint-disable-next-line class-methods-use-this
   validateAddress(address: string): boolean {
     return zec.Address.isValid(address, "livenet");
   }
-
-  // eslint-disable-next-line
-  isTaprootAddress(address: string): boolean {
-    return false;
-  }
 }
 
 export default ZCash;

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

@@ -1,22 +1,16 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { toOutputScript } from "bitcoinjs-lib/src/address";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import zec from "zcash-bitcore-lib";
 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";
+import * as bjs from "bitcoinjs-lib";
 
-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 = {
@@ -26,15 +20,15 @@ class Zen implements ICrypto {
       },
       bip44: 121,
       private: 0x80,
-      public: 0x2096,
-      scripthash: 0x2089,
+      public: 0x2089,
+      scripthash: 0x2096,
     };
     this.network.name = "Zencash";
     this.network.unit = "ZEN";
     this.network.messagePrefix = "Zencash Signed Message:\n";
     this.network.wif = 0x80;
-    this.network.pubKeyHash = 0x2096;
-    this.network.scriptHash = 0x2089;
+    this.network.pubKeyHash = 0x2089;
+    this.network.scriptHash = 0x2096;
     this.network.dustThreshold = 10000;
     this.network.dustPolicy = "FIXED";
     this.network.usesTimestampedTransaction = false;
@@ -50,43 +44,22 @@ class Zen implements ICrypto {
     return bs58check.encode(Buffer.from(taddr));
   }
 
-  private static toBitcoinAddr(taddr: string) {
-    // refer to https://runkitcdn.com/gojomo/baddr2taddr/1.0.2
-    const baddr = new Uint8Array(21);
-    baddr.set(bs58check.decode(taddr).slice(2), 1);
-    return bs58check.encode(Buffer.from(baddr));
-  }
-
   // eslint-disable-next-line
   getLegacyAddress(xpub: string, account: number, index: number): string {
-    const pubkey = new zec.HDPublicKey(xpub);
-    const child = pubkey.derive(account).derive(index);
-    const address = new zec.Address(child.publicKey, zec.Networks.livenet);
-    const baddr = new Uint8Array(21);
-    baddr.set(bs58check.decode(address.toString()).slice(2), 1);
-    return this.baddrToTaddr(bs58check.encode(Buffer.from(baddr)));
+    const pk = bjs.crypto.hash160(this.getPubkeyAt(xpub, account, index));
+    const payload = Buffer.allocUnsafe(22);
+    payload.writeUInt16BE(this.network.pubKeyHash, 0);
+    pk.copy(payload, 2);
+    return bs58check.encode(payload);
   }
 
-  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
@@ -98,10 +71,23 @@ class Zen implements ICrypto {
     if (!this.validateAddress(address)) {
       throw new InvalidAddress();
     }
-    const outputScript = toOutputScript(
-      Zen.toBitcoinAddr(address),
-      coininfo.bitcoin.main.toBitcoinJS()
+    let outputScript: Buffer;
+    const version = Number(
+      "0x" + bs58check.decode(address).slice(0, 2).toString("hex")
     );
+    if (version === this.network.pubKeyHash) {
+      //Pay-to-PubkeyHash
+      outputScript = bjs.payments.p2pkh({
+        hash: bs58check.decode(address).slice(2),
+      }).output as Buffer;
+    } else if (version === this.network.scriptHash) {
+      //Pay-to-Script-Hash
+      outputScript = bjs.payments.p2sh({
+        hash: bs58check.decode(address).slice(2),
+      }).output as Buffer;
+    } else {
+      throw new InvalidAddress();
+    }
     // refer to https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/scripts/BitcoinLikeScript.cpp#L139 and https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/networks.cpp#L39 for bip115 Script and its network parameters
     const bip115Script = Buffer.from(
       "209ec9845acb02fab24e1c0368b3b517c1a4488fba97f0e3459ac053ea0100000003c01f02b4",
@@ -122,11 +108,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/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/speculos-deviceActions.ts

@@ -101,6 +101,10 @@ const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
       title: "Contract",
       button: "Rr",
     },
+    {
+      title: "Network",
+      button: "Rr",
+    },
     {
       title: "Max fees",
       button: "Rr",