Add KeysInterface trait to handle keys management, first part: when ChannelMonitor

detects a spendable outputs onchain it will notify back the user wallet
with needed data to spend it with register_spendable_outputs

Author: Antoine Riard

fuzz/fuzz_targets/full_stack_target.rs

@@ -6,6 +6,7 @@ extern crate secp256k1;
 use bitcoin::blockdata::block::BlockHeader;
 use bitcoin::blockdata::transaction::{Transaction, TxOut};
 use bitcoin::blockdata::script::Script;
+use bitcoin::blockdata::transaction::OutPoint as BitcoinOutPoint;
 use bitcoin::network::constants::Network;
 use bitcoin::network::serialize::{deserialize, serialize, BitcoinHash};
 use bitcoin::util::hash::Sha256dHash;
@@ -22,6 +23,7 @@ use lightning::util::events::{EventsProvider,Event};
 use lightning::util::reset_rng_state;
 use lightning::util::logger::Logger;
 use lightning::util::sha2::Sha256;
+use lightning::ln::keysinterface::KeysInterface;
 
 mod utils;
 
@@ -104,6 +106,11 @@ impl BroadcasterInterface for TestBroadcaster {
 	fn broadcast_transaction(&self, _tx: &Transaction) {}
 }
 
+struct TestKeysManager {}
+impl KeysInterface for TestKeysManager {
+	fn register_spendable_outputs(&self, _spendable_outputs: Vec<(Option<SecretKey>, Script, BitcoinOutPoint)>) {}
+}
+
 #[derive(Clone)]
 struct Peer<'a> {
 	id: u8,
@@ -234,7 +241,8 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 
 	let watch = Arc::new(ChainWatchInterfaceUtil::new(Network::Bitcoin, Arc::clone(&logger)));
 	let broadcast = Arc::new(TestBroadcaster{});
-	let monitor = channelmonitor::SimpleManyChannelMonitor::new(watch.clone(), broadcast.clone());
+	let keys_manager = Arc::new(TestKeysManager{});
+	let monitor = channelmonitor::SimpleManyChannelMonitor::new(watch.clone(), broadcast.clone(), keys_manager.clone());
 
 	let channelmanager = ChannelManager::new(our_network_key, slice_to_be32(get_slice!(4)), get_slice!(1)[0] != 0, Network::Bitcoin, fee_est.clone(), monitor.clone(), watch.clone(), broadcast.clone(), Arc::clone(&logger)).unwrap();
 	let router = Arc::new(Router::new(PublicKey::from_secret_key(&secp_ctx, &our_network_key), watch.clone(), Arc::clone(&logger)));

src/ln/channelmanager.rs

@@ -3086,7 +3086,8 @@ mod tests {
 			let feeest = Arc::new(test_utils::TestFeeEstimator { sat_per_kw: 253 });
 			let chain_monitor = Arc::new(chaininterface::ChainWatchInterfaceUtil::new(Network::Testnet, Arc::clone(&logger)));
 			let tx_broadcaster = Arc::new(test_utils::TestBroadcaster{txn_broadcasted: Mutex::new(Vec::new())});
-			let chan_monitor = Arc::new(test_utils::TestChannelMonitor::new(chain_monitor.clone(), tx_broadcaster.clone()));
+			let keys_manager = Arc::new(test_utils::TestKeysInterface::new());
+			let chan_monitor = Arc::new(test_utils::TestChannelMonitor::new(chain_monitor.clone(), tx_broadcaster.clone(), keys_manager));
 			let node_id = {
 				let mut key_slice = [0; 32];
 				rng.fill_bytes(&mut key_slice);