f - extract_tx

jkczyz · benthecarman · commit 3ecd0f2940ad · 2025-11-04T14:59:45.000-06:00
diff --git a/src/wallet/mod.rs b/src/wallet/mod.rs
@@ -690,12 +690,14 @@ impl Wallet {
 			},
 		}
 
-		let mut tx = psbt.unsigned_tx;
-		for (txin, input) in tx.input.iter_mut().zip(psbt.inputs.into_iter()) {
-			txin.witness = input.final_script_witness.unwrap_or_default();
+		match psbt.extract_tx() {
+			Ok(tx) => Ok(tx),
+			Err(bitcoin::psbt::ExtractTxError::MissingInputValue { tx }) => Ok(tx),
+			Err(e) => {
+				log_error!(self.logger, "Failed to extract transaction: {}", e);
+				Err(())
+			}
 		}
-
-		Ok(tx)
 	}
 
 	#[allow(deprecated)]

Original file line number	Diff line number	Diff line change
`@@ -690,12 +690,14 @@ impl Wallet {`
`690`	`690`	`},`
`691`	`691`	`}`
`692`	`692`
`693`		`- let mut tx = psbt.unsigned_tx;`
`694`		`- for (txin, input) in tx.input.iter_mut().zip(psbt.inputs.into_iter()) {`
`695`		`- txin.witness = input.final_script_witness.unwrap_or_default();`
	`693`	`+ match psbt.extract_tx() {`
	`694`	`+ Ok(tx) => Ok(tx),`
	`695`	`+ Err(bitcoin::psbt::ExtractTxError::MissingInputValue { tx }) => Ok(tx),`
	`696`	`+ Err(e) => {`
	`697`	`+ log_error!(self.logger, "Failed to extract transaction: {}", e);`
	`698`	`+ Err(())`
	`699`	`+ }`
`696`	`700`	`}`
`697`		`-`
`698`		`- Ok(tx)`
`699`	`701`	`}`
`700`	`702`
`701`	`703`	`#[allow(deprecated)]`