From dc3f8261231321151590a15ccb8c8dcd773e8d9c Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 25 Jun 2024 16:20:59 +0000 Subject: [PATCH] (Re-)add handling for `ChannelUpdate::message_flags` When the `htlc_maximum_msat` field was made mandatory in `ChannelUpdate` (in b0e8b739b73cc25f3e1ab00695a14d972162a140) we started ignoring the `message_flags` field entirely and always writing `1`. The comment updates indicated that the `message_flags` field was deprecated, but this is not true - only the `htlc_maximum_msat` indicator bit was deprecated, requiring it to be 1. If a node creates a `channel_update` with `message_flags` bits set other than the low bit, this will cause us to spuriously reject the message with an invalid signature error as we will check the message against the wrong hash. With today's current spec this is totally fine - the only other bit defined for `message_flags` is the `dont_forward` bit, which when set indicates we shouldn't accept the message into our gossip store anyway (though this may lead to spurious `warning` messages being sent to peers). However, in the future this may mean we start rejecting valid `channel_update`s if new bits are defiend. --- fuzz/src/chanmon_consistency.rs | 8 +- fuzz/src/full_stack.rs | 2 +- lightning-rapid-gossip-sync/src/processing.rs | 3 +- lightning/src/ln/chanmon_update_fail_tests.rs | 6 +- lightning/src/ln/channel.rs | 3 +- lightning/src/ln/channelmanager.rs | 11 +- lightning/src/ln/functional_test_utils.rs | 4 +- lightning/src/ln/functional_tests.rs | 8 +- lightning/src/ln/msgs.rs | 36 +- lightning/src/ln/onion_route_tests.rs | 3 +- lightning/src/ln/priv_short_conf_tests.rs | 3 +- lightning/src/ln/shutdown_tests.rs | 4 +- lightning/src/routing/gossip.rs | 17 +- lightning/src/routing/router.rs | 336 ++++++++++++------ lightning/src/routing/scoring.rs | 5 +- lightning/src/routing/test_utils.rs | 57 ++- lightning/src/routing/utxo.rs | 8 +- lightning/src/util/test_utils.rs | 3 +- 18 files changed, 333 insertions(+), 184 deletions(-) diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs index 423e69eb8..39ed7300c 100644 --- a/fuzz/src/chanmon_consistency.rs +++ b/fuzz/src/chanmon_consistency.rs @@ -1069,7 +1069,7 @@ pub fn do_test(data: &[u8], underlying_out: Out, anchors: bool) { events::MessageSendEvent::SendChannelReady { .. } => continue, events::MessageSendEvent::SendAnnouncementSignatures { .. } => continue, events::MessageSendEvent::SendChannelUpdate { ref node_id, ref msg } => { - assert_eq!(msg.contents.flags & 2, 0); // The disable bit must never be set! + assert_eq!(msg.contents.channel_flags & 2, 0); // The disable bit must never be set! if Some(*node_id) == expect_drop_id { panic!("peer_disconnected should drop msgs bound for the disconnected peer"); } *node_id == a_id }, @@ -1207,7 +1207,7 @@ pub fn do_test(data: &[u8], underlying_out: Out, anchors: bool) { // the "disabled" bit, as we should never ever have a channel which is // disabled when we send such an update (or it may indicate channel // force-close which we should detect as an error). - assert_eq!(msg.contents.flags & 2, 0); + assert_eq!(msg.contents.channel_flags & 2, 0); }, _ => if out.may_fail.load(atomic::Ordering::Acquire) { return; @@ -1249,7 +1249,7 @@ pub fn do_test(data: &[u8], underlying_out: Out, anchors: bool) { events::MessageSendEvent::SendChannelReady { .. } => {}, events::MessageSendEvent::SendAnnouncementSignatures { .. } => {}, events::MessageSendEvent::SendChannelUpdate { ref msg, .. } => { - assert_eq!(msg.contents.flags & 2, 0); // The disable bit must never be set! + assert_eq!(msg.contents.channel_flags & 2, 0); // The disable bit must never be set! }, _ => { if out.may_fail.load(atomic::Ordering::Acquire) { @@ -1275,7 +1275,7 @@ pub fn do_test(data: &[u8], underlying_out: Out, anchors: bool) { events::MessageSendEvent::SendChannelReady { .. } => {}, events::MessageSendEvent::SendAnnouncementSignatures { .. } => {}, events::MessageSendEvent::SendChannelUpdate { ref msg, .. } => { - assert_eq!(msg.contents.flags & 2, 0); // The disable bit must never be set! + assert_eq!(msg.contents.channel_flags & 2, 0); // The disable bit must never be set! }, _ => { if out.may_fail.load(atomic::Ordering::Acquire) { diff --git a/fuzz/src/full_stack.rs b/fuzz/src/full_stack.rs index a2ae07a21..86f4ef4de 100644 --- a/fuzz/src/full_stack.rs +++ b/fuzz/src/full_stack.rs @@ -1779,7 +1779,7 @@ mod tests { let log_entries = logger.lines.lock().unwrap(); assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1)); - assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)): ChannelUpdate { signature: 3026020200a602200303030303030303030303030303030303030303030303030303030303030303, contents: UnsignedChannelUpdate { chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, timestamp: 44, flags: 0, cltv_expiry_delta: 40, htlc_minimum_msat: 0, htlc_maximum_msat: 100000000, fee_base_msat: 0, fee_proportional_millionths: 0, excess_data: [] } }".to_string())), Some(&1)); + assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)): ChannelUpdate { signature: 3026020200a602200303030303030303030303030303030303030303030303030303030303030303, contents: UnsignedChannelUpdate { chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, timestamp: 44, message_flags: 1, channel_flags: 0, cltv_expiry_delta: 40, htlc_minimum_msat: 0, htlc_maximum_msat: 100000000, fee_base_msat: 0, fee_proportional_millionths: 0, excess_data: [] } }".to_string())), Some(&1)); assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced node: NodeAnnouncement { signature: 302502012802200303030303030303030303030303030303030303030303030303030303030303, contents: UnsignedNodeAnnouncement { features: [], timestamp: 43, node_id: NodeId(030303030303030303030303030303030303030303030303030303030303030303), rgb: [0, 0, 0], alias: NodeAlias([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]), addresses: [], excess_address_data: [], excess_data: [] } }".to_string())), Some(&1)); } } diff --git a/lightning-rapid-gossip-sync/src/processing.rs b/lightning-rapid-gossip-sync/src/processing.rs index c7b8a8321..43d03c6d7 100644 --- a/lightning-rapid-gossip-sync/src/processing.rs +++ b/lightning-rapid-gossip-sync/src/processing.rs @@ -370,7 +370,8 @@ where chain_hash, short_channel_id, timestamp: backdated_timestamp, - flags: standard_channel_flags, + message_flags: 1, // Only must_be_one + channel_flags: standard_channel_flags, cltv_expiry_delta: default_cltv_expiry_delta, htlc_minimum_msat: default_htlc_minimum_msat, htlc_maximum_msat: default_htlc_maximum_msat, diff --git a/lightning/src/ln/chanmon_update_fail_tests.rs b/lightning/src/ln/chanmon_update_fail_tests.rs index ce07cb737..f608c9798 100644 --- a/lightning/src/ln/chanmon_update_fail_tests.rs +++ b/lightning/src/ln/chanmon_update_fail_tests.rs @@ -1130,7 +1130,7 @@ fn test_monitor_update_fail_reestablish() { nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reestablish); assert_eq!( get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id()) - .contents.flags & 2, 0); // The "disabled" bit should be unset as we just reconnected + .contents.channel_flags & 2, 0); // The "disabled" bit should be unset as we just reconnected nodes[1].node.get_and_clear_pending_msg_events(); // Free the holding cell check_added_monitors!(nodes[1], 1); @@ -1151,13 +1151,13 @@ fn test_monitor_update_fail_reestablish() { nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &bs_reestablish); assert_eq!( get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id()) - .contents.flags & 2, 0); // The "disabled" bit should be unset as we just reconnected + .contents.channel_flags & 2, 0); // The "disabled" bit should be unset as we just reconnected nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &as_reestablish); check_added_monitors!(nodes[1], 0); assert_eq!( get_event_msg!(nodes[1], MessageSendEvent::SendChannelUpdate, nodes[0].node.get_our_node_id()) - .contents.flags & 2, 0); // The "disabled" bit should be unset as we just reconnected + .contents.channel_flags & 2, 0); // The "disabled" bit should be unset as we just reconnected chanmon_cfgs[1].persister.set_update_ret(ChannelMonitorUpdateStatus::Completed); let (outpoint, latest_update, _) = nodes[1].chain_monitor.latest_monitor_update_id.lock().unwrap().get(&chan_1.2).unwrap().clone(); diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs index f5c47260f..5db076931 100644 --- a/lightning/src/ln/channel.rs +++ b/lightning/src/ln/channel.rs @@ -9894,7 +9894,8 @@ mod tests { chain_hash, short_channel_id: 0, timestamp: 0, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 100, htlc_minimum_msat: 5, htlc_maximum_msat: MAX_VALUE_MSAT, diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs index 6ba7396eb..86cf4dbb8 100644 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@ -3505,7 +3505,7 @@ where // peer has been disabled for some time), return `channel_disabled`, // otherwise return `temporary_channel_failure`. let chan_update_opt = self.get_channel_update_for_onion(next_packet.outgoing_scid, chan).ok(); - if chan_update_opt.as_ref().map(|u| u.contents.flags & 2 == 2).unwrap_or(false) { + if chan_update_opt.as_ref().map(|u| u.contents.channel_flags & 2 == 2).unwrap_or(false) { return Err(("Forwarding channel has been disconnected for some time.", 0x1000 | 20, chan_update_opt)); } else { return Err(("Forwarding channel is not in a ready state.", 0x1000 | 7, chan_update_opt)); @@ -3784,7 +3784,8 @@ where chain_hash: self.chain_hash, short_channel_id, timestamp: chan.context.get_update_time_counter(), - flags: (!were_node_one) as u8 | ((!enabled as u8) << 1), + message_flags: 1, // Only must_be_one + channel_flags: (!were_node_one) as u8 | ((!enabled as u8) << 1), cltv_expiry_delta: chan.context.get_cltv_expiry_delta(), htlc_minimum_msat: chan.context.get_counterparty_htlc_minimum_msat(), htlc_maximum_msat: chan.context.get_announced_htlc_max_msat(), @@ -7920,7 +7921,7 @@ where return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a channel_update for a channel from the wrong node - it shouldn't know about our private channels!".to_owned(), chan_id)); } let were_node_one = self.get_our_node_id().serialize()[..] < chan.context.get_counterparty_node_id().serialize()[..]; - let msg_from_node_one = msg.contents.flags & 1 == 0; + let msg_from_node_one = msg.contents.channel_flags & 1 == 0; if were_node_one == msg_from_node_one { return Ok(NotifyOption::SkipPersistNoEvents); } else { @@ -12236,8 +12237,8 @@ mod tests { // update message and would always update the local fee info, even if our peer was // (spuriously) forwarding us our own channel_update. let as_node_one = nodes[0].node.get_our_node_id().serialize()[..] < nodes[1].node.get_our_node_id().serialize()[..]; - let as_update = if as_node_one == (chan.0.contents.flags & 1 == 0 /* chan.0 is from node one */) { &chan.0 } else { &chan.1 }; - let bs_update = if as_node_one == (chan.0.contents.flags & 1 == 0 /* chan.0 is from node one */) { &chan.1 } else { &chan.0 }; + let as_update = if as_node_one == (chan.0.contents.channel_flags & 1 == 0 /* chan.0 is from node one */) { &chan.0 } else { &chan.1 }; + let bs_update = if as_node_one == (chan.0.contents.channel_flags & 1 == 0 /* chan.0 is from node one */) { &chan.1 } else { &chan.0 }; // First deliver each peers' own message, checking that the node doesn't need to be // persisted and that its channel info remains the same. diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs index 00168fdfb..aad618177 100644 --- a/lightning/src/ln/functional_test_utils.rs +++ b/lightning/src/ln/functional_test_utils.rs @@ -1554,7 +1554,7 @@ macro_rules! get_closing_signed_broadcast { assert!(events.len() == 1 || events.len() == 2); (match events[events.len() - 1] { MessageSendEvent::BroadcastChannelUpdate { ref msg } => { - assert_eq!(msg.contents.flags & 2, 2); + assert_eq!(msg.contents.channel_flags & 2, 2); msg.clone() }, _ => panic!("Unexpected event"), @@ -1613,7 +1613,7 @@ pub fn check_closed_broadcast(node: &Node, num_channels: usize, with_error_msg: msg_events.into_iter().filter_map(|msg_event| { match msg_event { MessageSendEvent::BroadcastChannelUpdate { ref msg } => { - assert_eq!(msg.contents.flags & 2, 2); + assert_eq!(msg.contents.channel_flags & 2, 2); None }, MessageSendEvent::HandleError { action: msgs::ErrorAction::SendErrorMessage { msg }, node_id: _ } => { diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs index 38be3d8b1..6271f7300 100644 --- a/lightning/src/ln/functional_tests.rs +++ b/lightning/src/ln/functional_tests.rs @@ -7403,7 +7403,7 @@ fn test_announce_disable_channels() { for e in msg_events { match e { MessageSendEvent::BroadcastChannelUpdate { ref msg } => { - assert_eq!(msg.contents.flags & (1<<1), 1<<1); // The "channel disabled" bit should be set + assert_eq!(msg.contents.channel_flags & (1<<1), 1<<1); // The "channel disabled" bit should be set // Check that each channel gets updated exactly once if chans_disabled.insert(msg.contents.short_channel_id, msg.contents.timestamp).is_some() { panic!("Generated ChannelUpdate for wrong chan!"); @@ -7450,7 +7450,7 @@ fn test_announce_disable_channels() { for e in msg_events { match e { MessageSendEvent::BroadcastChannelUpdate { ref msg } => { - assert_eq!(msg.contents.flags & (1<<1), 0); // The "channel disabled" bit should be off + assert_eq!(msg.contents.channel_flags & (1<<1), 0); // The "channel disabled" bit should be off match chans_disabled.remove(&msg.contents.short_channel_id) { // Each update should have a higher timestamp than the previous one, replacing // the old one. @@ -9396,13 +9396,13 @@ fn test_error_chans_closed() { assert_eq!(events.len(), 2); match events[0] { MessageSendEvent::BroadcastChannelUpdate { ref msg } => { - assert_eq!(msg.contents.flags & 2, 2); + assert_eq!(msg.contents.channel_flags & 2, 2); }, _ => panic!("Unexpected event"), } match events[1] { MessageSendEvent::BroadcastChannelUpdate { ref msg } => { - assert_eq!(msg.contents.flags & 2, 2); + assert_eq!(msg.contents.channel_flags & 2, 2); }, _ => panic!("Unexpected event"), } diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs index 3e0627aac..0cc8f1323 100644 --- a/lightning/src/ln/msgs.rs +++ b/lightning/src/ln/msgs.rs @@ -1227,8 +1227,11 @@ pub struct UnsignedChannelUpdate { pub short_channel_id: u64, /// A strictly monotonic announcement counter, with gaps allowed, specific to this channel pub timestamp: u32, - /// Channel flags - pub flags: u8, + /// Flags pertaining to this message. + pub message_flags: u8, + /// Flags pertaining to the channel, including to which direction in the channel this update + /// applies and whether the direction is currently able to forward HTLCs. + pub channel_flags: u8, /// The number of blocks such that if: /// `incoming_htlc.cltv_expiry < outgoing_htlc.cltv_expiry + cltv_expiry_delta` /// then we need to fail the HTLC backwards. When forwarding an HTLC, `cltv_expiry_delta` determines @@ -2866,13 +2869,13 @@ impl_writeable!(ChannelAnnouncement, { impl Writeable for UnsignedChannelUpdate { fn write(&self, w: &mut W) -> Result<(), io::Error> { - // `message_flags` used to indicate presence of `htlc_maximum_msat`, but was deprecated in the spec. - const MESSAGE_FLAGS: u8 = 1; self.chain_hash.write(w)?; self.short_channel_id.write(w)?; self.timestamp.write(w)?; - let all_flags = self.flags as u16 | ((MESSAGE_FLAGS as u16) << 8); - all_flags.write(w)?; + // Thw low bit of message_flags used to indicate the presence of `htlc_maximum_msat`, and + // now must be set + (self.message_flags | 1).write(w)?; + self.channel_flags.write(w)?; self.cltv_expiry_delta.write(w)?; self.htlc_minimum_msat.write(w)?; self.fee_base_msat.write(w)?; @@ -2885,22 +2888,26 @@ impl Writeable for UnsignedChannelUpdate { impl Readable for UnsignedChannelUpdate { fn read(r: &mut R) -> Result { - Ok(Self { + let res = Self { chain_hash: Readable::read(r)?, short_channel_id: Readable::read(r)?, timestamp: Readable::read(r)?, - flags: { - let flags: u16 = Readable::read(r)?; - // Note: we ignore the `message_flags` for now, since it was deprecated by the spec. - flags as u8 - }, + message_flags: Readable::read(r)?, + channel_flags: Readable::read(r)?, cltv_expiry_delta: Readable::read(r)?, htlc_minimum_msat: Readable::read(r)?, fee_base_msat: Readable::read(r)?, fee_proportional_millionths: Readable::read(r)?, htlc_maximum_msat: Readable::read(r)?, excess_data: read_to_end(r)?, - }) + }; + if res.message_flags & 1 != 1 { + // The `must_be_one` flag should be set (historically it indicated the presence of the + // `htlc_maximum_msat` field, which is now required). + Err(DecodeError::InvalidValue) + } else { + Ok(res) + } } } @@ -3496,7 +3503,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Bitcoin), short_channel_id: 2316138423780173, timestamp: 20190119, - flags: if direction { 1 } else { 0 } | if disable { 1 << 1 } else { 0 }, + message_flags: 1, // Only must_be_one + channel_flags: if direction { 1 } else { 0 } | if disable { 1 << 1 } else { 0 }, cltv_expiry_delta: 144, htlc_minimum_msat: 1000000, htlc_maximum_msat: 131355275467161, diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs index 02109c888..209364c6c 100644 --- a/lightning/src/ln/onion_route_tests.rs +++ b/lightning/src/ln/onion_route_tests.rs @@ -238,7 +238,8 @@ impl msgs::ChannelUpdate { chain_hash: ChainHash::from(BlockHash::hash(&vec![0u8][..]).as_ref()), short_channel_id, timestamp: 0, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: msgs::MAX_VALUE_MSAT, diff --git a/lightning/src/ln/priv_short_conf_tests.rs b/lightning/src/ln/priv_short_conf_tests.rs index 7aef89595..e747315c9 100644 --- a/lightning/src/ln/priv_short_conf_tests.rs +++ b/lightning/src/ln/priv_short_conf_tests.rs @@ -508,7 +508,8 @@ fn test_scid_alias_returned() { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: last_hop[0].inbound_scid_alias.unwrap(), timestamp: 21, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: accept_forward_cfg.channel_config.cltv_expiry_delta, htlc_minimum_msat: 1_000, htlc_maximum_msat: 1_000_000, // Defaults to 10% of the channel value diff --git a/lightning/src/ln/shutdown_tests.rs b/lightning/src/ln/shutdown_tests.rs index 802ee1e56..8f3121a86 100644 --- a/lightning/src/ln/shutdown_tests.rs +++ b/lightning/src/ln/shutdown_tests.rs @@ -577,7 +577,7 @@ fn do_test_shutdown_rebroadcast(recv_count: u8) { node_0_2nd_shutdown } else { let node_0_chan_update = get_event_msg!(nodes[0], MessageSendEvent::SendChannelUpdate, nodes[1].node.get_our_node_id()); - assert_eq!(node_0_chan_update.contents.flags & 2, 0); // "disabled" flag must not be set as we just reconnected. + assert_eq!(node_0_chan_update.contents.channel_flags & 2, 0); // "disabled" flag must not be set as we just reconnected. nodes[0].node.handle_shutdown(&nodes[1].node.get_our_node_id(), &node_1_2nd_shutdown); get_event_msg!(nodes[0], MessageSendEvent::SendShutdown, nodes[1].node.get_our_node_id()) }; @@ -1188,7 +1188,7 @@ fn do_test_closing_signed_reinit_timeout(timeout_step: TimeoutStep) { assert_eq!(events.len(), 1); match events[0] { MessageSendEvent::BroadcastChannelUpdate { ref msg } => { - assert_eq!(msg.contents.flags & 2, 2); + assert_eq!(msg.contents.channel_flags & 2, 2); }, _ => panic!("Unexpected event"), } diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs index 7ef49b875..ae6d54025 100644 --- a/lightning/src/routing/gossip.rs +++ b/lightning/src/routing/gossip.rs @@ -2061,7 +2061,7 @@ impl NetworkGraph where L::Target: Logger { full_msg: Option<&msgs::ChannelUpdate>, sig: Option<&secp256k1::ecdsa::Signature>, only_verify: bool) -> Result<(), LightningError> { - let chan_enabled = msg.flags & (1 << 1) != (1 << 1); + let chan_enabled = msg.channel_flags & (1 << 1) != (1 << 1); if msg.chain_hash != self.chain_hash { return Err(LightningError { @@ -2083,7 +2083,13 @@ impl NetworkGraph where L::Target: Logger { } } - log_gossip!(self.logger, "Updating channel {} in direction {} with timestamp {}", msg.short_channel_id, msg.flags & 1, msg.timestamp); + log_gossip!( + self.logger, + "Updating channel {} in direction {} with timestamp {}", + msg.short_channel_id, + msg.channel_flags & 1, + msg.timestamp + ); let mut channels = self.channels.write().unwrap(); match channels.get_mut(&msg.short_channel_id) { @@ -2151,7 +2157,7 @@ impl NetworkGraph where L::Target: Logger { } let msg_hash = hash_to_message!(&message_sha256d_hash(&msg)[..]); - if msg.flags & 1 == 1 { + if msg.channel_flags & 1 == 1 { check_update_latest!(channel.two_to_one); if let Some(sig) = sig { secp_verify_sig!(self.secp_ctx, &msg_hash, &sig, &PublicKey::from_slice(channel.node_two.as_slice()).map_err(|_| LightningError{ @@ -2373,7 +2379,8 @@ pub(crate) mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 0, timestamp: 100, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 144, htlc_minimum_msat: 1_000_000, htlc_maximum_msat: 1_000_000, @@ -2817,7 +2824,7 @@ pub(crate) mod tests { assert!(gossip_sync.handle_channel_update(&valid_channel_update).is_ok()); assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().one_to_two.is_some()); - let valid_channel_update_2 = get_signed_channel_update(|update| {update.flags |=1;}, node_2_privkey, &secp_ctx); + let valid_channel_update_2 = get_signed_channel_update(|update| {update.channel_flags |=1;}, node_2_privkey, &secp_ctx); gossip_sync.handle_channel_update(&valid_channel_update_2).unwrap(); assert!(network_graph.read_only().channels().get(&short_channel_id).unwrap().two_to_one.is_some()); diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs index 28aaba051..8062f5983 100644 --- a/lightning/src/routing/router.rs +++ b/lightning/src/routing/router.rs @@ -3506,7 +3506,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3518,7 +3519,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3530,7 +3532,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3542,7 +3545,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3554,7 +3558,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3569,7 +3574,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 3, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 200_000_000, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3584,7 +3590,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 3, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 199_999_999, @@ -3607,7 +3614,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 4, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3640,7 +3648,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 35_000, htlc_maximum_msat: 40_000, @@ -3652,7 +3661,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 3, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 35_000, htlc_maximum_msat: 40_000, @@ -3666,7 +3676,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3678,7 +3689,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3692,7 +3704,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 3, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3717,7 +3730,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 4, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 65_000, htlc_maximum_msat: 80_000, @@ -3729,7 +3743,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 3, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3741,7 +3756,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 4, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3785,7 +3801,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 3, + message_flags: 1, // Only must_be_one + channel_flags: 3, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 0, @@ -3799,7 +3816,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 15_000, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3842,7 +3860,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -3854,7 +3873,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -4285,7 +4305,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -4297,7 +4318,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -4363,7 +4385,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -4375,7 +4398,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 2, - flags: 2, // to disable + message_flags: 1, // Only must_be_one + channel_flags: 2, // to disable cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -4723,7 +4747,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -4735,7 +4760,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -4750,7 +4776,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 1_000_000_000, @@ -4765,7 +4792,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 250_000_000, @@ -4804,7 +4832,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 3, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 1_000_000_000, @@ -4847,7 +4876,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 4, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 1_000_000_000, @@ -4862,7 +4892,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 3, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 15_000, @@ -4903,7 +4934,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 4, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -4927,7 +4959,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 333, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (3 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: 15_000, @@ -4939,7 +4972,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 333, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: (3 << 4) | 2, htlc_minimum_msat: 0, htlc_maximum_msat: 15_000, @@ -4977,7 +5011,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 333, timestamp: 6, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 10_000, @@ -5033,7 +5068,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5045,7 +5081,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5060,7 +5097,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5072,7 +5110,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5085,7 +5124,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 50_000, @@ -5097,7 +5137,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 11, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5162,7 +5203,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5174,7 +5216,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 50_000, @@ -5275,7 +5318,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5287,7 +5331,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 50_000, @@ -5302,7 +5347,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 60_000, @@ -5314,7 +5360,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 60_000, @@ -5329,7 +5376,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5341,7 +5389,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 180_000, @@ -5467,7 +5516,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5479,7 +5529,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5493,7 +5544,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5505,7 +5557,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5520,7 +5573,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 5, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5532,7 +5586,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 5, timestamp: 2, - flags: 3, // disable direction 1 + message_flags: 1, // Only must_be_one + channel_flags: 3, // disable direction 1 cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5548,7 +5603,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5560,7 +5616,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5573,7 +5630,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5585,7 +5643,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 11, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5655,7 +5714,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5667,7 +5727,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5681,7 +5742,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5693,7 +5755,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5708,7 +5771,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 5, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5720,7 +5784,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 5, timestamp: 2, - flags: 3, // disable direction 1 + message_flags: 1, // Only must_be_one + channel_flags: 3, // disable direction 1 cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5736,7 +5801,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5748,7 +5814,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 200_000, @@ -5761,7 +5828,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5773,7 +5841,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 11, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5839,7 +5908,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5852,7 +5922,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 2, - flags: 2, + message_flags: 1, // Only must_be_one + channel_flags: 2, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5866,7 +5937,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5878,7 +5950,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5892,7 +5965,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 5, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5904,7 +5978,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 5, timestamp: 2, - flags: 3, // Disable direction 1 + message_flags: 1, // Only must_be_one + channel_flags: 3, // Disable direction 1 cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -5927,7 +6002,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 250_000, @@ -5939,7 +6015,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -5952,7 +6029,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -5964,7 +6042,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 11, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6053,7 +6132,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (5 << 4) | 5, htlc_minimum_msat: 0, htlc_maximum_msat: 99_000, @@ -6065,7 +6145,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (5 << 4) | 3, htlc_minimum_msat: 0, htlc_maximum_msat: 99_000, @@ -6077,7 +6158,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (4 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6089,7 +6171,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0|2, // Channel disabled + message_flags: 1, // Only must_be_one + channel_flags: 0|2, // Channel disabled cltv_expiry_delta: (13 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6147,7 +6230,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 100_000, @@ -6159,7 +6243,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 50_000, @@ -6173,7 +6258,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 60_000, @@ -6185,7 +6271,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 60_000, @@ -6199,7 +6286,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 20_000, @@ -6211,7 +6299,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 20_000, @@ -6301,12 +6390,13 @@ mod tests { let payment_params = PaymentParameters::from_node_id(nodes[6], 42); add_channel(&gossip_sync, &secp_ctx, &our_privkey, &privkeys[1], ChannelFeatures::from_le_bytes(id_to_feature_flags(6)), 6); - for (key, flags) in [(&our_privkey, 0), (&privkeys[1], 3)] { + for (key, channel_flags) in [(&our_privkey, 0), (&privkeys[1], 3)] { update_channel(&gossip_sync, &secp_ctx, key, UnsignedChannelUpdate { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 1, - flags, + message_flags: 1, // Only must_be_one + channel_flags, cltv_expiry_delta: (6 << 4) | 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6318,12 +6408,13 @@ mod tests { add_or_update_node(&gossip_sync, &secp_ctx, &privkeys[1], NodeFeatures::from_le_bytes(id_to_feature_flags(1)), 0); add_channel(&gossip_sync, &secp_ctx, &privkeys[1], &privkeys[4], ChannelFeatures::from_le_bytes(id_to_feature_flags(5)), 5); - for (key, flags) in [(&privkeys[1], 0), (&privkeys[4], 3)] { + for (key, channel_flags) in [(&privkeys[1], 0), (&privkeys[4], 3)] { update_channel(&gossip_sync, &secp_ctx, key, UnsignedChannelUpdate { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 5, timestamp: 1, - flags, + message_flags: 1, // Only must_be_one + channel_flags, cltv_expiry_delta: (5 << 4) | 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6335,12 +6426,13 @@ mod tests { add_or_update_node(&gossip_sync, &secp_ctx, &privkeys[4], NodeFeatures::from_le_bytes(id_to_feature_flags(4)), 0); add_channel(&gossip_sync, &secp_ctx, &privkeys[4], &privkeys[3], ChannelFeatures::from_le_bytes(id_to_feature_flags(4)), 4); - for (key, flags) in [(&privkeys[4], 0), (&privkeys[3], 3)] { + for (key, channel_flags) in [(&privkeys[4], 0), (&privkeys[3], 3)] { update_channel(&gossip_sync, &secp_ctx, key, UnsignedChannelUpdate { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 1, - flags, + message_flags: 1, // Only must_be_one + channel_flags, cltv_expiry_delta: (4 << 4) | 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6352,12 +6444,13 @@ mod tests { add_or_update_node(&gossip_sync, &secp_ctx, &privkeys[3], NodeFeatures::from_le_bytes(id_to_feature_flags(3)), 0); add_channel(&gossip_sync, &secp_ctx, &privkeys[3], &privkeys[2], ChannelFeatures::from_le_bytes(id_to_feature_flags(3)), 3); - for (key, flags) in [(&privkeys[3], 0), (&privkeys[2], 3)] { + for (key, channel_flags) in [(&privkeys[3], 0), (&privkeys[2], 3)] { update_channel(&gossip_sync, &secp_ctx, key, UnsignedChannelUpdate { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 1, - flags, + message_flags: 1, // Only must_be_one + channel_flags, cltv_expiry_delta: (3 << 4) | 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6369,12 +6462,13 @@ mod tests { add_or_update_node(&gossip_sync, &secp_ctx, &privkeys[2], NodeFeatures::from_le_bytes(id_to_feature_flags(2)), 0); add_channel(&gossip_sync, &secp_ctx, &privkeys[2], &privkeys[4], ChannelFeatures::from_le_bytes(id_to_feature_flags(2)), 2); - for (key, flags) in [(&privkeys[2], 0), (&privkeys[4], 3)] { + for (key, channel_flags) in [(&privkeys[2], 0), (&privkeys[4], 3)] { update_channel(&gossip_sync, &secp_ctx, key, UnsignedChannelUpdate { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 1, - flags, + message_flags: 1, // Only must_be_one + channel_flags, cltv_expiry_delta: (2 << 4) | 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6385,12 +6479,13 @@ mod tests { } add_channel(&gossip_sync, &secp_ctx, &privkeys[4], &privkeys[6], ChannelFeatures::from_le_bytes(id_to_feature_flags(1)), 1); - for (key, flags) in [(&privkeys[4], 0), (&privkeys[6], 3)] { + for (key, channel_flags) in [(&privkeys[4], 0), (&privkeys[6], 3)] { update_channel(&gossip_sync, &secp_ctx, key, UnsignedChannelUpdate { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 1, - flags, + message_flags: 1, // Only must_be_one + channel_flags, cltv_expiry_delta: (1 << 4) | 0, htlc_minimum_msat: 100, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -6451,7 +6546,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 85_000, @@ -6464,7 +6560,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (4 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: 270_000, @@ -6522,7 +6619,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: 80_000, @@ -6534,7 +6632,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (4 << 4) | 1, htlc_minimum_msat: 90_000, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -7066,7 +7165,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (4 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: 250_000_000, @@ -7078,7 +7178,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (13 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: 250_000_000, @@ -7747,7 +7848,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 42, htlc_minimum_msat: 1_000, htlc_maximum_msat: 10_000_000, @@ -7759,7 +7861,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: 42, htlc_minimum_msat: 1_000, htlc_maximum_msat: 10_000_000, @@ -8174,7 +8277,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (6 << 4) | 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -8299,7 +8403,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 42, htlc_minimum_msat: 1_000, htlc_maximum_msat: 10_000_000, @@ -8311,7 +8416,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: 42, htlc_minimum_msat: 1_000, htlc_maximum_msat: 10_000_000, @@ -8326,7 +8432,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 42, htlc_minimum_msat: 1_000, htlc_maximum_msat: 10_000_000, @@ -8338,7 +8445,8 @@ mod tests { chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 2, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: 42, htlc_minimum_msat: 1_000, htlc_maximum_msat: 10_000_000, diff --git a/lightning/src/routing/scoring.rs b/lightning/src/routing/scoring.rs index 77e1a1306..85b347086 100644 --- a/lightning/src/routing/scoring.rs +++ b/lightning/src/routing/scoring.rs @@ -2264,7 +2264,7 @@ mod tests { fn update_channel( network_graph: &mut NetworkGraph<&TestLogger>, short_channel_id: u64, node_key: SecretKey, - flags: u8, htlc_maximum_msat: u64, timestamp: u32, + channel_flags: u8, htlc_maximum_msat: u64, timestamp: u32, ) { let genesis_hash = ChainHash::using_genesis_block(Network::Testnet); let secp_ctx = Secp256k1::new(); @@ -2272,7 +2272,8 @@ mod tests { chain_hash: genesis_hash, short_channel_id, timestamp, - flags, + message_flags: 1, // Only must_be_one + channel_flags, cltv_expiry_delta: 18, htlc_minimum_msat: 0, htlc_maximum_msat, diff --git a/lightning/src/routing/test_utils.rs b/lightning/src/routing/test_utils.rs index 6337adfb8..e10964994 100644 --- a/lightning/src/routing/test_utils.rs +++ b/lightning/src/routing/test_utils.rs @@ -155,7 +155,8 @@ pub(super) fn build_line_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: cur_short_channel_id, timestamp: idx as u32, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -167,7 +168,8 @@ pub(super) fn build_line_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: cur_short_channel_id, timestamp: (idx as u32)+1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -260,7 +262,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 1, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -276,7 +279,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (5 << 4) | 3, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -288,7 +292,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 2, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -304,7 +309,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (5 << 4) | 3, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -316,7 +322,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 12, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -332,7 +339,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (3 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -344,7 +352,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 3, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: (3 << 4) | 2, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -358,7 +367,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (4 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -370,7 +380,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 4, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: (4 << 4) | 2, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -384,7 +395,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (13 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -396,7 +408,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 13, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: (13 << 4) | 2, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -412,7 +425,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (6 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -424,7 +438,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 6, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: (6 << 4) | 2, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -438,7 +453,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 11, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (11 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -450,7 +466,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 11, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: (11 << 4) | 2, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -468,7 +485,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 1, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: (7 << 4) | 1, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, @@ -480,7 +498,8 @@ pub(super) fn build_graph() -> ( chain_hash: ChainHash::using_genesis_block(Network::Testnet), short_channel_id: 7, timestamp: 1, - flags: 1, + message_flags: 1, // Only must_be_one + channel_flags: 1, cltv_expiry_delta: (7 << 4) | 2, htlc_minimum_msat: 0, htlc_maximum_msat: MAX_VALUE_MSAT, diff --git a/lightning/src/routing/utxo.rs b/lightning/src/routing/utxo.rs index b4b8bf514..225475120 100644 --- a/lightning/src/routing/utxo.rs +++ b/lightning/src/routing/utxo.rs @@ -319,7 +319,7 @@ impl PendingChecks { ) -> Result<(), LightningError> { let mut pending_checks = self.internal.lock().unwrap(); if let hash_map::Entry::Occupied(e) = pending_checks.channels.entry(msg.short_channel_id) { - let is_from_a = (msg.flags & 1) == 1; + let is_from_a = (msg.channel_flags & 1) == 1; match Weak::upgrade(e.get()) { Some(msgs_ref) => { let mut messages = msgs_ref.lock().unwrap(); @@ -595,10 +595,10 @@ mod tests { let node_b_announce = get_signed_node_announcement(|_| {}, node_2_privkey, &secp_ctx); // Note that we have to set the "direction" flag correctly on both messages - let chan_update_a = get_signed_channel_update(|msg| msg.flags = 0, node_1_privkey, &secp_ctx); - let chan_update_b = get_signed_channel_update(|msg| msg.flags = 1, node_2_privkey, &secp_ctx); + let chan_update_a = get_signed_channel_update(|msg| msg.channel_flags = 0, node_1_privkey, &secp_ctx); + let chan_update_b = get_signed_channel_update(|msg| msg.channel_flags = 1, node_2_privkey, &secp_ctx); let chan_update_c = get_signed_channel_update(|msg| { - msg.flags = 1; msg.timestamp += 1; }, node_2_privkey, &secp_ctx); + msg.channel_flags = 1; msg.timestamp += 1; }, node_2_privkey, &secp_ctx); (valid_announcement, chain_source, network_graph, good_script, node_a_announce, node_b_announce, chan_update_a, chan_update_b, chan_update_c) diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs index 4d17f8fd1..22df8ec31 100644 --- a/lightning/src/util/test_utils.rs +++ b/lightning/src/util/test_utils.rs @@ -967,7 +967,8 @@ fn get_dummy_channel_update(short_chan_id: u64) -> msgs::ChannelUpdate { chain_hash: ChainHash::using_genesis_block(network), short_channel_id: short_chan_id, timestamp: 0, - flags: 0, + message_flags: 1, // Only must_be_one + channel_flags: 0, cltv_expiry_delta: 0, htlc_minimum_msat: 0, htlc_maximum_msat: msgs::MAX_VALUE_MSAT, -- 2.39.5