@ledgerhq/live-common 21.13.2 → 21.16.0

package/src/currencies/sortByMarketcap.ts

@@ -81,7 +81,15 @@ export const getMarketcapTickers: () => Promise<string[]> = makeLRUCache(() =>
 export const useMarketcapTickers = (): string[] | null | undefined => {
   const [tickers, setMarketcapTickers] = useState(marketcapTickersCache);
   useEffect(() => {
-    getMarketcapTickers().then(setMarketcapTickers);
+    let isMounted = true;
+
+    getMarketcapTickers().then((data) => {
+      if (isMounted) setMarketcapTickers(data);
+    });
+
+    return () => {
+      isMounted = false;
+    };
   }, []);
   return tickers;
 };

package/src/derivation.ts

@@ -470,7 +470,7 @@ export const getDerivationModesForCurrency = (
 
   // taproot logic. FIXME should move per family
   if (currency.family === "bitcoin") {
-    if (currency.id === "bitcoin_testnet") {
+    if (currency.id === "bitcoin" || currency.id === "bitcoin_testnet") {
       all.push("taproot");
     }
   }

package/src/env.ts

@@ -67,7 +67,7 @@ const envDefinitions = {
   },
   API_RIPPLE_WS: {
     parser: stringParser,
-    def: "wss://xrplcluster.com",
+    def: "wss://xrplcluster.com/ledgerlive",
     desc: "XRP Ledger full history open WebSocket endpoint",
   },
   API_FILECOIN_ENDPOINT: {
@@ -376,6 +376,17 @@ const envDefinitions = {
     parser: stringParser,
     desc: "mock the server response for the exchange KYC check, options are 'open', 'pending', 'closed' or 'approved'.",
   },
+  NFT: {
+    def: false,
+    parser: boolParser,
+    desc: "synchronizing nfts",
+  },
+  NFT_ETH_METADATA_SERVICE: {
+    // FIXME LL-8001
+    def: "https://nft.staging.aws.ledger.fr/v1/ethereum/1/contracts/tokens/infos",
+    parser: stringParser,
+    desc: "service uri used to get the metadata of an nft",
+  },
   OPERATION_ADDRESSES_LIMIT: {
     def: 100,
     parser: intParser,

package/src/families/bitcoin/cache.ts

@@ -4,6 +4,7 @@ import type { Account, CryptoCurrency } from "./../../types";
 import type { Transaction } from "./types";
 import getFeesForTransaction from "./js-getFeesForTransaction";
 import { isValidRecipient } from "./logic";
+import { Currency, isTaprootAddress } from "./wallet-btc";
 
 const getCacheKeyForCalculateFees = ({
   a,
@@ -41,6 +42,7 @@ export const calculateFees = makeLRUCache(
     maxAge: 5 * 60 * 1000, // 5 minutes
   }
 );
+
 export const validateRecipient: (
   arg0: CryptoCurrency,
   arg1: string | null | undefined
@@ -74,3 +76,13 @@ export const validateRecipient: (
   },
   (currency, recipient) => `${currency.id}_${recipient || ""}`
 );
+
+export const isTaprootRecipient: (
+  arg0: CryptoCurrency,
+  arg1: string
+) => Promise<boolean> = makeLRUCache(
+  async (currency, recipient) => {
+    return isTaprootAddress(recipient, <Currency>currency.id);
+  },
+  (currency, recipient) => `${currency.id}_${recipient || ""}`
+);

package/src/families/bitcoin/errors.ts

@@ -0,0 +1,5 @@
+import { createCustomErrorClass } from "@ledgerhq/errors";
+
+export const TaprootNotActivated = createCustomErrorClass(
+  "TaprootNotActivated"
+);

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

@@ -9,7 +9,8 @@ import {
 } from "@ledgerhq/errors";
 import type { Account, TransactionStatus } from "./../../types";
 import type { Transaction } from "./types";
-import { calculateFees, validateRecipient } from "./cache";
+import { calculateFees, validateRecipient, isTaprootRecipient } from "./cache";
+import { TaprootNotActivated } from "./errors";
 
 const getTransactionStatus = async (
   a: Account,
@@ -31,6 +32,19 @@ const getTransactionStatus = async (
     warnings.recipient = recipientWarning;
   }
 
+  // Safeguard before Taproot activation
+  if (
+    t.recipient &&
+    !errors.recipient &&
+    a.currency.id === "bitcoin" &&
+    a.blockHeight <= 709632
+  ) {
+    const isTaproot = await isTaprootRecipient(a.currency, t.recipient);
+    if (isTaproot) {
+      errors.recipient = new TaprootNotActivated();
+    }
+  }
+
   let txInputs;
   let txOutputs;
   let estimatedFees = new BigNumber(0);

package/src/families/bitcoin/js-synchronisation.ts

@@ -128,34 +128,20 @@ const mapTxToOperations = (
   // All inputs of a same transaction have the same sequence
   const transactionSequenceNumber =
     (accountInputs.length > 0 && accountInputs[0].sequence) || undefined;
-  const hasSpentNothing = value.eq(0);
+
+  // Change output is the last one
+  const changeOutputIndex = tx.outputs
+    .map((o) => o.output_index)
+    .reduce((p, c) => (p > c ? p : c));
 
   for (const output of tx.outputs) {
     if (output.address) {
       if (accountAddresses.includes(output.address)) {
         accountOutputs.push(output);
-
-        if (changeAddresses.includes(output.address)) {
-          if (
-            (recipients.length === 0 &&
-              output.output_hash ===
-                tx.outputs[tx.outputs.length - 1].output_hash) ||
-            hasSpentNothing
-          ) {
-            recipients.push(
-              syncReplaceAddress
-                ? syncReplaceAddress(output.address)
-                : output.address
-            );
-          }
-        } else {
-          recipients.push(
-            syncReplaceAddress
-              ? syncReplaceAddress(output.address)
-              : output.address
-          );
-        }
-      } else {
+      } else if (
+        !changeAddresses.includes(output.address) ||
+        output.output_index !== changeOutputIndex
+      ) {
         recipients.push(
           syncReplaceAddress
             ? syncReplaceAddress(output.address)
@@ -342,8 +328,8 @@ const getAccountShape: GetAccountShape = async (info) => {
     spendableBalance: balance,
     operations,
     operationsCount: operations.length,
-    freshAddress: walletAccount.xpub.freshAddress[0],
-    freshAddressPath: `${accountPath}/0/${walletAccount.xpub.freshAddressIndex[0]}`,
+    freshAddress: walletAccount.xpub.freshAddress,
+    freshAddressPath: `${accountPath}/0/${walletAccount.xpub.freshAddressIndex}`,
     blockHeight,
     bitcoinResources: {
       utxos,

package/src/families/bitcoin/logic.ts

@@ -79,7 +79,7 @@ export function isChangeOutput(output: BitcoinOutput): boolean {
 type UTXOStatus =
   | {
       excluded: true;
-      reason: "pickUnconfirmedRBF" | "userExclusion";
+      reason: "pickUnconfirmedRBF" | "pickPendingNonRBF" | "userExclusion";
     }
   | {
       excluded: false;
@@ -94,7 +94,12 @@ export const getUTXOStatus = (
       reason: "pickUnconfirmedRBF",
     };
   }
-
+  if (!utxo.rbf && !utxo.blockHeight) {
+    return {
+      excluded: true,
+      reason: "pickPendingNonRBF",
+    };
+  }
   if (
     utxoStrategy.excludeUTXOs.some(
       (u) => u.hash === utxo.hash && u.outputIndex === utxo.outputIndex

package/src/families/bitcoin/specs.ts

@@ -254,7 +254,12 @@ const bitcoinLikeMutations = ({
     },
     recoverBadTransactionStatus,
     test: ({ account }) => {
-      expect(account.balance.toString()).toBe("0");
+      expect(
+        account.bitcoinResources?.utxos
+          .filter((u) => u.blockHeight) // Exclude pending UTXOs
+          .reduce((p, c) => p.plus(c.value), new BigNumber(0))
+          .toString()
+      ).toBe("0");
     },
   },
 ];

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

@@ -1,7 +1,7 @@
 import type { DatasetTest } from "../../types";
 import type { Transaction } from "./types";
 import bitcoin_cash from "./datasets/bitcoin_cash";
-import bitcoin_gold from "./datasets/bitcoin_gold";
+// import bitcoin_gold from "./datasets/bitcoin_gold";
 import bitcoin from "./datasets/bitcoin";
 import dash from "./datasets/dash";
 // import decred from "./datasets/decred";
@@ -22,7 +22,7 @@ const dataset: DatasetTest<Transaction> = {
   currencies: {
     bitcoin,
     bitcoin_cash,
-    bitcoin_gold,
+    // bitcoin_gold,
     dash,
     // decred, // BACK-2443
     digibyte,

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

@@ -27,6 +27,9 @@ export function fallbackValidateAddress(address: string): boolean {
 class Base implements ICrypto {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   network: any;
+  protected static publickeyCache = {}; // xpub + account + index to publicKey
+  protected static addressCache = {}; // derivationMode + xpub + account + index to address
+  protected static bech32Cache = {}; // xpub to bech32 interface
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor({ network }: { network: any }) {
@@ -37,9 +40,26 @@ class Base implements ICrypto {
   }
 
   protected getPubkeyAt(xpub: string, account: number, index: number): Buffer {
-    return bip32.fromBase58(xpub, this.network).derive(account).derive(index)
-      .publicKey;
+    if (!Base.bech32Cache[xpub]) {
+      Base.bech32Cache[xpub] = bip32.fromBase58(xpub, this.network);
+    }
+    if (Base.publickeyCache[`${xpub}-${account}-${index}`]) {
+      return Base.publickeyCache[`${xpub}-${account}-${index}`];
+    }
+    if (Base.publickeyCache[`${xpub}-${account}`]) {
+      const publicKey =
+        Base.publickeyCache[`${xpub}-${account}`].derive(index).publicKey;
+      Base.publickeyCache[`${xpub}-${account}-${index}`] = publicKey;
+      return publicKey;
+    }
+    Base.publickeyCache[`${xpub}-${account}`] =
+      Base.bech32Cache[xpub].derive(account);
+    const publicKey =
+      Base.publickeyCache[`${xpub}-${account}`].derive(index).publicKey;
+    Base.publickeyCache[`${xpub}-${account}-${index}`] = publicKey;
+    return publicKey;
   }
+
   // derive legacy address at account and index positions
   getLegacyAddress(xpub: string, account: number, index: number): string {
     const { address } = bjs.payments.p2pkh({
@@ -78,16 +98,26 @@ class Base implements ICrypto {
     account: number,
     index: number
   ): string {
+    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
+      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    }
     switch (derivationMode) {
       case DerivationModes.LEGACY:
-        return this.getLegacyAddress(xpub, account, index);
+        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
+          this.getLegacyAddress(xpub, account, index);
+        break;
       case DerivationModes.SEGWIT:
-        return this.getSegWitAddress(xpub, account, index);
+        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
+          this.getSegWitAddress(xpub, account, index);
+        break;
       case DerivationModes.NATIVE_SEGWIT:
-        return this.getNativeSegWitAddress(xpub, account, index);
+        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
+          this.getNativeSegWitAddress(xpub, account, index);
+        break;
       default:
         throw new Error(`Invalid derivation Mode: ${derivationMode}`);
     }
+    return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
   }
 
   // infer address type from its syntax
@@ -119,6 +149,11 @@ class Base implements ICrypto {
       (res[0] === this.network.pubKeyHash || res[0] === this.network.scriptHash)
     );
   }
+
+  // eslint-disable-next-line
+  isTaprootAddress(address: string): boolean {
+    return false;
+  }
 }
 
 export default Base;

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

@@ -124,9 +124,16 @@ class Bitcoin extends Base {
     account: number,
     index: number
   ): string {
+    if (Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`]) {
+      return Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`];
+    }
     switch (derivationMode) {
       case DerivationModes.TAPROOT:
-        return this.getTaprootAddress(xpub, account, index);
+        Base.addressCache[`${derivationMode}-${xpub}-${account}-${index}`] =
+          this.getTaprootAddress(xpub, account, index);
+        return Base.addressCache[
+          `${derivationMode}-${xpub}-${account}-${index}`
+        ];
       default:
         return super.getAddress(derivationMode, xpub, account, index);
     }
@@ -202,6 +209,19 @@ class Bitcoin extends Base {
     // Create address
     return toBech32(outputSchnorrKey, 1, this.network.bech32);
   }
+
+  isTaprootAddress(address: string): boolean {
+    // This prefix check is to avoid returning false in cases where a valid base58 address also happens
+    // to be a valid bech32(m) string (but invalid segwit address).
+    if (address.toLowerCase().startsWith(`${this.network.bech32}1`)) {
+      try {
+        bjs.address.fromBech32(address);
+      } catch {
+        return true;
+      }
+    }
+    return false;
+  }
 }
 
 export default Bitcoin;

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

@@ -70,6 +70,11 @@ 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/types.ts

@@ -11,6 +11,7 @@ export interface ICrypto {
 
   toOutputScript(address: string): Buffer;
   validateAddress(address: string): boolean;
+  isTaprootAddress(address: string): boolean;
 }
 
 export type Currency =

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

@@ -74,6 +74,11 @@ class ZCash implements ICrypto {
   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

@@ -102,6 +102,11 @@ 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

@@ -285,12 +285,7 @@ class BitcoinLikeExplorer extends EventEmitter implements IExplorer {
 
     // faster than mapping
     res.txs.forEach((tx) => {
-      if (!tx.block) {
-        return;
-      }
-
       this.hydrateTx(address, tx);
-
       hydratedTxs.push(tx);
     });
 

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

@@ -11,7 +11,7 @@ import { TX, Input, Output } from "./storage/types";
 import { CoinSelect } from "./pickingstrategies/CoinSelect";
 import { DeepFirst } from "./pickingstrategies/DeepFirst";
 import { Merge } from "./pickingstrategies/Merge";
-import { isValidAddress } from "./utils";
+import { isValidAddress, isTaprootAddress } from "./utils";
 
 import type { Account as WalletAccount } from "./account";
 import type { Account as LiveAccount } from "./../../../types";
@@ -32,16 +32,16 @@ export {
   DeepFirst,
   Merge,
   isValidAddress,
+  isTaprootAddress,
   Currency,
 };
 
 let wallet: BitcoinLikeWallet | null = null;
 
 export const getWalletAccount = (account: LiveAccount): WalletAccount => {
-  if (account.id.startsWith("libcore")) throw new AccountNeedResync();
   const walletAccount = account.bitcoinResources?.walletAccount;
-  if (!walletAccount) {
-    throw new Error("bitcoin wallet account expected");
+  if (account.id.startsWith("libcore") || !walletAccount) {
+    throw new AccountNeedResync();
   }
   return walletAccount;
 };

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

@@ -34,7 +34,7 @@ export class CoinSelect extends PickingStrategy {
     const TOTAL_TRIES = 100000;
     log("picking strategy", "utxos", unspentUtxos);
     // Compute cost of change
-    const fixedSize = utils.estimateTxSize(
+    const fixedSize = utils.accurateTxSize(
       0,
       0,
       this.crypto,
@@ -42,10 +42,10 @@ export class CoinSelect extends PickingStrategy {
     );
     // Size of only 1 output (without fixed size)
     const oneOutputSize =
-      utils.estimateTxSize(0, 1, this.crypto, this.derivationMode) - fixedSize;
+      utils.accurateTxSize(0, 1, this.crypto, this.derivationMode) - fixedSize;
     // Size 1 signed UTXO (signed input)
     const oneInputSize =
-      utils.estimateTxSize(1, 0, this.crypto, this.derivationMode) - fixedSize;
+      utils.accurateTxSize(1, 0, this.crypto, this.derivationMode) - fixedSize;
 
     // Calculate effective value of outputs
     let currentAvailableValue = 0;

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

@@ -33,7 +33,7 @@ export class DeepFirst extends PickingStrategy {
 
     unspentUtxos = sortBy(unspentUtxos, "block_height");
     // https://metamug.com/article/security/bitcoin-transaction-fee-satoshi-per-byte.html
-    const txSizeNoInput = utils.estimateTxSize(
+    const txSizeNoInput = utils.accurateTxSize(
       0,
       nbOutputsWithoutChange,
       this.crypto,
@@ -41,12 +41,12 @@ export class DeepFirst extends PickingStrategy {
     );
     let fee = txSizeNoInput * feePerByte;
     const sizePerInput =
-      utils.estimateTxSize(1, 0, this.crypto, this.derivationMode) -
-      utils.estimateTxSize(0, 0, this.crypto, this.derivationMode);
+      utils.accurateTxSize(1, 0, this.crypto, this.derivationMode) -
+      utils.accurateTxSize(0, 0, this.crypto, this.derivationMode);
 
     const sizePerOutput =
-      utils.estimateTxSize(0, 1, this.crypto, this.derivationMode) -
-      utils.estimateTxSize(0, 0, this.crypto, this.derivationMode);
+      utils.accurateTxSize(0, 1, this.crypto, this.derivationMode) -
+      utils.accurateTxSize(0, 0, this.crypto, this.derivationMode);
 
     let total = new BigNumber(0);
     const unspentUtxoSelected: Output[] = [];

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

@@ -32,16 +32,16 @@ export class Merge extends PickingStrategy {
     );
 
     const sizePerInput =
-      utils.estimateTxSize(1, 0, this.crypto, this.derivationMode) -
-      utils.estimateTxSize(0, 0, this.crypto, this.derivationMode);
+      utils.accurateTxSize(1, 0, this.crypto, this.derivationMode) -
+      utils.accurateTxSize(0, 0, this.crypto, this.derivationMode);
 
     const sizePerOutput =
-      utils.estimateTxSize(0, 1, this.crypto, this.derivationMode) -
-      utils.estimateTxSize(0, 0, this.crypto, this.derivationMode);
+      utils.accurateTxSize(0, 1, this.crypto, this.derivationMode) -
+      utils.accurateTxSize(0, 0, this.crypto, this.derivationMode);
 
     unspentUtxos = sortBy(unspentUtxos, (utxo) => parseInt(utxo.value, 10));
     // https://metamug.com/article/security/bitcoin-transaction-fee-satoshi-per-byte.html
-    const txSizeNoInput = utils.estimateTxSize(
+    const txSizeNoInput = utils.accurateTxSize(
       0,
       nbOutputsWithoutChange,
       this.crypto,

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

@@ -83,16 +83,16 @@ 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
-export function estimateTxSize(
+export function accurateTxSize(
   inputCount: number,
   outputCount: number,
   currency: ICrypto,
@@ -106,11 +106,15 @@ 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;
-    return Math.ceil(txSize);
+    txSize = fixedSize + 57.75 * inputCount + 43 * outputCount;
+    return txSize;
   }
   const isSegwit =
     derivationMode === DerivationModes.NATIVE_SEGWIT ||
@@ -120,14 +124,25 @@ 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
+  return txSize;
+}
+
+export function estimateTxSize(
+  inputCount: number,
+  outputCount: number,
+  currency: ICrypto,
+  derivationMode: string
+) {
+  return Math.ceil(
+    accurateTxSize(inputCount, outputCount, currency, derivationMode)
+  ); // We don't allow floating value
 }
 
 // refer to https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/api_impl/BitcoinLikeTransactionApi.cpp#L253
@@ -156,3 +171,13 @@ export function isValidAddress(address: string, currency?: Currency) {
   const crypto = cryptoFactory(currency);
   return crypto.validateAddress(address);
 }
+
+export function isTaprootAddress(address: string, currency?: Currency) {
+  if (currency === "bitcoin") {
+    return cryptoFactory("bitcoin").isTaprootAddress(address);
+  } else if (currency === "bitcoin_testnet") {
+    return cryptoFactory("bitcoin_testnet").isTaprootAddress(address);
+  } else {
+    return false;
+  }
+}

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

@@ -133,6 +133,7 @@ class BitcoinLikeWallet {
       )
     );
     let balance = new BigNumber(0);
+    let availableUtxoCount = 0;
     log("btcwallet", "estimateAccountMaxSpendable utxos", utxos);
     utxos.forEach((utxo) => {
       if (
@@ -144,6 +145,7 @@ class BitcoinLikeWallet {
       ) {
         if ((pickUnconfirmedRBF && utxo.rbf) || utxo.block_height !== null) {
           balance = balance.plus(utxo.value);
+          availableUtxoCount += 1;
         }
       }
     });
@@ -151,7 +153,7 @@ class BitcoinLikeWallet {
     const fees =
       feePerByte *
       utils.estimateTxSize(
-        utxos.length,
+        availableUtxoCount,
         1,
         account.xpub.crypto,
         account.xpub.derivationMode
@@ -263,7 +265,7 @@ class BitcoinLikeWallet {
       return [
         btc.splitTransaction(
           i.txHex,
-          segwit,
+          true,
           false, // FIXME hasTimestamp needed for LL-7539
           hasExtraData,
           additionals