wallet: Try estimating input size with external data if wallet fails

achow101 · achow101 · commit 09a0dcb8ce16 · 2022-07-22T16:17:55.000-04:00
Instead of choosing whether to use the wallet or external data when
estimating the size of an input, first use the wallet, then try external
data if that failed.
diff --git a/src/wallet/spend.cpp b/src/wallet/spend.cpp
@@ -447,14 +447,19 @@ std::optional<SelectionResult> SelectCoins(const CWallet& wallet, const std::vec
                 return std::nullopt;
             }
             txout = ptr_wtx->tx->vout.at(outpoint.n);
-            input_bytes = CalculateMaximumSignedInputSize(txout, &wallet, &coin_control);
         } else {
             // The input is external. We did not find the tx in mapWallet.
             if (!coin_control.GetExternalOutput(outpoint, txout)) {
                 return std::nullopt;
             }
+        }
+
+        input_bytes = CalculateMaximumSignedInputSize(txout, &wallet, &coin_control);
+
+        if (input_bytes == -1) {
             input_bytes = CalculateMaximumSignedInputSize(txout, outpoint, &coin_control.m_external_provider, &coin_control);
         }
+
         // If available, override calculated size with coin control specified size
         if (coin_control.HasInputWeight(outpoint)) {
             input_bytes = GetVirtualTransactionSize(coin_control.GetInputWeight(outpoint), 0, 0);
