@ledgerhq/live-common 21.15.0 → 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/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)

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/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

@@ -92,7 +92,7 @@ export function byteSize(count: number) {
 }
 
 // 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,
@@ -114,7 +114,7 @@ export function estimateTxSize(
   // and https://bitcoinops.org/en/tools/calc-size/
   if (derivationMode === DerivationModes.TAPROOT) {
     txSize = fixedSize + 57.75 * inputCount + 43 * outputCount;
-    return Math.ceil(txSize);
+    return txSize;
   }
   const isSegwit =
     derivationMode === DerivationModes.NATIVE_SEGWIT ||
@@ -131,7 +131,18 @@ export function estimateTxSize(
   } else {
     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

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