@ledgerhq/live-common 21.14.0 → 21.14.1

package/src/__tests__/derivation.ts

@@ -6,7 +6,7 @@ import {
 describe("derivation", () => {
   test("getPreferredNewAccountScheme should return a list of schemes for a given currency", () => {
     const testData = [
-      ["bitcoin", ["native_segwit", "segwit", ""]],
+      ["bitcoin", ["native_segwit", "taproot", "segwit", ""]],
       ["ethereum", null],
       ["cosmos", null],
       ["litecoin", ["native_segwit", "segwit", ""]],

package/src/__tests__/families/bitcoin/wallet-btc/wallet.integration.test.ts

@@ -63,7 +63,7 @@ describe("testing wallet", () => {
       fromAccount: account,
       txInfo,
     });
-    expect(tx).toEqual("66ad13fd62ca677ae4d169ec5fe84be2f846562a");
+    expect(tx).toEqual("d6154bba4915d07453bb09d4fa02d62e975b4475");
   });
 
   it("should allow to build a transaction splitting outputs", async () => {
@@ -87,7 +87,7 @@ describe("testing wallet", () => {
       fromAccount: account,
       txInfo,
     });
-    expect(tx).toEqual("23ab414d38fe836e22619d6ee84fdebafa6b5168");
+    expect(tx).toEqual("d922a70d6a66b96cdaba4565270a21f97eb23a6d");
   });
 
   it("should throw during sync if there is an error in explorer", async () => {

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

@@ -150,6 +150,7 @@ class Base implements ICrypto {
     );
   }
 
+  // eslint-disable-next-line
   isTaprootAddress(address: string): boolean {
     return false;
   }

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

@@ -71,7 +71,7 @@ class BitcoinCash implements ICrypto {
     return bchaddr.isValidAddress(address);
   }
 
-  // eslint-disable-next-line class-methods-use-this
+  // eslint-disable-next-line
   isTaprootAddress(address: string): boolean {
     return false;
   }

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

@@ -75,7 +75,7 @@ class ZCash implements ICrypto {
     return zec.Address.isValid(address, "livenet");
   }
 
-  // eslint-disable-next-line class-methods-use-this
+  // eslint-disable-next-line
   isTaprootAddress(address: string): boolean {
     return false;
   }

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

@@ -103,7 +103,7 @@ class Zen implements ICrypto {
     );
   }
 
-  // eslint-disable-next-line class-methods-use-this
+  // eslint-disable-next-line
   isTaprootAddress(address: string): boolean {
     return false;
   }

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

@@ -83,12 +83,12 @@ export function byteSize(count: number) {
     return 1;
   }
   if (count <= 0xffff) {
-    return 2;
+    return 3;
   }
   if (count <= 0xffffffff) {
-    return 4;
+    return 5;
   }
-  return 8;
+  return 9;
 }
 
 // refer to https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/api_impl/BitcoinLikeTransactionApi.cpp#L217
@@ -106,10 +106,14 @@ export function estimateTxSize(
   fixedSize += byteSize(inputCount); // Number of inputs
   fixedSize += byteSize(outputCount); // Number of outputs
   fixedSize += 4; // Timelock
+  if (derivationMode !== DerivationModes.LEGACY) {
+    fixedSize += 0.5; // Segwit marker & segwit flag
+  }
   // refer to https://medium.com/coinmonks/on-bitcoin-transaction-sizes-part-2-9445373d17f4
   // and https://bitcoin.stackexchange.com/questions/96017/what-are-the-sizes-of-single-sig-and-2-of-3-multisig-taproot-inputs
+  // and https://bitcoinops.org/en/tools/calc-size/
   if (derivationMode === DerivationModes.TAPROOT) {
-    txSize = fixedSize + 57.5 * inputCount + 43 * outputCount;
+    txSize = fixedSize + 57.75 * inputCount + 43 * outputCount;
     return Math.ceil(txSize);
   }
   const isSegwit =
@@ -120,12 +124,12 @@ export function estimateTxSize(
     // P2SH: 32 PrevTxHash + 4 Index + 23 scriptPubKey + 4 sequence
     const isNativeSegwit = derivationMode === DerivationModes.NATIVE_SEGWIT;
     const inputSize = isNativeSegwit ? 41 : 63;
-    const noWitness = fixedSize + inputSize * inputCount + 34 * outputCount;
+    const noWitness = fixedSize + inputSize * inputCount + 43 * outputCount; //43 is the biggest output(taproot output) size, we use the biggest one for safety
     // Include flag and marker size (one byte each)
     const witnessSize = noWitness + 108 * inputCount + 2;
     txSize = (noWitness * 3 + witnessSize) / 4;
   } else {
-    txSize = fixedSize + 148 * inputCount + 34 * outputCount;
+    txSize = fixedSize + 148 * inputCount + 43 * outputCount;
   }
   return Math.ceil(txSize); // We don't allow floating value
 }

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

@@ -263,7 +263,7 @@ class BitcoinLikeWallet {
       return [
         btc.splitTransaction(
           i.txHex,
-          segwit,
+          true,
           false, // FIXME hasTimestamp needed for LL-7539
           hasExtraData,
           additionals