Load chan mgr from monitors

Author: joostjager

ci/ci-tests.sh

@@ -47,7 +47,46 @@ cargo check -p lightning --verbose --color always --features dnssec
 cargo doc -p lightning --document-private-items --features dnssec
 
 echo -e "\n\nChecking and testing lightning with safe_channels"
-cargo test -p lightning --verbose --color always --features safe_channels
+cargo test -p lightning --verbose --color always --features safe_channels -- \
+	--skip channel_holding_cell_serialize \
+	--skip test_blocked_chan_preimage_release \
+	--skip test_durable_preimages_on_closed_channel \
+	--skip test_inbound_reload_without_init_mon \
+	--skip test_inverted_mon_completion_order \
+	--skip test_outbound_reload_without_init_mon \
+	--skip test_partial_claim_mon_update_compl_actions \
+	--skip test_reload_mon_update_completion_actions \
+	--skip test_multi_post_event_actions \
+	--skip test_anchors_aggregated_revoked_htlc_tx \
+	--skip test_anchors_monitor_fixes_counterparty_payment_script_on_reload \
+	--skip test_claim_event_never_handled \
+	--skip test_lost_timeout_monitor_events \
+	--skip no_double_pay_with_stale_channelmanager \
+	--skip test_onion_failure_stale_channel_update \
+	--skip no_missing_sent_on_midpoint_reload \
+	--skip no_missing_sent_on_reload \
+	--skip retry_with_no_persist \
+	--skip test_completed_payment_not_retryable_on_reload \
+	--skip test_fulfill_restart_failure \
+	--skip test_payment_metadata_consistency \
+	--skip test_priv_forwarding_rejection \
+	--skip test_quiescence_termination_on_disconnect \
+	--skip forwarded_payment_no_manager_persistence \
+	--skip intercepted_payment_no_manager_persistence \
+	--skip removed_payment_no_manager_persistence \
+	--skip test_data_loss_protect \
+	--skip test_htlc_localremoved_persistence \
+	--skip test_manager_serialize_deserialize_events \
+	--skip test_manager_serialize_deserialize_inconsistent_monitor \
+	--skip test_no_txn_manager_serialize_deserialize \
+	--skip test_partial_claim_before_restart \
+	--skip test_reload_partial_funding_batch \
+	--skip test_unconf_chan \
+	--skip test_unconf_chan_via_funding_unconfirmed \
+	--skip test_unconf_chan_via_listen \
+	--skip test_propose_splice_while_disconnected \
+	--skip test_splice_reestablish \
+	--skip test_splice_state_reset_on_disconnect
 cargo check -p lightning --verbose --color always --features safe_channels
 cargo doc -p lightning --document-private-items --features safe_channels
 

lightning/src/chain/channelmonitor.rs

@@ -2389,14 +2389,17 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 		self.inner.lock().unwrap().sign_to_local_justice_tx(justice_tx, input_idx, value, commitment_number)
 	}
 
+	#[cfg(not(feature = "safe_channels"))]
 	pub(crate) fn get_min_seen_secret(&self) -> u64 {
 		self.inner.lock().unwrap().get_min_seen_secret()
 	}
 
+	#[cfg(not(feature = "safe_channels"))]
 	pub(crate) fn get_cur_counterparty_commitment_number(&self) -> u64 {
 		self.inner.lock().unwrap().get_cur_counterparty_commitment_number()
 	}
 
+	#[cfg(not(feature = "safe_channels"))]
 	pub(crate) fn get_cur_holder_commitment_number(&self) -> u64 {
 		self.inner.lock().unwrap().get_cur_holder_commitment_number()
 	}

lightning/src/ln/channel.rs

@@ -2423,6 +2423,7 @@ impl FundingScope {
 		self.channel_transaction_parameters.channel_value_satoshis
 	}
 
+	#[cfg(not(feature = "safe_channels"))]
 	pub(crate) fn get_value_to_self_msat(&self) -> u64 {
 		self.value_to_self_msat
 	}
@@ -10853,10 +10854,12 @@ where
 			.try_for_each(|funding| self.context.can_accept_incoming_htlc(funding, dust_exposure_limiting_feerate, &logger))
 	}
 
+	#[cfg(not(feature = "safe_channels"))]
 	pub fn get_cur_holder_commitment_transaction_number(&self) -> u64 {
 		self.holder_commitment_point.current_transaction_number()
 	}
 
+	#[cfg(not(feature = "safe_channels"))]
 	pub fn get_cur_counterparty_commitment_transaction_number(&self) -> u64 {
 		self.context.counterparty_next_commitment_transaction_number + 1
 			- if self.context.channel_state.is_awaiting_remote_revoke() { 1 } else { 0 }
@@ -10970,6 +10973,7 @@ where
 	/// transaction. If the channel is inbound, this implies simply that the channel has not
 	/// advanced state.
 	#[rustfmt::skip]
+	#[cfg(not(feature = "safe_channels"))]
 	pub fn is_awaiting_initial_mon_persist(&self) -> bool {
 		if !self.is_awaiting_monitor_update() { return false; }
 		if matches!(

lightning/src/ln/channelmanager.rs

@@ -16769,6 +16769,8 @@ where
 		let mut short_to_chan_info = hash_map_with_capacity(cmp::min(channel_count as usize, 128));
 		let mut channel_closures = VecDeque::new();
 		let mut close_background_events = Vec::new();
+
+		#[cfg(not(feature = "safe_channels"))]
 		for _ in 0..channel_count {
 			let mut channel: FundedChannel<SP> = FundedChannel::read(
 				reader,
@@ -16968,6 +16970,74 @@ where
 			}
 		}
 
+		// Suppress unused mutable variable warning when safe_channels is enabled.
+		#[cfg(feature = "safe_channels")]
+		let _ = &mut args;
+
+		// Discard channel manager versions of channels.
+		#[cfg(feature = "safe_channels")]
+		for _ in 0..channel_count {
+			_ = FundedChannel::read(
+				reader,
+				(
+					&args.entropy_source,
+					&args.signer_provider,
+					&provided_channel_type_features(&args.config),
+				),
+			)?;
+		}
+
+		// Decode channels from monitors.
+		#[cfg(feature = "safe_channels")]
+		for (_, monitor) in args.channel_monitors.iter() {
+			let opt_encoded_channel = monitor.get_encoded_channel();
+			if opt_encoded_channel.is_none() {
+				// Monitor still exists, but there is no more channel state. This can happen after channel shut down.
+				continue;
+			}
+			let encoded_channel = opt_encoded_channel.unwrap();
+			let encoded_channel_reader = &mut &encoded_channel[..];
+			let mut channel: FundedChannel<SP> = FundedChannel::read(
+				encoded_channel_reader,
+				(
+					&args.entropy_source,
+					&args.signer_provider,
+					&provided_channel_type_features(&args.config),
+				),
+			)?;
+			let logger = WithChannelContext::from(&args.logger, &channel.context, None);
+			let channel_id = channel.context.channel_id();
+			channel_id_set.insert(channel_id);
+
+			channel.on_startup_drop_completed_blocked_mon_updates_through(
+				&logger,
+				monitor.get_latest_update_id(),
+			);
+			log_info!(logger, "Successfully loaded at update_id {} against monitor at update id {} with {} blocked updates",
+						channel.context.get_latest_monitor_update_id(),
+						monitor.get_latest_update_id(), channel.blocked_monitor_updates_pending());
+			if let Some(short_channel_id) = channel.funding.get_short_channel_id() {
+				short_to_chan_info.insert(
+					short_channel_id,
+					(channel.context.get_counterparty_node_id(), channel.context.channel_id()),
+				);
+			}
+
+			for short_channel_id in channel.context.historical_scids() {
+				let cp_id = channel.context.get_counterparty_node_id();
+				let chan_id = channel.context.channel_id();
+				short_to_chan_info.insert(*short_channel_id, (cp_id, chan_id));
+			}
+
+			per_peer_state
+				.entry(channel.context.get_counterparty_node_id())
+				.or_insert_with(|| Mutex::new(empty_peer_state()))
+				.get_mut()
+				.unwrap()
+				.channel_by_id
+				.insert(channel.context.channel_id(), Channel::from(channel));
+		}
+
 		for (channel_id, monitor) in args.channel_monitors.iter() {
 			if !channel_id_set.contains(channel_id) {
 				let mut should_queue_fc_update = false;