X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Fchanmon_consistency.rs;h=9bae3bbdd8248100029292148dd60450e0bb636f;hb=8d9d099bf8e5204e3f6ac1197994239653ce75cd;hp=22491bdf0b70bc1e3e98a3b34ca26f36cf132dc3;hpb=27b9794beddbef6f0cf844d4fc7afed0226c765f;p=rust-lightning

diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs
index 22491bdf..9bae3bbd 100644
--- a/fuzz/src/chanmon_consistency.rs
+++ b/fuzz/src/chanmon_consistency.rs
@@ -30,6 +30,8 @@ use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hash_types::{BlockHash, WPubkeyHash};
 
+use lightning::blinded_path::BlindedPath;
+use lightning::blinded_path::payment::ReceiveTlvs;
 use lightning::chain;
 use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, channelmonitor, Confirm, Watch};
 use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
@@ -38,14 +40,15 @@ use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget,
 use lightning::sign::{KeyMaterial, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
 use lightning::events;
 use lightning::events::MessageSendEventsProvider;
-use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
+use lightning::ln::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::ln::channelmanager::{ChainParameters, ChannelDetails, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId, RecipientOnionFields};
 use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
 use lightning::ln::msgs::{self, CommitmentUpdate, ChannelMessageHandler, DecodeError, UpdateAddHTLC, Init};
 use lightning::ln::script::ShutdownScript;
 use lightning::ln::functional_test_utils::*;
-use lightning::offers::invoice::UnsignedBolt12Invoice;
+use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice};
 use lightning::offers::invoice_request::UnsignedInvoiceRequest;
+use lightning::onion_message::messenger::{Destination, MessageRouter, OnionMessagePath};
 use lightning::util::test_channel_signer::{TestChannelSigner, EnforcementState};
 use lightning::util::errors::APIError;
 use lightning::util::logger::Logger;
@@ -56,7 +59,7 @@ use lightning::routing::router::{InFlightHtlcs, Path, Route, RouteHop, RoutePara
 use crate::utils::test_logger::{self, Output};
 use crate::utils::test_persister::TestPersister;
 
-use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1};
+use bitcoin::secp256k1::{Message, PublicKey, SecretKey, Scalar, Secp256k1, self};
 use bitcoin::secp256k1::ecdh::SharedSecret;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
 use bitcoin::secp256k1::schnorr;
@@ -99,6 +102,32 @@ impl Router for FuzzRouter {
 			action: msgs::ErrorAction::IgnoreError
 		})
 	}
+
+	fn create_blinded_payment_paths<
+		ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
+	>(
+		&self, _recipient: PublicKey, _first_hops: Vec<ChannelDetails>, _tlvs: ReceiveTlvs,
+		_amount_msats: u64, _entropy_source: &ES, _secp_ctx: &Secp256k1<T>
+	) -> Result<Vec<(BlindedPayInfo, BlindedPath)>, ()> {
+		unreachable!()
+	}
+}
+
+impl MessageRouter for FuzzRouter {
+	fn find_path(
+		&self, _sender: PublicKey, _peers: Vec<PublicKey>, _destination: Destination
+	) -> Result<OnionMessagePath, ()> {
+		unreachable!()
+	}
+
+	fn create_blinded_paths<
+		ES: EntropySource + ?Sized, T: secp256k1::Signing + secp256k1::Verification
+	>(
+		&self, _recipient: PublicKey, _peers: Vec<PublicKey>, _entropy_source: &ES,
+		_secp_ctx: &Secp256k1<T>
+	) -> Result<Vec<BlindedPath>, ()> {
+		unreachable!()
+	}
 }
 
 pub struct TestBroadcaster {}
@@ -162,7 +191,7 @@ impl chain::Watch<TestChannelSigner> for TestChainMonitor {
 		self.chain_monitor.update_channel(funding_txo, update)
 	}
 
-	fn release_pending_monitor_events(&self) -> Vec<(OutPoint, Vec<MonitorEvent>, Option<PublicKey>)> {
+	fn release_pending_monitor_events(&self) -> Vec<(OutPoint, ChannelId, Vec<MonitorEvent>, Option<PublicKey>)> {
 		return self.chain_monitor.release_pending_monitor_events();
 	}
 }
@@ -231,6 +260,8 @@ impl NodeSigner for KeyProvider {
 
 impl SignerProvider for KeyProvider {
 	type EcdsaSigner = TestChannelSigner;
+	#[cfg(taproot)]
+	type TaprootSigner = TestChannelSigner;
 
 	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 		let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
@@ -1258,6 +1289,94 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 			},
 			0x89 => { fee_est_c.ret_val.store(253, atomic::Ordering::Release); nodes[2].maybe_update_chan_fees(); },
 
+			0xf0 => {
+				let pending_updates = monitor_a.chain_monitor.list_pending_monitor_updates().remove(&chan_1_funding).unwrap();
+				if let Some(id) = pending_updates.get(0) {
+					monitor_a.chain_monitor.channel_monitor_updated(chan_1_funding, *id).unwrap();
+				}
+				nodes[0].process_monitor_events();
+			}
+			0xf1 => {
+				let pending_updates = monitor_a.chain_monitor.list_pending_monitor_updates().remove(&chan_1_funding).unwrap();
+				if let Some(id) = pending_updates.get(1) {
+					monitor_a.chain_monitor.channel_monitor_updated(chan_1_funding, *id).unwrap();
+				}
+				nodes[0].process_monitor_events();
+			}
+			0xf2 => {
+				let pending_updates = monitor_a.chain_monitor.list_pending_monitor_updates().remove(&chan_1_funding).unwrap();
+				if let Some(id) = pending_updates.last() {
+					monitor_a.chain_monitor.channel_monitor_updated(chan_1_funding, *id).unwrap();
+				}
+				nodes[0].process_monitor_events();
+			}
+
+			0xf4 => {
+				let pending_updates = monitor_b.chain_monitor.list_pending_monitor_updates().remove(&chan_1_funding).unwrap();
+				if let Some(id) = pending_updates.get(0) {
+					monitor_b.chain_monitor.channel_monitor_updated(chan_1_funding, *id).unwrap();
+				}
+				nodes[1].process_monitor_events();
+			}
+			0xf5 => {
+				let pending_updates = monitor_b.chain_monitor.list_pending_monitor_updates().remove(&chan_1_funding).unwrap();
+				if let Some(id) = pending_updates.get(1) {
+					monitor_b.chain_monitor.channel_monitor_updated(chan_1_funding, *id).unwrap();
+				}
+				nodes[1].process_monitor_events();
+			}
+			0xf6 => {
+				let pending_updates = monitor_b.chain_monitor.list_pending_monitor_updates().remove(&chan_1_funding).unwrap();
+				if let Some(id) = pending_updates.last() {
+					monitor_b.chain_monitor.channel_monitor_updated(chan_1_funding, *id).unwrap();
+				}
+				nodes[1].process_monitor_events();
+			}
+
+			0xf8 => {
+				let pending_updates = monitor_b.chain_monitor.list_pending_monitor_updates().remove(&chan_2_funding).unwrap();
+				if let Some(id) = pending_updates.get(0) {
+					monitor_b.chain_monitor.channel_monitor_updated(chan_2_funding, *id).unwrap();
+				}
+				nodes[1].process_monitor_events();
+			}
+			0xf9 => {
+				let pending_updates = monitor_b.chain_monitor.list_pending_monitor_updates().remove(&chan_2_funding).unwrap();
+				if let Some(id) = pending_updates.get(1) {
+					monitor_b.chain_monitor.channel_monitor_updated(chan_2_funding, *id).unwrap();
+				}
+				nodes[1].process_monitor_events();
+			}
+			0xfa => {
+				let pending_updates = monitor_b.chain_monitor.list_pending_monitor_updates().remove(&chan_2_funding).unwrap();
+				if let Some(id) = pending_updates.last() {
+					monitor_b.chain_monitor.channel_monitor_updated(chan_2_funding, *id).unwrap();
+				}
+				nodes[1].process_monitor_events();
+			}
+
+			0xfc => {
+				let pending_updates = monitor_c.chain_monitor.list_pending_monitor_updates().remove(&chan_2_funding).unwrap();
+				if let Some(id) = pending_updates.get(0) {
+					monitor_c.chain_monitor.channel_monitor_updated(chan_2_funding, *id).unwrap();
+				}
+				nodes[2].process_monitor_events();
+			}
+			0xfd => {
+				let pending_updates = monitor_c.chain_monitor.list_pending_monitor_updates().remove(&chan_2_funding).unwrap();
+				if let Some(id) = pending_updates.get(1) {
+					monitor_c.chain_monitor.channel_monitor_updated(chan_2_funding, *id).unwrap();
+				}
+				nodes[2].process_monitor_events();
+			}
+			0xfe => {
+				let pending_updates = monitor_c.chain_monitor.list_pending_monitor_updates().remove(&chan_2_funding).unwrap();
+				if let Some(id) = pending_updates.last() {
+					monitor_c.chain_monitor.channel_monitor_updated(chan_2_funding, *id).unwrap();
+				}
+				nodes[2].process_monitor_events();
+			}
+
 			0xff => {
 				// Test that no channel is in a stuck state where neither party can send funds even
 				// after we resolve all pending events.