LedgerHQ · valpinkman · Jun 29, 2022 · Jun 7, 2022 · Jun 15, 2022 · Jun 28, 2022
diff --git a/.changeset/fresh-timers-dress.md b/.changeset/fresh-timers-dress.md
@@ -0,0 +1,6 @@
+---
+"ledger-live-desktop": major
+"@ledgerhq/live-common": major
+---
+
+Bitcoin Rbf new implementation. Jira ticket: LIVE-1414, LIVE-1415, LIVE-1416
diff --git a/apps/ledger-live-desktop/src/renderer/components/debug/DebugMock.js b/apps/ledger-live-desktop/src/renderer/components/debug/DebugMock.js
@@ -171,7 +171,6 @@ const swapEvents = [
           rbf: false,
           utxoStrategy: {
             strategy: 0,
-            pickUnconfirmedRBF: false,
             excludeUTXOs: [],
           },
         }),

diff --git a/apps/ledger-live-desktop/src/renderer/families/bitcoin/CoinControlRow.js b/apps/ledger-live-desktop/src/renderer/families/bitcoin/CoinControlRow.js
@@ -63,7 +63,7 @@ export const CoinControlRow = ({
     input => input.previousOutputIndex === utxo.outputIndex && input.previousTxHash === utxo.hash,
   );
 
-  const unconfirmed = utxoStatus === "pickUnconfirmedRBF" || utxoStatus === "pickPendingNonRBF";
+  const unconfirmed = utxoStatus === "pickPendingUtxo";
   const last = !s.excluded && totalExcludedUTXOS + 1 === account.bitcoinResources?.utxos.length; // make sure that at least one utxo is selected
   const disabled = unconfirmed || last;
 
@@ -87,7 +87,7 @@ export const CoinControlRow = ({
   return (
     <Container disabled={unconfirmed} flow={2} horizontal alignItems="center" onClick={onClick}>
       {unconfirmed ? (
-        <Tooltip content={<Trans i18nKey={"bitcoin.cannotSelect.unconfirmed"} />}>
+        <Tooltip content={<Trans i18nKey={"bitcoin.cannotSelect.pending"} />}>
           <InfoCircle size={16} />
         </Tooltip>
       ) : last ? (
@@ -118,10 +118,6 @@ export const CoinControlRow = ({
           <Text ff="Inter|Medium" fontSize={3} color={"palette.text.shade50"}>
             {account.blockHeight - utxo.blockHeight + " confirmations"}
           </Text>
-        ) : utxo.rbf ? (
-          <Text ff="Inter|Medium" fontSize={3} color={"alertRed"}>
-            <Trans i18nKey="bitcoin.replaceable" />
-          </Text>
         ) : (
           <Text ff="Inter|Medium" fontSize={3} color={"alertRed"}>
             <Trans i18nKey="bitcoin.pending" />

diff --git a/apps/ledger-live-desktop/src/renderer/families/bitcoin/PickUnconfirmedRBF.js b/apps/ledger-live-desktop/src/renderer/families/bitcoin/PickUnconfirmedRBF.js
diff --git a/apps/ledger-live-desktop/src/renderer/families/bitcoin/RBF.js b/apps/ledger-live-desktop/src/renderer/families/bitcoin/RBF.js
diff --git a/apps/ledger-live-desktop/src/renderer/families/bitcoin/SendAmountFields.js b/apps/ledger-live-desktop/src/renderer/families/bitcoin/SendAmountFields.js
@@ -19,8 +19,6 @@ import Tooltip from "~/renderer/components/Tooltip";
 import SelectFeeStrategy from "~/renderer/components/SelectFeeStrategy";
 import CoinControlModal from "./CoinControlModal";
 import { FeesField } from "./FeesField";
-import { PickUnconfirmedRBF } from "./PickUnconfirmedRBF";
-import { RBF } from "./RBF";
 import useBitcoinPickingStrategy from "./useBitcoinPickingStrategy";
 import { useFeesStrategy } from "@ledgerhq/live-common/lib/families/bitcoin/react";
 import SendFeeMode from "~/renderer/components/SendFeeMode";
@@ -43,13 +41,6 @@ const Separator = styled.div`
   margin: 20px 0;
 `;
 
-const InputBox = styled(Box)`
-  margin-top: 0;
-  & > * > * {
-    margin-bottom: 12px;
-  }
-`;
-
 const Fields = ({
   transaction,
   account,
@@ -128,20 +119,6 @@ const Fields = ({
               </Box>
             </Box>
             <Separator />
-            <InputBox>
-              <RBF
-                transaction={transaction}
-                account={account}
-                onChange={onChange}
-                status={status}
-              />
-              <PickUnconfirmedRBF
-                transaction={transaction}
-                account={account}
-                onChange={onChange}
-                status={status}
-              />
-            </InputBox>
             <CoinControlModal
               transaction={transaction}
               account={account}

diff --git a/apps/ledger-live-desktop/static/i18n/en/app.json b/apps/ledger-live-desktop/static/i18n/en/app.json
@@ -2086,10 +2086,10 @@
     "replaceable": "replaceable",
     "cannotSelect": {
       "unconfirmed": "You cannot select coins from unconfirmed, replaceable transactions.",
+      "pending": "You cannot select coins from pending transactions. (except your change output)",
       "last": "You need at least one selected"
     },
     "pending": "pending",
-    "pickUnconfirmedRBF": "Include coins from unconfirmed, replaceable transactions.",
     "pickingStrategy": "UTXO picking strategy",
     "pickingStrategyLabels": {
       "DEEP_OUTPUTS_FIRST": "Oldest coins first (FIFO)",

diff --git a/apps/ledger-live-desktop/tests/models/DeviceAction.ts b/apps/ledger-live-desktop/tests/models/DeviceAction.ts
@@ -118,7 +118,7 @@ export class DeviceAction {
               amount: { s: 1, e: 0, c: [1] },
               recipient: "1Cz2ZXb6Y6AacXJTpo4RBjQMLEmscuxD8e",
               rbf: false,
-              utxoStrategy: { strategy: 0, pickUnconfirmedRBF: false, excludeUTXOs: [] },
+              utxoStrategy: { strategy: 0, excludeUTXOs: [] },
               family: "bitcoin",
               feePerByte: { s: 1, e: 0, c: [1] },
               networkInfo: {

diff --git a/...live-common/src/__tests__/families/bitcoin/wallet-btc/wallet.estimateMaxSpendable.test.ts b/...live-common/src/__tests__/families/bitcoin/wallet-btc/wallet.estimateMaxSpendable.test.ts
@@ -27,12 +27,7 @@ describe("testing estimateMaxSpendable", () => {
 
   it("should estimate max spendable correctly", async () => {
     await wallet.syncAccount(account);
-    let maxSpendable = await wallet.estimateAccountMaxSpendable(
-      account,
-      0,
-      [],
-      true
-    );
+    let maxSpendable = await wallet.estimateAccountMaxSpendable(account, 0, []);
     const balance = 109088;
     expect(maxSpendable.toNumber()).toEqual(balance);
     const maxSpendableExcludeUtxo = await wallet.estimateAccountMaxSpendable(
@@ -43,16 +38,14 @@ describe("testing estimateMaxSpendable", () => {
           hash: "f80246be50064bb254d2cad82fb0d4ce7768582b99c113694e72411f8032fd7a",
           outputIndex: 0,
         },
-      ],
-      true
+      ]
     );
     expect(maxSpendableExcludeUtxo.toNumber()).toEqual(balance - 1000);
     let feesPerByte = 100;
     maxSpendable = await wallet.estimateAccountMaxSpendable(
       account,
       feesPerByte,
-      [],
-      true
+      []
     );
     expect(maxSpendable.toNumber()).toEqual(
       balance -
@@ -69,8 +62,7 @@ describe("testing estimateMaxSpendable", () => {
     maxSpendable = await wallet.estimateAccountMaxSpendable(
       account,
       feesPerByte,
-      [],
-      true
+      []
     );
     expect(maxSpendable.toNumber()).toEqual(0);
   }, 60000);

diff --git a/libs/ledger-live-common/src/exchange/swap/getExchangeRates.test.ts b/libs/ledger-live-common/src/exchange/swap/getExchangeRates.test.ts
@@ -60,7 +60,6 @@ const transaction: Transaction = {
   family: "bitcoin",
   utxoStrategy: {
     strategy: 0,
-    pickUnconfirmedRBF: false,
     excludeUTXOs: [],
   },
   rbf: true,

diff --git a/libs/ledger-live-common/src/families/bitcoin/bridge/mock.ts b/libs/ledger-live-common/src/families/bitcoin/bridge/mock.ts
@@ -32,7 +32,6 @@ const createTransaction = (): Transaction => ({
   rbf: false,
   utxoStrategy: {
     strategy: 0,
-    pickUnconfirmedRBF: false,
     excludeUTXOs: [],
   },
 });

diff --git a/libs/ledger-live-common/src/families/bitcoin/cache.ts b/libs/ledger-live-common/src/families/bitcoin/cache.ts
@@ -15,9 +15,9 @@ const getCacheKeyForCalculateFees = ({
 }) =>
   `${a.id}_${a.blockHeight || 0}_${t.amount.toString()}_${String(
     t.useAllAmount
-  )}_${t.recipient}_${t.feePerByte ? t.feePerByte.toString() : ""}_${
-    t.utxoStrategy.pickUnconfirmedRBF ? 1 : 0
-  }_${t.utxoStrategy.strategy}_${String(t.rbf)}_${t.utxoStrategy.excludeUTXOs
+  )}_${t.recipient}_${t.feePerByte ? t.feePerByte.toString() : ""}_${0}_${
+    t.utxoStrategy.strategy
+  }_${String(t.rbf)}_${t.utxoStrategy.excludeUTXOs
     .map(({ hash, outputIndex }) => `${hash}@${outputIndex}`)
     .join("+")}`;
 

diff --git a/libs/ledger-live-common/src/families/bitcoin/cli-transaction.ts b/libs/ledger-live-common/src/families/bitcoin/cli-transaction.ts
@@ -8,11 +8,6 @@ const options = [
     type: String,
     desc: "how much fee per byte",
   },
-  {
-    name: "pickUnconfirmedRBF",
-    type: Boolean,
-    desc: "also pick unconfirmed replaceable txs",
-  },
   {
     name: "excludeUTXO",
     alias: "E",
@@ -52,7 +47,6 @@ function inferTransactions(
       rbf: opts.rbf || false,
       utxoStrategy: {
         strategy: bitcoinPickingStrategy[opts["bitcoin-pick-strategy"]] || 0,
-        pickUnconfirmedRBF: opts.pickUnconfirmedRBF || false,
         excludeUTXOs: (opts.excludeUTXO || []).map((str) => {
           const [hash, index] = str.split("@");
           invariant(

diff --git a/libs/ledger-live-common/src/families/bitcoin/datasets/bitcoin.ts b/libs/ledger-live-common/src/families/bitcoin/datasets/bitcoin.ts
@@ -47,7 +47,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -73,7 +72,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -99,7 +97,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),

diff --git a/libs/ledger-live-common/src/families/bitcoin/datasets/digibyte.ts b/libs/ledger-live-common/src/families/bitcoin/datasets/digibyte.ts
@@ -46,7 +46,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -69,7 +68,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -92,7 +90,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),

diff --git a/libs/ledger-live-common/src/families/bitcoin/datasets/litecoin.ts b/libs/ledger-live-common/src/families/bitcoin/datasets/litecoin.ts
@@ -47,7 +47,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -70,7 +69,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),
@@ -93,7 +91,6 @@ const dataset: CurrenciesData<Transaction> = {
             rbf: false,
             utxoStrategy: {
               strategy: 0,
-              pickUnconfirmedRBF: false,
               excludeUTXOs: [],
             },
           }),

diff --git a/libs/ledger-live-common/src/families/bitcoin/js-buildTransaction.ts b/libs/ledger-live-common/src/families/bitcoin/js-buildTransaction.ts
@@ -44,7 +44,6 @@ export const buildTransaction = async (
     walletAccount,
     transaction.feePerByte.toNumber(), //!\ wallet-btc handles fees as JS number
     transaction.utxoStrategy.excludeUTXOs,
-    transaction.utxoStrategy.pickUnconfirmedRBF,
     [transaction.recipient]
   );
   log("btcwallet", "building transaction", transaction);

diff --git a/libs/ledger-live-common/src/families/bitcoin/js-createTransaction.ts b/libs/ledger-live-common/src/families/bitcoin/js-createTransaction.ts
@@ -12,7 +12,6 @@ const createTransaction = (): Transaction => {
     amount: new BigNumber(0),
     utxoStrategy: {
       strategy: 0,
-      pickUnconfirmedRBF: false,
       excludeUTXOs: [],
     },
     recipient: "",

diff --git a/libs/ledger-live-common/src/families/bitcoin/js-estimateMaxSpendable.ts b/libs/ledger-live-common/src/families/bitcoin/js-estimateMaxSpendable.ts
@@ -30,7 +30,6 @@ const estimateMaxSpendable = async ({
     walletAccount,
     feePerByte.toNumber(), //!\ wallet-btc handles fees as JS number
     transaction?.utxoStrategy?.excludeUTXOs || [],
-    transaction?.utxoStrategy?.pickUnconfirmedRBF || false,
     transaction ? [transaction.recipient] : []
   );
   return maxSpendable.lt(0) ? new BigNumber(0) : maxSpendable;

diff --git a/libs/ledger-live-common/src/families/bitcoin/js-synchronisation.ts b/libs/ledger-live-common/src/families/bitcoin/js-synchronisation.ts
@@ -53,15 +53,18 @@ const toWalletNetwork = (currencyId: string): "testnet" | "mainnet" => {
 };
 
 // Map wallet-btc's Output to LL's BitcoinOutput
-const fromWalletUtxo = (utxo: WalletOutput): BitcoinOutput => {
+const fromWalletUtxo = (
+  utxo: WalletOutput,
+  changeAddresses: Set<string>
+): BitcoinOutput => {
   return {
     hash: utxo.output_hash,
     outputIndex: utxo.output_index,
     blockHeight: utxo.block_height,
     address: utxo.address,
     value: new BigNumber(utxo.value),
     rbf: utxo.rbf,
-    isChange: false, // wallet-btc limitation: doesn't provide it
+    isChange: changeAddresses.has(utxo.address),
   };
 };
 
@@ -349,7 +352,7 @@ const getAccountShape: GetAccountShape = async (info) => {
   const newUniqueOperations = deduplicateOperations(newOperations);
   const operations = mergeOps(oldOperations, newUniqueOperations);
   const rawUtxos = await wallet.getAccountUnspentUtxos(walletAccount);
-  const utxos = rawUtxos.map(fromWalletUtxo);
+  const utxos = rawUtxos.map((utxo) => fromWalletUtxo(utxo, changeAddresses));
   return {
     id: accountId,
     xpub,