Log peer features in peer_handler (and check for all req bits)
[rust-lightning] / src / ln / msgs.rs
index 5100ed79c38a54fcf07aba82e663b886325b4667..92e900a212058fde85d73243951de417e7af2ae9 100644 (file)
@@ -2,7 +2,6 @@ use secp256k1::key::PublicKey;
 use secp256k1::{Secp256k1, Signature};
 use secp256k1;
 use bitcoin::util::hash::Sha256dHash;
-use bitcoin::network::serialize::serialize;
 use bitcoin::blockdata::script::Script;
 
 use std::error::Error;
@@ -13,19 +12,6 @@ use std::result::Result;
 use util::{byte_utils, internal_traits, events};
 use util::ser::{Readable, Writeable, Writer};
 
-pub trait MsgEncodable {
-       fn encode(&self) -> Vec<u8>;
-       #[inline]
-       fn encoded_len(&self) -> usize { self.encode().len() }
-       #[inline]
-       fn encode_with_len(&self) -> Vec<u8> {
-               let enc = self.encode();
-               let mut res = Vec::with_capacity(enc.len() + 2);
-               res.extend_from_slice(&byte_utils::be16_to_array(enc.len() as u16));
-               res.extend_from_slice(&enc);
-               res
-       }
-}
 #[derive(Debug)]
 pub enum DecodeError {
        /// Unknown realm byte in an OnionHopData packet
@@ -553,167 +539,6 @@ impl From<::std::io::Error> for DecodeError {
        }
 }
 
-impl MsgEncodable for GlobalFeatures {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(self.flags.len() + 2);
-               res.extend_from_slice(&byte_utils::be16_to_array(self.flags.len() as u16));
-               res.extend_from_slice(&self.flags[..]);
-               res
-       }
-       fn encoded_len(&self) -> usize { self.flags.len() + 2 }
-}
-
-impl MsgEncodable for ChannelReestablish {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(if self.data_loss_protect.is_some() { 32+2*8+33+32 } else { 32+2*8 });
-
-               res.extend_from_slice(&serialize(&self.channel_id).unwrap()[..]);
-               res.extend_from_slice(&byte_utils::be64_to_array(self.next_local_commitment_number));
-               res.extend_from_slice(&byte_utils::be64_to_array(self.next_remote_commitment_number));
-
-               if let &Some(ref data_loss_protect) = &self.data_loss_protect {
-                       res.extend_from_slice(&data_loss_protect.your_last_per_commitment_secret[..]);
-                       res.extend_from_slice(&data_loss_protect.my_current_per_commitment_point.serialize());
-               }
-               res
-       }
-}
-
-impl MsgEncodable for UnsignedNodeAnnouncement {
-       fn encode(&self) -> Vec<u8> {
-               let features = self.features.encode();
-               let mut res = Vec::with_capacity(74 + features.len() + self.addresses.len()*7 + self.excess_address_data.len() + self.excess_data.len());
-               res.extend_from_slice(&features[..]);
-               res.extend_from_slice(&byte_utils::be32_to_array(self.timestamp));
-               res.extend_from_slice(&self.node_id.serialize());
-               res.extend_from_slice(&self.rgb);
-               res.extend_from_slice(&self.alias);
-               let mut addr_slice = Vec::with_capacity(self.addresses.len() * 18);
-               let mut addrs_to_encode = self.addresses.clone();
-               addrs_to_encode.sort_unstable_by(|a, b| { a.get_id().cmp(&b.get_id()) });
-               addrs_to_encode.dedup_by(|a, b| { a.get_id() == b.get_id() });
-               for addr in addrs_to_encode.iter() {
-                       match addr {
-                               &NetAddress::IPv4{addr, port} => {
-                                       addr_slice.push(1);
-                                       addr_slice.extend_from_slice(&addr);
-                                       addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
-                               },
-                               &NetAddress::IPv6{addr, port} => {
-                                       addr_slice.push(2);
-                                       addr_slice.extend_from_slice(&addr);
-                                       addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
-                               },
-                               &NetAddress::OnionV2{addr, port} => {
-                                       addr_slice.push(3);
-                                       addr_slice.extend_from_slice(&addr);
-                                       addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
-                               },
-                               &NetAddress::OnionV3{ed25519_pubkey, checksum, version, port} => {
-                                       addr_slice.push(4);
-                                       addr_slice.extend_from_slice(&ed25519_pubkey);
-                                       addr_slice.extend_from_slice(&byte_utils::be16_to_array(checksum));
-                                       addr_slice.push(version);
-                                       addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
-                               },
-                       }
-               }
-               res.extend_from_slice(&byte_utils::be16_to_array((addr_slice.len() + self.excess_address_data.len()) as u16));
-               res.extend_from_slice(&addr_slice[..]);
-               res.extend_from_slice(&self.excess_address_data[..]);
-               res.extend_from_slice(&self.excess_data[..]);
-               res
-       }
-}
-
-impl MsgEncodable for UnsignedChannelAnnouncement {
-       fn encode(&self) -> Vec<u8> {
-               let features = self.features.encode();
-               let mut res = Vec::with_capacity(172 + features.len() + self.excess_data.len());
-               res.extend_from_slice(&features[..]);
-               res.extend_from_slice(&self.chain_hash[..]);
-               res.extend_from_slice(&byte_utils::be64_to_array(self.short_channel_id));
-               res.extend_from_slice(&self.node_id_1.serialize());
-               res.extend_from_slice(&self.node_id_2.serialize());
-               res.extend_from_slice(&self.bitcoin_key_1.serialize());
-               res.extend_from_slice(&self.bitcoin_key_2.serialize());
-               res.extend_from_slice(&self.excess_data[..]);
-               res
-       }
-}
-
-impl MsgEncodable for UnsignedChannelUpdate {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(64 + self.excess_data.len());
-               res.extend_from_slice(&self.chain_hash[..]);
-               res.extend_from_slice(&byte_utils::be64_to_array(self.short_channel_id));
-               res.extend_from_slice(&byte_utils::be32_to_array(self.timestamp));
-               res.extend_from_slice(&byte_utils::be16_to_array(self.flags));
-               res.extend_from_slice(&byte_utils::be16_to_array(self.cltv_expiry_delta));
-               res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_minimum_msat));
-               res.extend_from_slice(&byte_utils::be32_to_array(self.fee_base_msat));
-               res.extend_from_slice(&byte_utils::be32_to_array(self.fee_proportional_millionths));
-               res.extend_from_slice(&self.excess_data[..]);
-               res
-       }
-}
-
-impl MsgEncodable for ChannelUpdate {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(128);
-               res.extend_from_slice(&self.signature.serialize_compact(&Secp256k1::without_caps())[..]);
-               res.extend_from_slice(&self.contents.encode()[..]);
-               res
-       }
-}
-
-impl MsgEncodable for OnionRealm0HopData {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(32);
-               res.extend_from_slice(&byte_utils::be64_to_array(self.short_channel_id));
-               res.extend_from_slice(&byte_utils::be64_to_array(self.amt_to_forward));
-               res.extend_from_slice(&byte_utils::be32_to_array(self.outgoing_cltv_value));
-               res.resize(32, 0);
-               res
-       }
-}
-
-impl MsgEncodable for OnionHopData {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(65);
-               res.push(self.realm);
-               res.extend_from_slice(&self.data.encode()[..]);
-               res.extend_from_slice(&self.hmac);
-               res
-       }
-}
-
-impl MsgEncodable for OnionPacket {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(1 + 33 + 20*65 + 32);
-               res.push(self.version);
-               match self.public_key {
-                       Ok(pubkey) => res.extend_from_slice(&pubkey.serialize()),
-                       Err(_) => res.extend_from_slice(&[0; 33]),
-               }
-               res.extend_from_slice(&self.hop_data);
-               res.extend_from_slice(&self.hmac);
-               res
-       }
-}
-
-impl MsgEncodable for DecodedOnionErrorPacket {
-       fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(32 + 4 + self.failuremsg.len() + self.pad.len());
-               res.extend_from_slice(&self.hmac);
-               res.extend_from_slice(&[((self.failuremsg.len() >> 8) & 0xff) as u8, (self.failuremsg.len() & 0xff) as u8]);
-               res.extend_from_slice(&self.failuremsg);
-               res.extend_from_slice(&[((self.pad.len() >> 8) & 0xff) as u8, (self.pad.len() & 0xff) as u8]);
-               res.extend_from_slice(&self.pad);
-               res
-       }
-}
-
 impl_writeable_len_match!(AcceptChannel, {
                {AcceptChannel{ shutdown_scriptpubkey: Some(ref script), ..}, 270 + 2 + script.len()},
                {_, 270}
@@ -742,8 +567,8 @@ impl_writeable!(AnnouncementSignatures, 32+8+64*2, {
        bitcoin_signature
 });
 
-impl<W: Writer> Writeable<W> for ChannelReestablish {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for ChannelReestablish {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(if self.data_loss_protect.is_some() { 32+2*8+33+32 } else { 32+2*8 });
                self.channel_id.write(w)?;
                self.next_local_commitment_number.write(w)?;
@@ -905,8 +730,8 @@ impl_writeable_len_match!(OnionErrorPacket, {
        data
 });
 
-impl<W: Writer> Writeable<W> for OnionPacket {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for OnionPacket {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(1 + 33 + 20*65 + 32);
                self.version.write(w)?;
                match self.public_key {
@@ -943,8 +768,8 @@ impl_writeable!(UpdateAddHTLC, 32+8+8+32+4+1366, {
        onion_routing_packet
 });
 
-impl<W: Writer> Writeable<W> for OnionRealm0HopData {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for OnionRealm0HopData {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(32);
                self.short_channel_id.write(w)?;
                self.amt_to_forward.write(w)?;
@@ -968,8 +793,8 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
        }
 }
 
-impl<W: Writer> Writeable<W> for OnionHopData {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for OnionHopData {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(65);
                self.realm.write(w)?;
                self.data.write(w)?;
@@ -994,8 +819,8 @@ impl<R: Read> Readable<R> for OnionHopData {
        }
 }
 
-impl<W: Writer> Writeable<W> for Ping {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for Ping {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(self.byteslen as usize + 4);
                self.ponglen.write(w)?;
                vec![0u8; self.byteslen as usize].write(w)?; // size-unchecked write
@@ -1016,8 +841,8 @@ impl<R: Read> Readable<R> for Ping {
        }
 }
 
-impl<W: Writer> Writeable<W> for Pong {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for Pong {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(self.byteslen as usize + 2);
                vec![0u8; self.byteslen as usize].write(w)?; // size-unchecked write
                Ok(())
@@ -1036,8 +861,8 @@ impl<R: Read> Readable<R> for Pong {
        }
 }
 
-impl<W: Writer> Writeable<W> for UnsignedChannelAnnouncement {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for UnsignedChannelAnnouncement {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(2 + 2*32 + 4*33 + self.features.flags.len() + self.excess_data.len());
                self.features.write(w)?;
                self.chain_hash.write(w)?;
@@ -1087,8 +912,8 @@ impl_writeable_len_match!(ChannelAnnouncement, {
        contents
 });
 
-impl<W: Writer> Writeable<W> for UnsignedChannelUpdate {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for UnsignedChannelUpdate {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(64 + self.excess_data.len());
                self.chain_hash.write(w)?;
                self.short_channel_id.write(w)?;
@@ -1131,8 +956,8 @@ impl_writeable_len_match!(ChannelUpdate, {
        contents
 });
 
-impl<W: Writer> Writeable<W> for ErrorMessage {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for ErrorMessage {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(32 + 2 + self.data.len());
                self.channel_id.write(w)?;
                (self.data.len() as u16).write(w)?;
@@ -1159,8 +984,8 @@ impl<R: Read> Readable<R> for ErrorMessage {
        }
 }
 
-impl<W: Writer> Writeable<W> for UnsignedNodeAnnouncement {
-       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+impl Writeable for UnsignedNodeAnnouncement {
+       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(64 + 76 + self.features.flags.len() + self.addresses.len()*38 + self.excess_address_data.len() + self.excess_data.len());
                self.features.write(w)?;
                self.timestamp.write(w)?;
@@ -1339,8 +1164,8 @@ impl_writeable_len_match!(NodeAnnouncement, {
 #[cfg(test)]
 mod tests {
        use hex;
-       use ln::msgs::MsgEncodable;
        use ln::msgs;
+       use util::ser::Writeable;
        use secp256k1::key::{PublicKey,SecretKey};
        use secp256k1::Secp256k1;