ChannelManager: track whether to advertise onion msgs in NodeFeatures

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -65,7 +65,7 @@ use core::{cmp, mem};
 use core::cell::RefCell;
 use io::Read;
 use sync::{Arc, Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard};
-use core::sync::atomic::{AtomicUsize, Ordering};
+use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use core::time::Duration;
 use core::ops::Deref;
 
@@ -688,6 +688,7 @@ pub struct ChannelManager<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref,
 {
 	default_configuration: UserConfig,
 	genesis_hash: BlockHash,
+	advertise_onion_message_support: AtomicBool,
 	fee_estimator: LowerBoundedFeeEstimator<F>,
 	chain_monitor: M,
 	tx_broadcaster: T,
@@ -1592,6 +1593,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		ChannelManager {
 			default_configuration: config.clone(),
 			genesis_hash: genesis_block(params.network).header.block_hash(),
+			advertise_onion_message_support: AtomicBool::new(false),
 			fee_estimator: LowerBoundedFeeEstimator::new(fee_est),
 			chain_monitor,
 			tx_broadcaster,
@@ -6236,7 +6238,9 @@ impl<Signer: Sign, M: Deref , T: Deref , K: Deref , F: Deref , L: Deref >
 		}
 	}
 
-	fn advertise_onion_message_support(&self) {}
+	fn advertise_onion_message_support(&self) {
+		self.advertise_onion_message_support.store(true, Ordering::Release);
+	}
 }
 
 /// Used to signal to the ChannelManager persister that the manager needs to be re-persisted to
@@ -7283,6 +7287,7 @@ impl<'a, Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 
 		let channel_manager = ChannelManager {
 			genesis_hash,
+			advertise_onion_message_support: AtomicBool::new(false),
 			fee_estimator: bounded_fee_estimator,
 			chain_monitor: args.chain_monitor,
 			tx_broadcaster: args.tx_broadcaster,