X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fmsgs.rs;h=61e18648a58878877596649d17b7f52450a90d70;hb=fe25bbb44ea879e6b84e0cd6f62fd53058d77417;hp=747107c08221c41b04a5283a91804031d981325f;hpb=5d9dddd1f6cdded2c8281f91c916ac1d3ce01f21;p=rust-lightning

diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
index 747107c0..61e18648 100644
--- a/lightning/src/ln/msgs.rs
+++ b/lightning/src/ln/msgs.rs
@@ -12,12 +12,12 @@
 //! For a normal node you probably don't need to use anything here, however, if you wish to split a
 //! node into an internet-facing route/message socket handling daemon and a separate daemon (or
 //! server entirely) which handles only channel-related messages you may wish to implement
-//! ChannelMessageHandler yourself and use it to re-serialize messages and pass them across
+//! [`ChannelMessageHandler`] yourself and use it to re-serialize messages and pass them across
 //! daemons/servers.
 //!
 //! Note that if you go with such an architecture (instead of passing raw socket events to a
 //! non-internet-facing system) you trust the frontend internet-facing system to not lie about the
-//! source node_id of the message, however this does allow you to significantly reduce bandwidth
+//! source `node_id` of the message, however this does allow you to significantly reduce bandwidth
 //! between the systems as routing messages can represent a significant chunk of bandwidth usage
 //! (especially for non-channel-publicly-announcing nodes). As an alternate design which avoids
 //! this issue, if you have sufficient bidirectional bandwidth between your systems, you may send
@@ -30,62 +30,77 @@ use bitcoin::secp256k1;
 use bitcoin::blockdata::script::Script;
 use bitcoin::hash_types::{Txid, BlockHash};
 
-use ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
-use ln::onion_utils;
-use onion_message;
+use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
+use crate::ln::onion_utils;
+use crate::onion_message;
 
-use prelude::*;
+use crate::prelude::*;
 use core::fmt;
 use core::fmt::Debug;
-use io::{self, Read};
-use io_extras::read_to_end;
+use crate::io::{self, Read};
+use crate::io_extras::read_to_end;
 
-use util::events::{MessageSendEventsProvider, OnionMessageProvider};
-use util::logger;
-use util::ser::{BigSize, LengthReadable, Readable, ReadableArgs, Writeable, Writer, FixedLengthReader, HighZeroBytesDroppedBigSize, Hostname};
+use crate::events::{MessageSendEventsProvider, OnionMessageProvider};
+use crate::util::logger;
+use crate::util::ser::{LengthReadable, Readable, ReadableArgs, Writeable, Writer, FixedLengthReader, HighZeroBytesDroppedBigSize, Hostname};
 
-use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
+use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
+
+use crate::routing::gossip::NodeId;
 
 /// 21 million * 10^8 * 1000
 pub(crate) const MAX_VALUE_MSAT: u64 = 21_000_000_0000_0000_000;
 
+#[cfg(taproot)]
+/// A partial signature that also contains the Musig2 nonce its signer used
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PartialSignatureWithNonce(pub musig2::types::PartialSignature, pub musig2::types::PublicNonce);
+
 /// An error in decoding a message or struct.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum DecodeError {
 	/// A version byte specified something we don't know how to handle.
-	/// Includes unknown realm byte in an OnionHopData packet
+	///
+	/// Includes unknown realm byte in an onion hop data packet.
 	UnknownVersion,
-	/// Unknown feature mandating we fail to parse message (eg TLV with an even, unknown type)
+	/// Unknown feature mandating we fail to parse message (e.g., TLV with an even, unknown type)
 	UnknownRequiredFeature,
-	/// Value was invalid, eg a byte which was supposed to be a bool was something other than a 0
+	/// Value was invalid.
+	///
+	/// For example, a byte which was supposed to be a bool was something other than a 0
 	/// or 1, a public key/private key/signature was invalid, text wasn't UTF-8, TLV was
-	/// syntactically incorrect, etc
+	/// syntactically incorrect, etc.
 	InvalidValue,
-	/// Buffer too short
+	/// The buffer to be read was too short.
 	ShortRead,
-	/// A length descriptor in the packet didn't describe the later data correctly
+	/// A length descriptor in the packet didn't describe the later data correctly.
 	BadLengthDescriptor,
-	/// Error from std::io
-	Io(/// (C-not exported) as ErrorKind doesn't have a reasonable mapping
-        io::ErrorKind),
+	/// Error from [`std::io`].
+	Io(io::ErrorKind),
 	/// The message included zlib-compressed values, which we don't support.
 	UnsupportedCompression,
 }
 
-/// An init message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`init`] message to be sent to or received from a peer.
+///
+/// [`init`]: https://github.com/lightning/bolts/blob/master/01-messaging.md#the-init-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Init {
-	/// The relevant features which the sender supports
+	/// The relevant features which the sender supports.
 	pub features: InitFeatures,
-	/// The receipient's network address. This adds the option to report a remote IP address
-	/// back to a connecting peer using the init message. A node can decide to use that information
-	/// to discover a potential update to its public IPv4 address (NAT) and use
-	/// that for a node_announcement update message containing the new address.
+	/// The receipient's network address.
+	///
+	/// This adds the option to report a remote IP address back to a connecting peer using the init
+	/// message. A node can decide to use that information to discover a potential update to its
+	/// public IPv4 address (NAT) and use that for a [`NodeAnnouncement`] update message containing
+	/// the new address.
 	pub remote_network_address: Option<NetAddress>,
 }
 
-/// An error message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`error`] message to be sent to or received from a peer.
+///
+/// [`error`]: https://github.com/lightning/bolts/blob/master/01-messaging.md#the-error-and-warning-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ErrorMessage {
 	/// The channel ID involved in the error.
 	///
@@ -93,46 +108,58 @@ pub struct ErrorMessage {
 	/// with the sending peer should be closed.
 	pub channel_id: [u8; 32],
 	/// A possibly human-readable error description.
-	/// The string should be sanitized before it is used (e.g. emitted to logs or printed to
-	/// stdout). Otherwise, a well crafted error message may trigger a security vulnerability in
+	///
+	/// The string should be sanitized before it is used (e.g., emitted to logs or printed to
+	/// `stdout`). Otherwise, a well crafted error message may trigger a security vulnerability in
 	/// the terminal emulator or the logging subsystem.
 	pub data: String,
 }
 
-/// A warning message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`warning`] message to be sent to or received from a peer.
+///
+/// [`warning`]: https://github.com/lightning/bolts/blob/master/01-messaging.md#the-error-and-warning-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct WarningMessage {
 	/// The channel ID involved in the warning.
 	///
 	/// All-0s indicates a warning unrelated to a specific channel.
 	pub channel_id: [u8; 32],
 	/// A possibly human-readable warning description.
+	///
 	/// The string should be sanitized before it is used (e.g. emitted to logs or printed to
 	/// stdout). Otherwise, a well crafted error message may trigger a security vulnerability in
 	/// the terminal emulator or the logging subsystem.
 	pub data: String,
 }
 
-/// A ping message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`ping`] message to be sent to or received from a peer.
+///
+/// [`ping`]: https://github.com/lightning/bolts/blob/master/01-messaging.md#the-ping-and-pong-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Ping {
-	/// The desired response length
+	/// The desired response length.
 	pub ponglen: u16,
 	/// The ping packet size.
+	///
 	/// This field is not sent on the wire. byteslen zeros are sent.
 	pub byteslen: u16,
 }
 
-/// A pong message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`pong`] message to be sent to or received from a peer.
+///
+/// [`pong`]: https://github.com/lightning/bolts/blob/master/01-messaging.md#the-ping-and-pong-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Pong {
 	/// The pong packet size.
+	///
 	/// This field is not sent on the wire. byteslen zeros are sent.
 	pub byteslen: u16,
 }
 
-/// An open_channel message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`open_channel`] message to be sent to or received from a peer.
+///
+/// [`open_channel`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct OpenChannel {
 	/// The genesis hash of the blockchain where the channel is to be opened
 	pub chain_hash: BlockHash,
@@ -150,9 +177,11 @@ pub struct OpenChannel {
 	pub channel_reserve_satoshis: u64,
 	/// The minimum HTLC size incoming to sender, in milli-satoshi
 	pub htlc_minimum_msat: u64,
-	/// The feerate per 1000-weight of sender generated transactions, until updated by update_fee
+	/// The feerate per 1000-weight of sender generated transactions, until updated by
+	/// [`UpdateFee`]
 	pub feerate_per_kw: u32,
-	/// The number of blocks which the counterparty will have to wait to claim on-chain funds if they broadcast a commitment transaction
+	/// The number of blocks which the counterparty will have to wait to claim on-chain funds if
+	/// they broadcast a commitment transaction
 	pub to_self_delay: u16,
 	/// The maximum number of inbound HTLCs towards sender
 	pub max_accepted_htlcs: u16,
@@ -168,18 +197,21 @@ pub struct OpenChannel {
 	pub htlc_basepoint: PublicKey,
 	/// The first to-be-broadcast-by-sender transaction's per commitment point
 	pub first_per_commitment_point: PublicKey,
-	/// Channel flags
+	/// The channel flags to be used
 	pub channel_flags: u8,
-	/// Optionally, a request to pre-set the to-sender output's scriptPubkey for when we collaboratively close
+	/// Optionally, a request to pre-set the to-sender output's `scriptPubkey` for when we collaboratively close
 	pub shutdown_scriptpubkey: OptionalField<Script>,
-	/// The channel type that this channel will represent. If none is set, we derive the channel
-	/// type from the intersection of our feature bits with our counterparty's feature bits from
-	/// the Init message.
+	/// The channel type that this channel will represent
+	///
+	/// If this is `None`, we derive the channel type from the intersection of our
+	/// feature bits with our counterparty's feature bits from the [`Init`] message.
 	pub channel_type: Option<ChannelTypeFeatures>,
 }
 
-/// An accept_channel message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`accept_channel`] message to be sent to or received from a peer.
+///
+/// [`accept_channel`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-accept_channel-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct AcceptChannel {
 	/// A temporary channel ID, until the funding outpoint is announced
 	pub temporary_channel_id: [u8; 32],
@@ -211,16 +243,21 @@ pub struct AcceptChannel {
 	pub first_per_commitment_point: PublicKey,
 	/// Optionally, a request to pre-set the to-sender output's scriptPubkey for when we collaboratively close
 	pub shutdown_scriptpubkey: OptionalField<Script>,
-	/// The channel type that this channel will represent. If none is set, we derive the channel
-	/// type from the intersection of our feature bits with our counterparty's feature bits from
-	/// the Init message.
+	/// The channel type that this channel will represent.
 	///
+	/// If this is `None`, we derive the channel type from the intersection of
+	/// our feature bits with our counterparty's feature bits from the [`Init`] message.
 	/// This is required to match the equivalent field in [`OpenChannel::channel_type`].
 	pub channel_type: Option<ChannelTypeFeatures>,
+	#[cfg(taproot)]
+	/// Next nonce the channel initiator should use to create a funding output signature against
+	pub next_local_nonce: Option<musig2::types::PublicNonce>,
 }
 
-/// A funding_created message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`funding_created`] message to be sent to or received from a peer.
+///
+/// [`funding_created`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-funding_created-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct FundingCreated {
 	/// A temporary channel ID, until the funding is established
 	pub temporary_channel_id: [u8; 32],
@@ -230,43 +267,62 @@ pub struct FundingCreated {
 	pub funding_output_index: u16,
 	/// The signature of the channel initiator (funder) on the initial commitment transaction
 	pub signature: Signature,
+	#[cfg(taproot)]
+	/// The partial signature of the channel initiator (funder)
+	pub partial_signature_with_nonce: Option<PartialSignatureWithNonce>,
+	#[cfg(taproot)]
+	/// Next nonce the channel acceptor should use to finalize the funding output signature
+	pub next_local_nonce: Option<musig2::types::PublicNonce>
 }
 
-/// A funding_signed message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`funding_signed`] message to be sent to or received from a peer.
+///
+/// [`funding_signed`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-funding_signed-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct FundingSigned {
 	/// The channel ID
 	pub channel_id: [u8; 32],
 	/// The signature of the channel acceptor (fundee) on the initial commitment transaction
 	pub signature: Signature,
+	#[cfg(taproot)]
+	/// The partial signature of the channel acceptor (fundee)
+	pub partial_signature_with_nonce: Option<PartialSignatureWithNonce>,
 }
 
-/// A channel_ready message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`channel_ready`] message to be sent to or received from a peer.
+///
+/// [`channel_ready`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-channel_ready-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ChannelReady {
 	/// The channel ID
 	pub channel_id: [u8; 32],
 	/// The per-commitment point of the second commitment transaction
 	pub next_per_commitment_point: PublicKey,
-	/// If set, provides a short_channel_id alias for this channel. The sender will accept payments
-	/// to be forwarded over this SCID and forward them to this messages' recipient.
+	/// If set, provides a `short_channel_id` alias for this channel.
+	///
+	/// The sender will accept payments to be forwarded over this SCID and forward them to this
+	/// messages' recipient.
 	pub short_channel_id_alias: Option<u64>,
 }
 
-/// A shutdown message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`shutdown`] message to be sent to or received from a peer.
+///
+/// [`shutdown`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#closing-initiation-shutdown
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Shutdown {
 	/// The channel ID
 	pub channel_id: [u8; 32],
 	/// The destination of this peer's funds on closing.
-	/// Must be in one of these forms: p2pkh, p2sh, p2wpkh, p2wsh.
+	///
+	/// Must be in one of these forms: P2PKH, P2SH, P2WPKH, P2WSH, P2TR.
 	pub scriptpubkey: Script,
 }
 
 /// The minimum and maximum fees which the sender is willing to place on the closing transaction.
+///
 /// This is provided in [`ClosingSigned`] by both sides to indicate the fee range they are willing
 /// to use.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ClosingSignedFeeRange {
 	/// The minimum absolute fee, in satoshis, which the sender is willing to place on the closing
 	/// transaction.
@@ -276,8 +332,10 @@ pub struct ClosingSignedFeeRange {
 	pub max_fee_satoshis: u64,
 }
 
-/// A closing_signed message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`closing_signed`] message to be sent to or received from a peer.
+///
+/// [`closing_signed`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#closing-negotiation-closing_signed
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ClosingSigned {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -290,8 +348,10 @@ pub struct ClosingSigned {
 	pub fee_range: Option<ClosingSignedFeeRange>,
 }
 
-/// An update_add_htlc message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`update_add_htlc`] message to be sent to or received from a peer.
+///
+/// [`update_add_htlc`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#adding-an-htlc-update_add_htlc
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UpdateAddHTLC {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -306,16 +366,20 @@ pub struct UpdateAddHTLC {
 	pub(crate) onion_routing_packet: OnionPacket,
 }
 
- /// An onion message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+ /// An onion message to be sent to or received from a peer.
+ ///
+ // TODO: update with link to OM when they are merged into the BOLTs
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct OnionMessage {
 	/// Used in decrypting the onion packet's payload.
 	pub blinding_point: PublicKey,
 	pub(crate) onion_routing_packet: onion_message::Packet,
 }
 
-/// An update_fulfill_htlc message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`update_fulfill_htlc`] message to be sent to or received from a peer.
+///
+/// [`update_fulfill_htlc`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#removing-an-htlc-update_fulfill_htlc-update_fail_htlc-and-update_fail_malformed_htlc
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UpdateFulfillHTLC {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -325,8 +389,10 @@ pub struct UpdateFulfillHTLC {
 	pub payment_preimage: PaymentPreimage,
 }
 
-/// An update_fail_htlc message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`update_fail_htlc`] message to be sent to or received from a peer.
+///
+/// [`update_fail_htlc`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#removing-an-htlc-update_fulfill_htlc-update_fail_htlc-and-update_fail_malformed_htlc
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UpdateFailHTLC {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -335,8 +401,10 @@ pub struct UpdateFailHTLC {
 	pub(crate) reason: OnionErrorPacket,
 }
 
-/// An update_fail_malformed_htlc message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`update_fail_malformed_htlc`] message to be sent to or received from a peer.
+///
+/// [`update_fail_malformed_htlc`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#removing-an-htlc-update_fulfill_htlc-update_fail_htlc-and-update_fail_malformed_htlc
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UpdateFailMalformedHTLC {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -347,8 +415,10 @@ pub struct UpdateFailMalformedHTLC {
 	pub failure_code: u16,
 }
 
-/// A commitment_signed message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`commitment_signed`] message to be sent to or received from a peer.
+///
+/// [`commitment_signed`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#committing-updates-so-far-commitment_signed
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CommitmentSigned {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -356,10 +426,15 @@ pub struct CommitmentSigned {
 	pub signature: Signature,
 	/// Signatures on the HTLC transactions
 	pub htlc_signatures: Vec<Signature>,
+	#[cfg(taproot)]
+	/// The partial Taproot signature on the commitment transaction
+	pub partial_signature_with_nonce: Option<PartialSignatureWithNonce>,
 }
 
-/// A revoke_and_ack message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`revoke_and_ack`] message to be sent to or received from a peer.
+///
+/// [`revoke_and_ack`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#completing-the-transition-to-the-updated-state-revoke_and_ack
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct RevokeAndACK {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -369,8 +444,10 @@ pub struct RevokeAndACK {
 	pub next_per_commitment_point: PublicKey,
 }
 
-/// An update_fee message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`update_fee`] message to be sent to or received from a peer
+///
+/// [`update_fee`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#updating-fees-update_fee
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UpdateFee {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -378,10 +455,11 @@ pub struct UpdateFee {
 	pub feerate_per_kw: u32,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 /// Proof that the sender knows the per-commitment secret of the previous commitment transaction.
+///
 /// This is used to convince the recipient that the channel is at a certain commitment
-/// number even if they lost that data due to a local failure.  Of course, the peer may lie
+/// number even if they lost that data due to a local failure. Of course, the peer may lie
 /// and even later commitments may have been revoked.
 pub struct DataLossProtect {
 	/// Proof that the sender knows the per-commitment secret of a specific commitment transaction
@@ -391,8 +469,10 @@ pub struct DataLossProtect {
 	pub my_current_per_commitment_point: PublicKey,
 }
 
-/// A channel_reestablish message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`channel_reestablish`] message to be sent to or received from a peer.
+///
+/// [`channel_reestablish`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#message-retransmission
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ChannelReestablish {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -404,8 +484,10 @@ pub struct ChannelReestablish {
 	pub data_loss_protect: OptionalField<DataLossProtect>,
 }
 
-/// An announcement_signatures message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// An [`announcement_signatures`] message to be sent to or received from a peer.
+///
+/// [`announcement_signatures`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-announcement_signatures-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct AnnouncementSignatures {
 	/// The channel ID
 	pub channel_id: [u8; 32],
@@ -417,8 +499,8 @@ pub struct AnnouncementSignatures {
 	pub bitcoin_signature: Signature,
 }
 
-/// An address which can be used to connect to a remote peer
-#[derive(Clone, Debug, PartialEq)]
+/// An address which can be used to connect to a remote peer.
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum NetAddress {
 	/// An IPv4 address/port on which the peer is listening.
 	IPv4 {
@@ -440,7 +522,8 @@ pub enum NetAddress {
 	/// addresses. Thus, the details are not parsed here.
 	OnionV2([u8; 12]),
 	/// A new-style Tor onion address/port on which the peer is listening.
-	/// To create the human-readable "hostname", concatenate ed25519_pubkey, checksum, and version,
+	///
+	/// To create the human-readable "hostname", concatenate the ED25519 pubkey, checksum, and version,
 	/// wrap as base32 and append ".onion".
 	OnionV3 {
 		/// The ed25519 long-term public key of the peer
@@ -461,7 +544,7 @@ pub enum NetAddress {
 	},
 }
 impl NetAddress {
-	/// Gets the ID of this address type. Addresses in node_announcement messages should be sorted
+	/// Gets the ID of this address type. Addresses in [`NodeAnnouncement`] messages should be sorted
 	/// by this.
 	pub(crate) fn get_id(&self) -> u8 {
 		match self {
@@ -571,29 +654,53 @@ impl Readable for NetAddress {
 	}
 }
 
+/// Represents the set of gossip messages that require a signature from a node's identity key.
+pub enum UnsignedGossipMessage<'a> {
+	/// An unsigned channel announcement.
+	ChannelAnnouncement(&'a UnsignedChannelAnnouncement),
+	/// An unsigned channel update.
+	ChannelUpdate(&'a UnsignedChannelUpdate),
+	/// An unsigned node announcement.
+	NodeAnnouncement(&'a UnsignedNodeAnnouncement)
+}
 
-/// The unsigned part of a node_announcement
-#[derive(Clone, Debug, PartialEq)]
+impl<'a> Writeable for UnsignedGossipMessage<'a> {
+	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
+		match self {
+			UnsignedGossipMessage::ChannelAnnouncement(ref msg) => msg.write(writer),
+			UnsignedGossipMessage::ChannelUpdate(ref msg) => msg.write(writer),
+			UnsignedGossipMessage::NodeAnnouncement(ref msg) => msg.write(writer),
+		}
+	}
+}
+
+/// The unsigned part of a [`node_announcement`] message.
+///
+/// [`node_announcement`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-node_announcement-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UnsignedNodeAnnouncement {
 	/// The advertised features
 	pub features: NodeFeatures,
 	/// A strictly monotonic announcement counter, with gaps allowed
 	pub timestamp: u32,
-	/// The node_id this announcement originated from (don't rebroadcast the node_announcement back
+	/// The `node_id` this announcement originated from (don't rebroadcast the `node_announcement` back
 	/// to this node).
-	pub node_id: PublicKey,
+	pub node_id: NodeId,
 	/// An RGB color for UI purposes
 	pub rgb: [u8; 3],
-	/// An alias, for UI purposes.  This should be sanitized before use.  There is no guarantee
-	/// of uniqueness.
+	/// An alias, for UI purposes.
+	///
+	/// This should be sanitized before use. There is no guarantee of uniqueness.
 	pub alias: [u8; 32],
 	/// List of addresses on which this node is reachable
 	pub addresses: Vec<NetAddress>,
 	pub(crate) excess_address_data: Vec<u8>,
 	pub(crate) excess_data: Vec<u8>,
 }
-#[derive(Clone, Debug, PartialEq)]
-/// A node_announcement message to be sent or received from a peer
+#[derive(Clone, Debug, PartialEq, Eq)]
+/// A [`node_announcement`] message to be sent to or received from a peer.
+///
+/// [`node_announcement`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-node_announcement-message
 pub struct NodeAnnouncement {
 	/// The signature by the node key
 	pub signature: Signature,
@@ -601,8 +708,10 @@ pub struct NodeAnnouncement {
 	pub contents: UnsignedNodeAnnouncement,
 }
 
-/// The unsigned part of a channel_announcement
-#[derive(Clone, Debug, PartialEq)]
+/// The unsigned part of a [`channel_announcement`] message.
+///
+/// [`channel_announcement`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-channel_announcement-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UnsignedChannelAnnouncement {
 	/// The advertised channel features
 	pub features: ChannelFeatures,
@@ -610,18 +719,20 @@ pub struct UnsignedChannelAnnouncement {
 	pub chain_hash: BlockHash,
 	/// The short channel ID
 	pub short_channel_id: u64,
-	/// One of the two node_ids which are endpoints of this channel
-	pub node_id_1: PublicKey,
-	/// The other of the two node_ids which are endpoints of this channel
-	pub node_id_2: PublicKey,
+	/// One of the two `node_id`s which are endpoints of this channel
+	pub node_id_1: NodeId,
+	/// The other of the two `node_id`s which are endpoints of this channel
+	pub node_id_2: NodeId,
 	/// The funding key for the first node
-	pub bitcoin_key_1: PublicKey,
+	pub bitcoin_key_1: NodeId,
 	/// The funding key for the second node
-	pub bitcoin_key_2: PublicKey,
+	pub bitcoin_key_2: NodeId,
 	pub(crate) excess_data: Vec<u8>,
 }
-/// A channel_announcement message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`channel_announcement`] message to be sent to or received from a peer.
+///
+/// [`channel_announcement`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-channel_announcement-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ChannelAnnouncement {
 	/// Authentication of the announcement by the first public node
 	pub node_signature_1: Signature,
@@ -635,8 +746,10 @@ pub struct ChannelAnnouncement {
 	pub contents: UnsignedChannelAnnouncement,
 }
 
-/// The unsigned part of a channel_update
-#[derive(Clone, Debug, PartialEq)]
+/// The unsigned part of a [`channel_update`] message.
+///
+/// [`channel_update`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-channel_update-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct UnsignedChannelUpdate {
 	/// The genesis hash of the blockchain where the channel is to be opened
 	pub chain_hash: BlockHash,
@@ -648,28 +761,33 @@ pub struct UnsignedChannelUpdate {
 	pub 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
-	/// the outgoing HTLC's minimum cltv_expiry value -- so, if an incoming HTLC comes in with a
-	/// cltv_expiry of 100000, and the node we're forwarding to has a cltv_expiry_delta value of 10,
-	/// then we'll check that the outgoing HTLC's cltv_expiry value is at least 100010 before
+	/// then we need to fail the HTLC backwards. When forwarding an HTLC, `cltv_expiry_delta` determines
+	/// the outgoing HTLC's minimum `cltv_expiry` value -- so, if an incoming HTLC comes in with a
+	/// `cltv_expiry` of 100000, and the node we're forwarding to has a `cltv_expiry_delta` value of 10,
+	/// then we'll check that the outgoing HTLC's `cltv_expiry` value is at least 100010 before
 	/// forwarding. Note that the HTLC sender is the one who originally sets this value when
 	/// constructing the route.
 	pub cltv_expiry_delta: u16,
 	/// The minimum HTLC size incoming to sender, in milli-satoshi
 	pub htlc_minimum_msat: u64,
-	/// The maximum HTLC value incoming to sender, in milli-satoshi. Used to be optional.
+	/// The maximum HTLC value incoming to sender, in milli-satoshi.
+	///
+	/// This used to be optional.
 	pub htlc_maximum_msat: u64,
 	/// The base HTLC fee charged by sender, in milli-satoshi
 	pub fee_base_msat: u32,
 	/// The amount to fee multiplier, in micro-satoshi
 	pub fee_proportional_millionths: u32,
 	/// Excess data which was signed as a part of the message which we do not (yet) understand how
-	/// to decode. This is stored to ensure forward-compatibility as new fields are added to the
-	/// lightning gossip
+	/// to decode.
+	///
+	/// This is stored to ensure forward-compatibility as new fields are added to the lightning gossip protocol.
 	pub excess_data: Vec<u8>,
 }
-/// A channel_update message to be sent or received from a peer
-#[derive(Clone, Debug, PartialEq)]
+/// A [`channel_update`] message to be sent to or received from a peer.
+///
+/// [`channel_update`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-channel_update-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ChannelUpdate {
 	/// A signature of the channel update
 	pub signature: Signature,
@@ -677,11 +795,13 @@ pub struct ChannelUpdate {
 	pub contents: UnsignedChannelUpdate,
 }
 
-/// A query_channel_range message is used to query a peer for channel
+/// A [`query_channel_range`] message is used to query a peer for channel
 /// UTXOs in a range of blocks. The recipient of a query makes a best
-/// effort to reply to the query using one or more reply_channel_range
+/// effort to reply to the query using one or more [`ReplyChannelRange`]
 /// messages.
-#[derive(Clone, Debug, PartialEq)]
+///
+/// [`query_channel_range`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-query_channel_range-and-reply_channel_range-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct QueryChannelRange {
 	/// The genesis hash of the blockchain being queried
 	pub chain_hash: BlockHash,
@@ -691,14 +811,18 @@ pub struct QueryChannelRange {
 	pub number_of_blocks: u32,
 }
 
-/// A reply_channel_range message is a reply to a query_channel_range
-/// message. Multiple reply_channel_range messages can be sent in reply
-/// to a single query_channel_range message. The query recipient makes a
+/// A [`reply_channel_range`] message is a reply to a [`QueryChannelRange`]
+/// message.
+///
+/// Multiple `reply_channel_range` messages can be sent in reply
+/// to a single [`QueryChannelRange`] message. The query recipient makes a
 /// best effort to respond based on their local network view which may
-/// not be a perfect view of the network. The short_channel_ids in the
-/// reply are encoded. We only support encoding_type=0 uncompressed
-/// serialization and do not support encoding_type=1 zlib serialization.
-#[derive(Clone, Debug, PartialEq)]
+/// not be a perfect view of the network. The `short_channel_id`s in the
+/// reply are encoded. We only support `encoding_type=0` uncompressed
+/// serialization and do not support `encoding_type=1` zlib serialization.
+///
+/// [`reply_channel_range`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-query_channel_range-and-reply_channel_range-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ReplyChannelRange {
 	/// The genesis hash of the blockchain being queried
 	pub chain_hash: BlockHash,
@@ -708,19 +832,22 @@ pub struct ReplyChannelRange {
 	pub number_of_blocks: u32,
 	/// True when this is the final reply for a query
 	pub sync_complete: bool,
-	/// The short_channel_ids in the channel range
+	/// The `short_channel_id`s in the channel range
 	pub short_channel_ids: Vec<u64>,
 }
 
-/// A query_short_channel_ids message is used to query a peer for
-/// routing gossip messages related to one or more short_channel_ids.
+/// A [`query_short_channel_ids`] message is used to query a peer for
+/// routing gossip messages related to one or more `short_channel_id`s.
+///
 /// The query recipient will reply with the latest, if available,
-/// channel_announcement, channel_update and node_announcement messages
-/// it maintains for the requested short_channel_ids followed by a
-/// reply_short_channel_ids_end message. The short_channel_ids sent in
-/// this query are encoded. We only support encoding_type=0 uncompressed
-/// serialization and do not support encoding_type=1 zlib serialization.
-#[derive(Clone, Debug, PartialEq)]
+/// [`ChannelAnnouncement`], [`ChannelUpdate`] and [`NodeAnnouncement`] messages
+/// it maintains for the requested `short_channel_id`s followed by a
+/// [`ReplyShortChannelIdsEnd`] message. The `short_channel_id`s sent in
+/// this query are encoded. We only support `encoding_type=0` uncompressed
+/// serialization and do not support `encoding_type=1` zlib serialization.
+///
+/// [`query_short_channel_ids`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-query_short_channel_idsreply_short_channel_ids_end-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct QueryShortChannelIds {
 	/// The genesis hash of the blockchain being queried
 	pub chain_hash: BlockHash,
@@ -728,23 +855,27 @@ pub struct QueryShortChannelIds {
 	pub short_channel_ids: Vec<u64>,
 }
 
-/// A reply_short_channel_ids_end message is sent as a reply to a
-/// query_short_channel_ids message. The query recipient makes a best
+/// A [`reply_short_channel_ids_end`] message is sent as a reply to a
+/// message. The query recipient makes a best
 /// effort to respond based on their local network view which may not be
 /// a perfect view of the network.
-#[derive(Clone, Debug, PartialEq)]
+///
+/// [`reply_short_channel_ids_end`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-query_short_channel_idsreply_short_channel_ids_end-messages
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ReplyShortChannelIdsEnd {
 	/// The genesis hash of the blockchain that was queried
 	pub chain_hash: BlockHash,
 	/// Indicates if the query recipient maintains up-to-date channel
-	/// information for the chain_hash
+	/// information for the `chain_hash`
 	pub full_information: bool,
 }
 
-/// A gossip_timestamp_filter message is used by a node to request
+/// A [`gossip_timestamp_filter`] message is used by a node to request
 /// gossip relay for messages in the requested time range when the
-/// gossip_queries feature has been negotiated.
-#[derive(Clone, Debug, PartialEq)]
+/// `gossip_queries` feature has been negotiated.
+///
+/// [`gossip_timestamp_filter`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#the-gossip_timestamp_filter-message
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct GossipTimestampFilter {
 	/// The genesis hash of the blockchain for channel and node information
 	pub chain_hash: BlockHash,
@@ -755,12 +886,14 @@ pub struct GossipTimestampFilter {
 }
 
 /// Encoding type for data compression of collections in gossip queries.
-/// We do not support encoding_type=1 zlib serialization defined in BOLT #7.
+///
+/// We do not support `encoding_type=1` zlib serialization [defined in BOLT
+/// #7](https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#query-messages).
 enum EncodingType {
 	Uncompressed = 0x00,
 }
 
-/// Used to put an error message in a LightningError
+/// Used to put an error message in a [`LightningError`].
 #[derive(Clone, Debug)]
 pub enum ErrorAction {
 	/// The peer took some action which made us think they were useless. Disconnect them.
@@ -803,30 +936,31 @@ pub struct LightningError {
 	pub action: ErrorAction,
 }
 
-/// Struct used to return values from revoke_and_ack messages, containing a bunch of commitment
+/// Struct used to return values from [`RevokeAndACK`] messages, containing a bunch of commitment
 /// transaction updates if they were pending.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CommitmentUpdate {
-	/// update_add_htlc messages which should be sent
+	/// `update_add_htlc` messages which should be sent
 	pub update_add_htlcs: Vec<UpdateAddHTLC>,
-	/// update_fulfill_htlc messages which should be sent
+	/// `update_fulfill_htlc` messages which should be sent
 	pub update_fulfill_htlcs: Vec<UpdateFulfillHTLC>,
-	/// update_fail_htlc messages which should be sent
+	/// `update_fail_htlc` messages which should be sent
 	pub update_fail_htlcs: Vec<UpdateFailHTLC>,
-	/// update_fail_malformed_htlc messages which should be sent
+	/// `update_fail_malformed_htlc` messages which should be sent
 	pub update_fail_malformed_htlcs: Vec<UpdateFailMalformedHTLC>,
-	/// An update_fee message which should be sent
+	/// An `update_fee` message which should be sent
 	pub update_fee: Option<UpdateFee>,
-	/// Finally, the commitment_signed message which should be sent
+	/// A `commitment_signed` message which should be sent
 	pub commitment_signed: CommitmentSigned,
 }
 
 /// Messages could have optional fields to use with extended features
-/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
-/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
+/// As we wish to serialize these differently from `Option<T>`s (`Options` get a tag byte, but
+/// [`OptionalField`] simply gets `Present` if there are enough bytes to read into it), we have a
 /// separate enum type for them.
-/// (C-not exported) due to a free generic in T
-#[derive(Clone, Debug, PartialEq)]
+///
+/// This is not exported to bindings users due to a free generic in `T`
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum OptionalField<T> {
 	/// Optional field is included in message
 	Present(T),
@@ -836,65 +970,66 @@ pub enum OptionalField<T> {
 
 /// A trait to describe an object which can receive channel messages.
 ///
-/// Messages MAY be called in parallel when they originate from different their_node_ids, however
-/// they MUST NOT be called in parallel when the two calls have the same their_node_id.
+/// Messages MAY be called in parallel when they originate from different `their_node_ids`, however
+/// they MUST NOT be called in parallel when the two calls have the same `their_node_id`.
 pub trait ChannelMessageHandler : MessageSendEventsProvider {
-	//Channel init:
-	/// Handle an incoming open_channel message from the given peer.
-	fn handle_open_channel(&self, their_node_id: &PublicKey, their_features: InitFeatures, msg: &OpenChannel);
-	/// Handle an incoming accept_channel message from the given peer.
-	fn handle_accept_channel(&self, their_node_id: &PublicKey, their_features: InitFeatures, msg: &AcceptChannel);
-	/// Handle an incoming funding_created message from the given peer.
+	// Channel init:
+	/// Handle an incoming `open_channel` message from the given peer.
+	fn handle_open_channel(&self, their_node_id: &PublicKey, msg: &OpenChannel);
+	/// Handle an incoming `accept_channel` message from the given peer.
+	fn handle_accept_channel(&self, their_node_id: &PublicKey, msg: &AcceptChannel);
+	/// Handle an incoming `funding_created` message from the given peer.
 	fn handle_funding_created(&self, their_node_id: &PublicKey, msg: &FundingCreated);
-	/// Handle an incoming funding_signed message from the given peer.
+	/// Handle an incoming `funding_signed` message from the given peer.
 	fn handle_funding_signed(&self, their_node_id: &PublicKey, msg: &FundingSigned);
-	/// Handle an incoming channel_ready message from the given peer.
+	/// Handle an incoming `channel_ready` message from the given peer.
 	fn handle_channel_ready(&self, their_node_id: &PublicKey, msg: &ChannelReady);
 
 	// Channl close:
-	/// Handle an incoming shutdown message from the given peer.
-	fn handle_shutdown(&self, their_node_id: &PublicKey, their_features: &InitFeatures, msg: &Shutdown);
-	/// Handle an incoming closing_signed message from the given peer.
+	/// Handle an incoming `shutdown` message from the given peer.
+	fn handle_shutdown(&self, their_node_id: &PublicKey, msg: &Shutdown);
+	/// Handle an incoming `closing_signed` message from the given peer.
 	fn handle_closing_signed(&self, their_node_id: &PublicKey, msg: &ClosingSigned);
 
 	// HTLC handling:
-	/// Handle an incoming update_add_htlc message from the given peer.
+	/// Handle an incoming `update_add_htlc` message from the given peer.
 	fn handle_update_add_htlc(&self, their_node_id: &PublicKey, msg: &UpdateAddHTLC);
-	/// Handle an incoming update_fulfill_htlc message from the given peer.
+	/// Handle an incoming `update_fulfill_htlc` message from the given peer.
 	fn handle_update_fulfill_htlc(&self, their_node_id: &PublicKey, msg: &UpdateFulfillHTLC);
-	/// Handle an incoming update_fail_htlc message from the given peer.
+	/// Handle an incoming `update_fail_htlc` message from the given peer.
 	fn handle_update_fail_htlc(&self, their_node_id: &PublicKey, msg: &UpdateFailHTLC);
-	/// Handle an incoming update_fail_malformed_htlc message from the given peer.
+	/// Handle an incoming `update_fail_malformed_htlc` message from the given peer.
 	fn handle_update_fail_malformed_htlc(&self, their_node_id: &PublicKey, msg: &UpdateFailMalformedHTLC);
-	/// Handle an incoming commitment_signed message from the given peer.
+	/// Handle an incoming `commitment_signed` message from the given peer.
 	fn handle_commitment_signed(&self, their_node_id: &PublicKey, msg: &CommitmentSigned);
-	/// Handle an incoming revoke_and_ack message from the given peer.
+	/// Handle an incoming `revoke_and_ack` message from the given peer.
 	fn handle_revoke_and_ack(&self, their_node_id: &PublicKey, msg: &RevokeAndACK);
 
-	/// Handle an incoming update_fee message from the given peer.
+	/// Handle an incoming `update_fee` message from the given peer.
 	fn handle_update_fee(&self, their_node_id: &PublicKey, msg: &UpdateFee);
 
 	// Channel-to-announce:
-	/// Handle an incoming announcement_signatures message from the given peer.
+	/// Handle an incoming `announcement_signatures` message from the given peer.
 	fn handle_announcement_signatures(&self, their_node_id: &PublicKey, msg: &AnnouncementSignatures);
 
 	// Connection loss/reestablish:
-	/// Indicates a connection to the peer failed/an existing connection was lost. If no connection
-	/// is believed to be possible in the future (eg they're sending us messages we don't
-	/// understand or indicate they require unknown feature bits), no_connection_possible is set
-	/// and any outstanding channels should be failed.
-	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);
-
-	/// Handle a peer reconnecting, possibly generating channel_reestablish message(s).
-	fn peer_connected(&self, their_node_id: &PublicKey, msg: &Init);
-	/// Handle an incoming channel_reestablish message from the given peer.
+	/// Indicates a connection to the peer failed/an existing connection was lost.
+	fn peer_disconnected(&self, their_node_id: &PublicKey);
+
+	/// Handle a peer reconnecting, possibly generating `channel_reestablish` message(s).
+	///
+	/// May return an `Err(())` if the features the peer supports are not sufficient to communicate
+	/// with us. Implementors should be somewhat conservative about doing so, however, as other
+	/// message handlers may still wish to communicate with this peer.
+	fn peer_connected(&self, their_node_id: &PublicKey, msg: &Init, inbound: bool) -> Result<(), ()>;
+	/// Handle an incoming `channel_reestablish` message from the given peer.
 	fn handle_channel_reestablish(&self, their_node_id: &PublicKey, msg: &ChannelReestablish);
 
-	/// Handle an incoming channel update from the given peer.
+	/// Handle an incoming `channel_update` message from the given peer.
 	fn handle_channel_update(&self, their_node_id: &PublicKey, msg: &ChannelUpdate);
 
 	// Error:
-	/// Handle an incoming error message from the given peer.
+	/// Handle an incoming `error` message from the given peer.
 	fn handle_error(&self, their_node_id: &PublicKey, msg: &ErrorMessage);
 
 	// Handler information:
@@ -915,32 +1050,36 @@ pub trait ChannelMessageHandler : MessageSendEventsProvider {
 ///
 /// # Implementor DoS Warnings
 ///
-/// For `gossip_queries` messages there are potential DoS vectors when handling
-/// inbound queries. Implementors using an on-disk network graph should be aware of
+/// For messages enabled with the `gossip_queries` feature there are potential DoS vectors when
+/// handling inbound queries. Implementors using an on-disk network graph should be aware of
 /// repeated disk I/O for queries accessing different parts of the network graph.
 pub trait RoutingMessageHandler : MessageSendEventsProvider {
-	/// Handle an incoming node_announcement message, returning true if it should be forwarded on,
-	/// false or returning an Err otherwise.
+	/// Handle an incoming `node_announcement` message, returning `true` if it should be forwarded on,
+	/// `false` or returning an `Err` otherwise.
 	fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<bool, LightningError>;
-	/// Handle a channel_announcement message, returning true if it should be forwarded on, false
-	/// or returning an Err otherwise.
+	/// Handle a `channel_announcement` message, returning `true` if it should be forwarded on, `false`
+	/// or returning an `Err` otherwise.
 	fn handle_channel_announcement(&self, msg: &ChannelAnnouncement) -> Result<bool, LightningError>;
-	/// Handle an incoming channel_update message, returning true if it should be forwarded on,
-	/// false or returning an Err otherwise.
+	/// Handle an incoming `channel_update` message, returning true if it should be forwarded on,
+	/// `false` or returning an `Err` otherwise.
 	fn handle_channel_update(&self, msg: &ChannelUpdate) -> Result<bool, LightningError>;
 	/// Gets channel announcements and updates required to dump our routing table to a remote node,
-	/// starting at the short_channel_id indicated by starting_point and including announcements
+	/// starting at the `short_channel_id` indicated by `starting_point` and including announcements
 	/// for a single channel.
 	fn get_next_channel_announcement(&self, starting_point: u64) -> Option<(ChannelAnnouncement, Option<ChannelUpdate>, Option<ChannelUpdate>)>;
 	/// Gets a node announcement required to dump our routing table to a remote node, starting at
 	/// the node *after* the provided pubkey and including up to one announcement immediately
-	/// higher (as defined by <PublicKey as Ord>::cmp) than starting_point.
-	/// If None is provided for starting_point, we start at the first node.
-	fn get_next_node_announcement(&self, starting_point: Option<&PublicKey>) -> Option<NodeAnnouncement>;
+	/// higher (as defined by `<PublicKey as Ord>::cmp`) than `starting_point`.
+	/// If `None` is provided for `starting_point`, we start at the first node.
+	fn get_next_node_announcement(&self, starting_point: Option<&NodeId>) -> Option<NodeAnnouncement>;
 	/// Called when a connection is established with a peer. This can be used to
 	/// perform routing table synchronization using a strategy defined by the
 	/// implementor.
-	fn peer_connected(&self, their_node_id: &PublicKey, init: &Init);
+	///
+	/// May return an `Err(())` if the features the peer supports are not sufficient to communicate
+	/// with us. Implementors should be somewhat conservative about doing so, however, as other
+	/// message handlers may still wish to communicate with this peer.
+	fn peer_connected(&self, their_node_id: &PublicKey, init: &Init, inbound: bool) -> Result<(), ()>;
 	/// Handles the reply of a query we initiated to learn about channels
 	/// for a given range of blocks. We can expect to receive one or more
 	/// replies to a single query.
@@ -950,13 +1089,20 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
 	/// a node has completed its best effort to send us the pertaining routing
 	/// gossip messages.
 	fn handle_reply_short_channel_ids_end(&self, their_node_id: &PublicKey, msg: ReplyShortChannelIdsEnd) -> Result<(), LightningError>;
-	/// Handles when a peer asks us to send a list of short_channel_ids
+	/// Handles when a peer asks us to send a list of `short_channel_id`s
 	/// for the requested range of blocks.
 	fn handle_query_channel_range(&self, their_node_id: &PublicKey, msg: QueryChannelRange) -> Result<(), LightningError>;
 	/// Handles when a peer asks us to send routing gossip messages for a
-	/// list of short_channel_ids.
+	/// list of `short_channel_id`s.
 	fn handle_query_short_channel_ids(&self, their_node_id: &PublicKey, msg: QueryShortChannelIds) -> Result<(), LightningError>;
 
+	// Handler queueing status:
+	/// Indicates that there are a large number of [`ChannelAnnouncement`] (or other) messages
+	/// pending some async action. While there is no guarantee of the rate of future messages, the
+	/// caller should seek to reduce the rate of new gossip messages handled, especially
+	/// [`ChannelAnnouncement`]s.
+	fn processing_queue_high(&self) -> bool;
+
 	// Handler information:
 	/// Gets the node feature flags which this handler itself supports. All available handlers are
 	/// queried similarly and their feature flags are OR'd together to form the [`NodeFeatures`]
@@ -972,14 +1118,18 @@ pub trait RoutingMessageHandler : MessageSendEventsProvider {
 
 /// A trait to describe an object that can receive onion messages.
 pub trait OnionMessageHandler : OnionMessageProvider {
-	/// Handle an incoming onion_message message from the given peer.
+	/// Handle an incoming `onion_message` message from the given peer.
 	fn handle_onion_message(&self, peer_node_id: &PublicKey, msg: &OnionMessage);
 	/// Called when a connection is established with a peer. Can be used to track which peers
 	/// advertise onion message support and are online.
-	fn peer_connected(&self, their_node_id: &PublicKey, init: &Init);
+	///
+	/// May return an `Err(())` if the features the peer supports are not sufficient to communicate
+	/// with us. Implementors should be somewhat conservative about doing so, however, as other
+	/// message handlers may still wish to communicate with this peer.
+	fn peer_connected(&self, their_node_id: &PublicKey, init: &Init, inbound: bool) -> Result<(), ()>;
 	/// Indicates a connection to the peer failed/an existing connection was lost. Allows handlers to
 	/// drop and refuse to forward onion messages to this peer.
-	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);
+	fn peer_disconnected(&self, their_node_id: &PublicKey);
 
 	// Handler information:
 	/// Gets the node feature flags which this handler itself supports. All available handlers are
@@ -996,8 +1146,8 @@ pub trait OnionMessageHandler : OnionMessageProvider {
 }
 
 mod fuzzy_internal_msgs {
-	use prelude::*;
-	use ln::{PaymentPreimage, PaymentSecret};
+	use crate::prelude::*;
+	use crate::ln::{PaymentPreimage, PaymentSecret};
 
 	// These types aren't intended to be pub, but are exposed for direct fuzzing (as we deserialize
 	// them from untrusted input):
@@ -1010,9 +1160,6 @@ mod fuzzy_internal_msgs {
 	}
 
 	pub(crate) enum OnionHopDataFormat {
-		Legacy { // aka Realm-0
-			short_channel_id: u64,
-		},
 		NonFinalNode {
 			short_channel_id: u64,
 		},
@@ -1028,7 +1175,6 @@ mod fuzzy_internal_msgs {
 		/// Message serialization may panic if this value is more than 21 million Bitcoin.
 		pub(crate) amt_to_forward: u64,
 		pub(crate) outgoing_cltv_value: u32,
-		// 12 bytes of 0-padding for Legacy format
 	}
 
 	pub struct DecodedOnionErrorPacket {
@@ -1045,9 +1191,11 @@ pub(crate) use self::fuzzy_internal_msgs::*;
 #[derive(Clone)]
 pub(crate) struct OnionPacket {
 	pub(crate) version: u8,
-	/// In order to ensure we always return an error on Onion decode in compliance with BOLT 4, we
-	/// have to deserialize OnionPackets contained in UpdateAddHTLCs even if the ephemeral public
-	/// key (here) is bogus, so we hold a Result instead of a PublicKey as we'd like.
+	/// In order to ensure we always return an error on onion decode in compliance with [BOLT
+	/// #4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md), we have to
+	/// deserialize `OnionPacket`s contained in [`UpdateAddHTLC`] messages even if the ephemeral
+	/// public key (here) is bogus, so we hold a [`Result`] instead of a [`PublicKey`] as we'd
+	/// like.
 	pub(crate) public_key: Result<PublicKey, secp256k1::Error>,
 	pub(crate) hop_data: [u8; 20*65],
 	pub(crate) hmac: [u8; 32],
@@ -1065,6 +1213,7 @@ impl onion_utils::Packet for OnionPacket {
 	}
 }
 
+impl Eq for OnionPacket { }
 impl PartialEq for OnionPacket {
 	fn eq(&self, other: &OnionPacket) -> bool {
 		for (i, j) in self.hop_data.iter().zip(other.hop_data.iter()) {
@@ -1082,7 +1231,7 @@ impl fmt::Debug for OnionPacket {
 	}
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) struct OnionErrorPacket {
 	// This really should be a constant size slice, but the spec lets these things be up to 128KB?
 	// (TODO) We limit it in decode to much lower...
@@ -1159,7 +1308,28 @@ impl Readable for OptionalField<u64> {
 	}
 }
 
+#[cfg(not(taproot))]
+impl_writeable_msg!(AcceptChannel, {
+	temporary_channel_id,
+	dust_limit_satoshis,
+	max_htlc_value_in_flight_msat,
+	channel_reserve_satoshis,
+	htlc_minimum_msat,
+	minimum_depth,
+	to_self_delay,
+	max_accepted_htlcs,
+	funding_pubkey,
+	revocation_basepoint,
+	payment_point,
+	delayed_payment_basepoint,
+	htlc_basepoint,
+	first_per_commitment_point,
+	shutdown_scriptpubkey
+}, {
+	(1, channel_type, option),
+});
 
+#[cfg(taproot)]
 impl_writeable_msg!(AcceptChannel, {
 	temporary_channel_id,
 	dust_limit_satoshis,
@@ -1178,6 +1348,7 @@ impl_writeable_msg!(AcceptChannel, {
 	shutdown_scriptpubkey
 }, {
 	(1, channel_type, option),
+	(4, next_local_nonce, option),
 });
 
 impl_writeable_msg!(AnnouncementSignatures, {
@@ -1234,30 +1405,60 @@ impl_writeable!(ClosingSignedFeeRange, {
 	max_fee_satoshis
 });
 
+#[cfg(not(taproot))]
 impl_writeable_msg!(CommitmentSigned, {
 	channel_id,
 	signature,
 	htlc_signatures
 }, {});
 
+#[cfg(taproot)]
+impl_writeable_msg!(CommitmentSigned, {
+	channel_id,
+	signature,
+	htlc_signatures
+}, {
+	(2, partial_signature_with_nonce, option)
+});
+
 impl_writeable!(DecodedOnionErrorPacket, {
 	hmac,
 	failuremsg,
 	pad
 });
 
+#[cfg(not(taproot))]
 impl_writeable_msg!(FundingCreated, {
 	temporary_channel_id,
 	funding_txid,
 	funding_output_index,
 	signature
 }, {});
+#[cfg(taproot)]
+impl_writeable_msg!(FundingCreated, {
+	temporary_channel_id,
+	funding_txid,
+	funding_output_index,
+	signature
+}, {
+	(2, partial_signature_with_nonce, option),
+	(4, next_local_nonce, option)
+});
 
+#[cfg(not(taproot))]
 impl_writeable_msg!(FundingSigned, {
 	channel_id,
 	signature
 }, {});
 
+#[cfg(taproot)]
+impl_writeable_msg!(FundingSigned, {
+	channel_id,
+	signature
+}, {
+	(2, partial_signature_with_nonce, option)
+});
+
 impl_writeable_msg!(ChannelReady, {
 	channel_id,
 	next_per_commitment_point,
@@ -1440,22 +1641,15 @@ impl Readable for FinalOnionHopData {
 impl Writeable for OnionHopData {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		match self.format {
-			OnionHopDataFormat::Legacy { short_channel_id } => {
-				0u8.write(w)?;
-				short_channel_id.write(w)?;
-				self.amt_to_forward.write(w)?;
-				self.outgoing_cltv_value.write(w)?;
-				w.write_all(&[0;12])?;
-			},
 			OnionHopDataFormat::NonFinalNode { short_channel_id } => {
-				encode_varint_length_prefixed_tlv!(w, {
+				_encode_varint_length_prefixed_tlv!(w, {
 					(2, HighZeroBytesDroppedBigSize(self.amt_to_forward), required),
 					(4, HighZeroBytesDroppedBigSize(self.outgoing_cltv_value), required),
 					(6, short_channel_id, required)
 				});
 			},
 			OnionHopDataFormat::FinalNode { ref payment_data, ref keysend_preimage } => {
-				encode_varint_length_prefixed_tlv!(w, {
+				_encode_varint_length_prefixed_tlv!(w, {
 					(2, HighZeroBytesDroppedBigSize(self.amt_to_forward), required),
 					(4, HighZeroBytesDroppedBigSize(self.outgoing_cltv_value), required),
 					(8, payment_data, option),
@@ -1469,58 +1663,44 @@ impl Writeable for OnionHopData {
 
 impl Readable for OnionHopData {
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		let b: BigSize = Readable::read(r)?;
-		const LEGACY_ONION_HOP_FLAG: u64 = 0;
-		let (format, amt, cltv_value) = if b.0 != LEGACY_ONION_HOP_FLAG {
-			let mut rd = FixedLengthReader::new(r, b.0);
-			let mut amt = HighZeroBytesDroppedBigSize(0u64);
-			let mut cltv_value = HighZeroBytesDroppedBigSize(0u32);
-			let mut short_id: Option<u64> = None;
-			let mut payment_data: Option<FinalOnionHopData> = None;
-			let mut keysend_preimage: Option<PaymentPreimage> = None;
-			decode_tlv_stream!(&mut rd, {
-				(2, amt, required),
-				(4, cltv_value, required),
-				(6, short_id, option),
-				(8, payment_data, option),
-				// See https://github.com/lightning/blips/blob/master/blip-0003.md
-				(5482373484, keysend_preimage, option)
-			});
-			rd.eat_remaining().map_err(|_| DecodeError::ShortRead)?;
-			let format = if let Some(short_channel_id) = short_id {
-				if payment_data.is_some() { return Err(DecodeError::InvalidValue); }
-				OnionHopDataFormat::NonFinalNode {
-					short_channel_id,
-				}
-			} else {
-				if let &Some(ref data) = &payment_data {
-					if data.total_msat > MAX_VALUE_MSAT {
-						return Err(DecodeError::InvalidValue);
-					}
-				}
-				OnionHopDataFormat::FinalNode {
-					payment_data,
-					keysend_preimage,
-				}
-			};
-			(format, amt.0, cltv_value.0)
+		let mut amt = HighZeroBytesDroppedBigSize(0u64);
+		let mut cltv_value = HighZeroBytesDroppedBigSize(0u32);
+		let mut short_id: Option<u64> = None;
+		let mut payment_data: Option<FinalOnionHopData> = None;
+		let mut keysend_preimage: Option<PaymentPreimage> = None;
+		read_tlv_fields!(r, {
+			(2, amt, required),
+			(4, cltv_value, required),
+			(6, short_id, option),
+			(8, payment_data, option),
+			// See https://github.com/lightning/blips/blob/master/blip-0003.md
+			(5482373484, keysend_preimage, option)
+		});
+
+		let format = if let Some(short_channel_id) = short_id {
+			if payment_data.is_some() { return Err(DecodeError::InvalidValue); }
+			OnionHopDataFormat::NonFinalNode {
+				short_channel_id,
+			}
 		} else {
-			let format = OnionHopDataFormat::Legacy {
-				short_channel_id: Readable::read(r)?,
-			};
-			let amt: u64 = Readable::read(r)?;
-			let cltv_value: u32 = Readable::read(r)?;
-			r.read_exact(&mut [0; 12])?;
-			(format, amt, cltv_value)
+			if let &Some(ref data) = &payment_data {
+				if data.total_msat > MAX_VALUE_MSAT {
+					return Err(DecodeError::InvalidValue);
+				}
+			}
+			OnionHopDataFormat::FinalNode {
+				payment_data,
+				keysend_preimage,
+			}
 		};
 
-		if amt > MAX_VALUE_MSAT {
+		if amt.0 > MAX_VALUE_MSAT {
 			return Err(DecodeError::InvalidValue);
 		}
 		Ok(OnionHopData {
 			format,
-			amt_to_forward: amt,
-			outgoing_cltv_value: cltv_value,
+			amt_to_forward: amt.0,
+			outgoing_cltv_value: cltv_value.0,
 		})
 	}
 }
@@ -1735,7 +1915,7 @@ impl Readable for UnsignedNodeAnnouncement {
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let features: NodeFeatures = Readable::read(r)?;
 		let timestamp: u32 = Readable::read(r)?;
-		let node_id: PublicKey = Readable::read(r)?;
+		let node_id: NodeId = Readable::read(r)?;
 		let mut rgb = [0; 3];
 		r.read_exact(&mut rgb)?;
 		let alias: [u8; 32] = Readable::read(r)?;
@@ -1857,10 +2037,9 @@ impl_writeable_msg!(ReplyShortChannelIdsEnd, {
 }, {});
 
 impl QueryChannelRange {
-	/**
-	 * Calculates the overflow safe ending block height for the query.
-	 * Overflow returns `0xffffffff`, otherwise returns `first_blocknum + number_of_blocks`
-	 */
+	/// Calculates the overflow safe ending block height for the query.
+	///
+	/// Overflow returns `0xffffffff`, otherwise returns `first_blocknum + number_of_blocks`.
 	pub fn end_blocknum(&self) -> u32 {
 		match self.first_blocknum.checked_add(self.number_of_blocks) {
 			Some(block) => block,
@@ -1942,11 +2121,12 @@ impl_writeable_msg!(GossipTimestampFilter, {
 #[cfg(test)]
 mod tests {
 	use hex;
-	use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
-	use ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
-	use ln::msgs;
-	use ln::msgs::{FinalOnionHopData, OptionalField, OnionErrorPacket, OnionHopDataFormat};
-	use util::ser::{Writeable, Readable, Hostname};
+	use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
+	use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
+	use crate::ln::msgs;
+	use crate::ln::msgs::{FinalOnionHopData, OptionalField, OnionErrorPacket, OnionHopDataFormat};
+	use crate::routing::gossip::NodeId;
+	use crate::util::ser::{Writeable, Readable, Hostname};
 
 	use bitcoin::hashes::hex::FromHex;
 	use bitcoin::util::address::Address;
@@ -1958,8 +2138,8 @@ mod tests {
 	use bitcoin::secp256k1::{PublicKey,SecretKey};
 	use bitcoin::secp256k1::{Secp256k1, Message};
 
-	use io::{self, Cursor};
-	use prelude::*;
+	use crate::io::{self, Cursor};
+	use crate::prelude::*;
 	use core::convert::TryFrom;
 
 	#[test]
@@ -2045,7 +2225,7 @@ mod tests {
 		let sig_2 = get_sig_on!(privkey_2, secp_ctx, String::from("01010101010101010101010101010101"));
 		let sig_3 = get_sig_on!(privkey_3, secp_ctx, String::from("01010101010101010101010101010101"));
 		let sig_4 = get_sig_on!(privkey_4, secp_ctx, String::from("01010101010101010101010101010101"));
-		let mut features = ChannelFeatures::known();
+		let mut features = ChannelFeatures::empty();
 		if unknown_features_bits {
 			features = ChannelFeatures::from_le_bytes(vec![0xFF, 0xFF]);
 		}
@@ -2053,10 +2233,10 @@ mod tests {
 			features,
 			chain_hash: BlockHash::from_hex("6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000").unwrap(),
 			short_channel_id: 2316138423780173,
-			node_id_1: pubkey_1,
-			node_id_2: pubkey_2,
-			bitcoin_key_1: pubkey_3,
-			bitcoin_key_2: pubkey_4,
+			node_id_1: NodeId::from_pubkey(&pubkey_1),
+			node_id_2: NodeId::from_pubkey(&pubkey_2),
+			bitcoin_key_1: NodeId::from_pubkey(&pubkey_3),
+			bitcoin_key_2: NodeId::from_pubkey(&pubkey_4),
 			excess_data: if excess_data { vec![10, 0, 0, 20, 0, 0, 30, 0, 0, 40] } else { Vec::new() },
 		};
 		let channel_announcement = msgs::ChannelAnnouncement {
@@ -2138,7 +2318,7 @@ mod tests {
 		let unsigned_node_announcement = msgs::UnsignedNodeAnnouncement {
 			features,
 			timestamp: 20190119,
-			node_id: pubkey_1,
+			node_id: NodeId::from_pubkey(&pubkey_1),
 			rgb: [32; 3],
 			alias: [16;32],
 			addresses,
@@ -2336,6 +2516,8 @@ mod tests {
 			first_per_commitment_point: pubkey_6,
 			shutdown_scriptpubkey: if shutdown { OptionalField::Present(Address::p2pkh(&::bitcoin::PublicKey{compressed: true, inner: pubkey_1}, Network::Testnet).script_pubkey()) } else { OptionalField::Absent },
 			channel_type: None,
+			#[cfg(taproot)]
+			next_local_nonce: None,
 		};
 		let encoded_value = accept_channel.encode();
 		let mut target_value = hex::decode("020202020202020202020202020202020202020202020202020202020202020212345678901234562334032891223698321446687011447600083a840000034d000c89d4c0bcc0bc031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f024d4b6cd1361032ca9bd2aeb9d900aa4d45d9ead80ac9423374c451a7254d076602531fe6068134503d2723133227c867ac8fa6c83c537e9a44c3c5bdbdcb1fe33703462779ad4aad39514614751a71085f2f10e1c7a593e4e030efb5b8721ce55b0b0362c0a046dacce86ddd0343c6d3c7c79c2208ba0d9c9cf24a6d046d21d21f90f703f006a18d5653c4edf5391ff23a61f03ff83d237e880ee61187fa9f379a028e0a").unwrap();
@@ -2361,6 +2543,10 @@ mod tests {
 			funding_txid: Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(),
 			funding_output_index: 255,
 			signature: sig_1,
+			#[cfg(taproot)]
+			partial_signature_with_nonce: None,
+			#[cfg(taproot)]
+			next_local_nonce: None,
 		};
 		let encoded_value = funding_created.encode();
 		let target_value = hex::decode("02020202020202020202020202020202020202020202020202020202020202026e96fe9f8b0ddcd729ba03cfafa5a27b050b39d354dd980814268dfa9a44d4c200ffd977cb9b53d93a6ff64bb5f1e158b4094b66e798fb12911168a3ccdf80a83096340a6a95da0ae8d9f776528eecdbb747eb6b545495a4319ed5378e35b21e073a").unwrap();
@@ -2375,6 +2561,8 @@ mod tests {
 		let funding_signed = msgs::FundingSigned {
 			channel_id: [2; 32],
 			signature: sig_1,
+			#[cfg(taproot)]
+			partial_signature_with_nonce: None,
 		};
 		let encoded_value = funding_signed.encode();
 		let target_value = hex::decode("0202020202020202020202020202020202020202020202020202020202020202d977cb9b53d93a6ff64bb5f1e158b4094b66e798fb12911168a3ccdf80a83096340a6a95da0ae8d9f776528eecdbb747eb6b545495a4319ed5378e35b21e073a").unwrap();
@@ -2538,6 +2726,8 @@ mod tests {
 			channel_id: [2; 32],
 			signature: sig_1,
 			htlc_signatures: if htlcs { vec![sig_2, sig_3, sig_4] } else { Vec::new() },
+			#[cfg(taproot)]
+			partial_signature_with_nonce: None,
 		};
 		let encoded_value = commitment_signed.encode();
 		let mut target_value = hex::decode("0202020202020202020202020202020202020202020202020202020202020202d977cb9b53d93a6ff64bb5f1e158b4094b66e798fb12911168a3ccdf80a83096340a6a95da0ae8d9f776528eecdbb747eb6b545495a4319ed5378e35b21e073a").unwrap();
@@ -2650,20 +2840,6 @@ mod tests {
 		assert_eq!(encoded_value, target_value);
 	}
 
-	#[test]
-	fn encoding_legacy_onion_hop_data() {
-		let msg = msgs::OnionHopData {
-			format: OnionHopDataFormat::Legacy {
-				short_channel_id: 0xdeadbeef1bad1dea,
-			},
-			amt_to_forward: 0x0badf00d01020304,
-			outgoing_cltv_value: 0xffffffff,
-		};
-		let encoded_value = msg.encode();
-		let target_value = hex::decode("00deadbeef1bad1dea0badf00d01020304ffffffff000000000000000000000000").unwrap();
-		assert_eq!(encoded_value, target_value);
-	}
-
 	#[test]
 	fn encoding_nonfinal_onion_hop_data() {
 		let mut msg = msgs::OnionHopData {
@@ -2885,7 +3061,7 @@ mod tests {
 	}
 	// see above test, needs to be a separate method for use of the serialization macros.
 	fn encode_big_payload() -> Result<Vec<u8>, io::Error> {
-		use util::ser::HighZeroBytesDroppedBigSize;
+		use crate::util::ser::HighZeroBytesDroppedBigSize;
 		let payload = msgs::OnionHopData {
 			format: OnionHopDataFormat::NonFinalNode {
 				short_channel_id: 0xdeadbeef1bad1dea,
@@ -2896,7 +3072,7 @@ mod tests {
 		let mut encoded_payload = Vec::new();
 		let test_bytes = vec![42u8; 1000];
 		if let OnionHopDataFormat::NonFinalNode { short_channel_id } = payload.format {
-			encode_varint_length_prefixed_tlv!(&mut encoded_payload, {
+			_encode_varint_length_prefixed_tlv!(&mut encoded_payload, {
 				(1, test_bytes, vec_type),
 				(2, HighZeroBytesDroppedBigSize(payload.amt_to_forward), required),
 				(4, HighZeroBytesDroppedBigSize(payload.outgoing_cltv_value), required),