f Register first txo script

Author: tnull

src/sweep.rs

@@ -11,7 +11,7 @@ use lightning::sign::{EntropySource, SpendableOutputDescriptor};
 use lightning::util::ser::Writeable;
 
 use bitcoin::secp256k1::Secp256k1;
-use bitcoin::{BlockHash, BlockHeader, LockTime, PackedLockTime, Script, Transaction, Txid};
+use bitcoin::{BlockHash, BlockHeader, LockTime, PackedLockTime, Transaction, Txid};
 
 use std::ops::Deref;
 use std::sync::{Arc, Mutex};
@@ -62,8 +62,9 @@ where
 		if let Some(filter) = chain_source.as_ref() {
 			for o in &outputs {
 				if let Some(tx) = o.spending_tx.as_ref() {
-					// TODO: can we give something better than the empty script here?
-					filter.register_tx(&tx.txid(), &Script::new())
+					if let Some(tx_out) = tx.output.first() {
+						filter.register_tx(&tx.txid(), &tx_out.script_pubkey);
+					}
 				}
 			}
 		}
@@ -78,27 +79,30 @@ where
 
 		let cur_height = self.best_block.lock().unwrap().height();
 
-		let (spending_tx, broadcast_height) = match self.get_spending_tx(&output_descriptors, cur_height) {
-			Ok(Some(spending_tx)) => {
-				self.wallet.broadcast_transactions(&[&spending_tx]);
-				if let Some(filter) = self.chain_source.as_ref() {
-					filter.register_tx(&spending_tx.txid(), &Script::new())
+		let (spending_tx, broadcast_height) =
+			match self.get_spending_tx(&output_descriptors, cur_height) {
+				Ok(Some(spending_tx)) => {
+					self.wallet.broadcast_transactions(&[&spending_tx]);
+					if let Some(filter) = self.chain_source.as_ref() {
+						if let Some(tx_out) = spending_tx.output.first() {
+							filter.register_tx(&spending_tx.txid(), &tx_out.script_pubkey);
+						}
+					}
+					(Some(spending_tx), Some(cur_height))
 				}
-				(Some(spending_tx), Some(cur_height))
-			}
-			Ok(None) => {
-				log_debug!(
-					self.logger,
-					"Omitted spending static outputs: {:?}",
-					output_descriptors
-				);
-				(None, None)
-			}
-			Err(e) => {
-				log_error!(self.logger, "Error spending outputs: {:?}", e);
-				(None, None)
-			}
-		};
+				Ok(None) => {
+					log_debug!(
+						self.logger,
+						"Omitted spending static outputs: {:?}",
+						output_descriptors
+					);
+					(None, None)
+				}
+				Err(e) => {
+					log_error!(self.logger, "Error spending outputs: {:?}", e);
+					(None, None)
+				}
+			};
 
 		for descriptor in output_descriptors {
 			let id = self.keys_manager.get_secure_random_bytes();
@@ -276,7 +280,9 @@ where
 					Ok(Some(spending_tx)) => {
 						self.wallet.broadcast_transactions(&[&spending_tx]);
 						if let Some(filter) = self.chain_source.as_ref() {
-							filter.register_tx(&spending_tx.txid(), &Script::new())
+							if let Some(tx_out) = spending_tx.output.first() {
+								filter.register_tx(&spending_tx.txid(), &tx_out.script_pubkey);
+							}
 						}
 						output_info.spending_tx = Some(spending_tx);
 						output_info.broadcast_height = Some(height);