Fix unreachable error bug during iteration of funding utxos

shinghim · shinghim · commit a5bd50241fac · 2026-01-07T07:34:25.000-06:00
diff --git a/bitcoin/src/psbt/mod.rs b/bitcoin/src/psbt/mod.rs
@@ -191,7 +191,7 @@ impl Psbt {
     ) -> Result<Transaction, ExtractTxError> {
         let fee = match self.fee() {
             Ok(fee) => fee,
-            Err(Error::MissingUtxo) =>
+            Err(Error::MissingUtxo) | Err(Error::PsbtUtxoOutOfbounds) =>
                 return Err(ExtractTxError::MissingInputAmount { tx: self.internal_extract_tx() }),
             Err(Error::NegativeFee) => return Err(ExtractTxError::SendingTooMuch { psbt: self }),
             Err(Error::FeeOverflow) =>
@@ -2502,6 +2502,62 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_psbt_utxo_out_of_bounds() {
+        let prev_tx = Transaction {
+            version: transaction::Version::TWO,
+            lock_time: absolute::LockTime::ZERO,
+            inputs: vec![],
+            outputs: vec![
+                TxOut {
+                    amount: Amount::default(),
+                    script_pubkey: ScriptPubKeyBuf::new()
+                }
+            ],
+        };
+        
+        let unsigned_tx = Transaction {
+            version: transaction::Version::TWO,
+            lock_time: absolute::LockTime::ZERO,
+            inputs: vec![
+                TxIn {
+                    previous_output: OutPoint {
+                        txid: prev_tx.compute_txid(),
+                        vout: 5, // This doesn't have a corresponding output 
+                    },
+                    script_sig: ScriptSigBuf::new(),
+                    sequence: Sequence::default(),
+                    witness: Witness::new(),
+                }
+            ],
+            outputs: vec![
+                TxOut {
+                    amount: Amount::default(),
+                    script_pubkey: ScriptPubKeyBuf::new(),
+                }
+            ],
+        };
+        
+        let psbt = Psbt {
+            unsigned_tx,
+            version: 0,
+            xpub: Default::default(), 
+            proprietary: Default::default(),
+            unknown: Default::default(),
+            inputs: vec![
+                Input {
+                    non_witness_utxo: Some(prev_tx),  
+                    witness_utxo: None,  
+                    ..Default::default()
+                }
+            ],
+            outputs: vec![Output::default()],
+        };
+        
+        assert!(matches!(psbt.fee(), Err(Error::PsbtUtxoOutOfbounds)));
+        assert!(matches!(psbt.internal_extract_tx_with_fee_rate_limit(FeeRate::MAX), Err(ExtractTxError::MissingInputAmount { tx: _ })))
+    }
+
     #[test]
     #[cfg(all(feature = "rand", feature = "std"))]
     fn hashmap_can_sign_taproot() {
