Update to rust-secp256k1 v0.11 and rust-bitcoin v0.14
[rust-lightning] / src / ln / msgs.rs
index a36202e4681c02991081d4e3bc9edbf8d8f58a8b..5d4767721dbb08a550b919c94cb6196c20390e41 100644 (file)
@@ -31,10 +31,15 @@ pub enum DecodeError {
        BadPublicKey,
        /// Failed to decode a signature (ie it's invalid)
        BadSignature,
-       /// Buffer not of right length (either too short or too long)
-       WrongLength,
+       /// Value expected to be text wasn't decodable as text
+       BadText,
+       /// Buffer too short
+       ShortRead,
        /// node_announcement included more than one address of a given type!
        ExtraAddressesPerType,
+       /// A length descriptor in the packet didn't describe the later data correctly
+       /// (currently only generated in node_announcement)
+       BadLengthDescriptor,
 }
 pub trait MsgDecodable: Sized {
        fn decode(v: &[u8]) -> Result<Self, DecodeError>;
@@ -138,6 +143,11 @@ pub struct Init {
        pub local_features: LocalFeatures,
 }
 
+pub struct ErrorMessage {
+       pub channel_id: [u8; 32],
+       pub data: String,
+}
+
 pub struct Ping {
        pub ponglen: u16,
        pub byteslen: u16,
@@ -372,9 +382,15 @@ pub enum ErrorAction {
                msg: UpdateFailHTLC
        },
        /// The peer took some action which made us think they were useless. Disconnect them.
-       DisconnectPeer,
+       DisconnectPeer {
+               msg: Option<ErrorMessage>
+       },
        /// The peer did something harmless that we weren't able to process, just log and ignore
        IgnoreError,
+       /// The peer did something incorrect. Tell them.
+       SendErrorMessage {
+               msg: ErrorMessage
+       },
 }
 
 pub struct HandleError { //TODO: rename me
@@ -486,8 +502,10 @@ impl Error for DecodeError {
                        DecodeError::UnknownRealmByte => "Unknown realm byte in Onion packet",
                        DecodeError::BadPublicKey => "Invalid public key in packet",
                        DecodeError::BadSignature => "Invalid signature in packet",
-                       DecodeError::WrongLength => "Data was wrong length for packet",
+                       DecodeError::BadText => "Invalid text in packet",
+                       DecodeError::ShortRead => "Packet extended beyond the provided bytes",
                        DecodeError::ExtraAddressesPerType => "More than one address of a single type",
+                       DecodeError::BadLengthDescriptor => "A length descriptor in the packet didn't describe the later data correctly",
                }
        }
 }
@@ -523,9 +541,9 @@ macro_rules! secp_signature {
 
 impl MsgDecodable for LocalFeatures {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-               if v.len() < 2 { return Err(DecodeError::WrongLength); }
+               if v.len() < 2 { return Err(DecodeError::ShortRead); }
                let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
-               if v.len() < len + 2 { return Err(DecodeError::WrongLength); }
+               if v.len() < len + 2 { return Err(DecodeError::ShortRead); }
                let mut flags = Vec::with_capacity(len);
                flags.extend_from_slice(&v[2..2 + len]);
                Ok(Self {
@@ -545,9 +563,9 @@ impl MsgEncodable for LocalFeatures {
 
 impl MsgDecodable for GlobalFeatures {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-               if v.len() < 2 { return Err(DecodeError::WrongLength); }
+               if v.len() < 2 { return Err(DecodeError::ShortRead); }
                let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
-               if v.len() < len + 2 { return Err(DecodeError::WrongLength); }
+               if v.len() < len + 2 { return Err(DecodeError::ShortRead); }
                let mut flags = Vec::with_capacity(len);
                flags.extend_from_slice(&v[2..2 + len]);
                Ok(Self {
@@ -569,7 +587,7 @@ impl MsgDecodable for Init {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                let global_features = GlobalFeatures::decode(v)?;
                if v.len() < global_features.flags.len() + 4 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let local_features = LocalFeatures::decode(&v[global_features.flags.len() + 2..])?;
                Ok(Self {
@@ -590,12 +608,12 @@ impl MsgEncodable for Init {
 impl MsgDecodable for Ping {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 4 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let ponglen = byte_utils::slice_to_be16(&v[0..2]);
                let byteslen = byte_utils::slice_to_be16(&v[2..4]);
                if v.len() < 4 + byteslen as usize {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                Ok(Self {
                        ponglen,
@@ -615,11 +633,11 @@ impl MsgEncodable for Ping {
 impl MsgDecodable for Pong {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 2 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let byteslen = byte_utils::slice_to_be16(&v[0..2]);
                if v.len() < 2 + byteslen as usize {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                Ok(Self {
                        byteslen
@@ -638,7 +656,7 @@ impl MsgEncodable for Pong {
 impl MsgDecodable for OpenChannel {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 2*32+6*8+4+2*2+6*33+1 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let ctx = Secp256k1::without_caps();
 
@@ -646,11 +664,9 @@ impl MsgDecodable for OpenChannel {
                if v.len() >= 321 {
                        let len = byte_utils::slice_to_be16(&v[319..321]) as usize;
                        if v.len() < 321+len {
-                               return Err(DecodeError::WrongLength);
+                               return Err(DecodeError::ShortRead);
                        }
                        shutdown_scriptpubkey = Some(Script::from(v[321..321+len].to_vec()));
-               } else if v.len() != 2*32+6*8+4+2*2+6*33+1 { // Message cant have 1 extra byte
-                       return Err(DecodeError::WrongLength);
                }
 
                Ok(OpenChannel {
@@ -711,7 +727,7 @@ impl MsgEncodable for OpenChannel {
 impl MsgDecodable for AcceptChannel {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+4*8+4+2*2+6*33 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let ctx = Secp256k1::without_caps();
 
@@ -719,11 +735,9 @@ impl MsgDecodable for AcceptChannel {
                if v.len() >= 272 {
                        let len = byte_utils::slice_to_be16(&v[270..272]) as usize;
                        if v.len() < 272+len {
-                               return Err(DecodeError::WrongLength);
+                               return Err(DecodeError::ShortRead);
                        }
                        shutdown_scriptpubkey = Some(Script::from(v[272..272+len].to_vec()));
-               } else if v.len() != 32+4*8+4+2*2+6*33 { // Message cant have 1 extra byte
-                       return Err(DecodeError::WrongLength);
                }
 
                let mut temporary_channel_id = [0; 32];
@@ -778,7 +792,7 @@ impl MsgEncodable for AcceptChannel {
 impl MsgDecodable for FundingCreated {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+32+2+64 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let ctx = Secp256k1::without_caps();
                let mut temporary_channel_id = [0; 32];
@@ -806,7 +820,7 @@ impl MsgEncodable for FundingCreated {
 impl MsgDecodable for FundingSigned {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+64 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let ctx = Secp256k1::without_caps();
                let mut channel_id = [0; 32];
@@ -829,7 +843,7 @@ impl MsgEncodable for FundingSigned {
 impl MsgDecodable for FundingLocked {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+33 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let ctx = Secp256k1::without_caps();
                let mut channel_id = [0; 32];
@@ -852,11 +866,11 @@ impl MsgEncodable for FundingLocked {
 impl MsgDecodable for Shutdown {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32 + 2 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let scriptlen = byte_utils::slice_to_be16(&v[32..34]) as usize;
                if v.len() < 32 + 2 + scriptlen {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
@@ -879,7 +893,7 @@ impl MsgEncodable for Shutdown {
 impl MsgDecodable for ClosingSigned {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32 + 8 + 64 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let secp_ctx = Secp256k1::without_caps();
                let mut channel_id = [0; 32];
@@ -905,7 +919,7 @@ impl MsgEncodable for ClosingSigned {
 impl MsgDecodable for UpdateAddHTLC {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+8+8+32+4+1+33+20*65+32 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
@@ -923,7 +937,7 @@ impl MsgDecodable for UpdateAddHTLC {
 }
 impl MsgEncodable for UpdateAddHTLC {
        fn encode(&self) -> Vec<u8> {
-               let mut res = Vec::with_capacity(32+8+8+32+4+1+1366);
+               let mut res = Vec::with_capacity(32+8+8+32+4+1366);
                res.extend_from_slice(&self.channel_id);
                res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_id));
                res.extend_from_slice(&byte_utils::be64_to_array(self.amount_msat));
@@ -937,7 +951,7 @@ impl MsgEncodable for UpdateAddHTLC {
 impl MsgDecodable for UpdateFulfillHTLC {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+8+32 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
@@ -963,7 +977,7 @@ impl MsgEncodable for UpdateFulfillHTLC {
 impl MsgDecodable for UpdateFailHTLC {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+8 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
@@ -988,7 +1002,7 @@ impl MsgEncodable for UpdateFailHTLC {
 impl MsgDecodable for UpdateFailMalformedHTLC {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+8+32+2 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
@@ -1016,14 +1030,14 @@ impl MsgEncodable for UpdateFailMalformedHTLC {
 impl MsgDecodable for CommitmentSigned {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+64+2 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
 
                let htlcs = byte_utils::slice_to_be16(&v[96..98]) as usize;
                if v.len() < 32+64+2+htlcs*64 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut htlc_signatures = Vec::with_capacity(htlcs);
                let secp_ctx = Secp256k1::without_caps();
@@ -1054,7 +1068,7 @@ impl MsgEncodable for CommitmentSigned {
 impl MsgDecodable for RevokeAndACK {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+32+33 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
@@ -1081,7 +1095,7 @@ impl MsgEncodable for RevokeAndACK {
 impl MsgDecodable for UpdateFee {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+4 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut channel_id = [0; 32];
                channel_id[..].copy_from_slice(&v[0..32]);
@@ -1101,20 +1115,57 @@ impl MsgEncodable for UpdateFee {
 }
 
 impl MsgDecodable for ChannelReestablish {
-       fn decode(_v: &[u8]) -> Result<Self, DecodeError> {
-               unimplemented!();
+       fn decode(v: &[u8]) -> Result<Self, DecodeError> {
+               if v.len() < 32+2*8+33 {
+                       return Err(DecodeError::ShortRead);
+               }
+
+               let your_last_per_commitment_secret = if v.len() > 32+2*8+33 {
+                       if v.len() < 32+2*8+33 + 32 {
+                               return Err(DecodeError::ShortRead);
+                       }
+                       let mut inner_array = [0; 32];
+                       inner_array.copy_from_slice(&v[48..48+32]);
+                       Some(inner_array)
+               } else { None };
+
+               let option_size = match &your_last_per_commitment_secret {
+                       &Some(ref _ary) => 32,
+                       &None => 0,
+               };
+               Ok(Self {
+                       channel_id: deserialize(&v[0..32]).unwrap(),
+                       next_local_commitment_number: byte_utils::slice_to_be64(&v[32..40]),
+                       next_remote_commitment_number: byte_utils::slice_to_be64(&v[40..48]),
+                       your_last_per_commitment_secret: your_last_per_commitment_secret,
+                       my_current_per_commitment_point: {
+                               let ctx = Secp256k1::without_caps();
+                               secp_pubkey!(&ctx, &v[48+option_size..48+option_size+33])
+                       }
+               })
        }
 }
 impl MsgEncodable for ChannelReestablish {
        fn encode(&self) -> Vec<u8> {
-               unimplemented!();
+               let mut res = Vec::with_capacity(if self.your_last_per_commitment_secret.is_some() { 32+2*3+33 + 32 } else { 32+2*8+33 });
+
+               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 ary) = &self.your_last_per_commitment_secret {
+                       res.extend_from_slice(&ary[..]);
+               }
+
+               res.extend_from_slice(&self.my_current_per_commitment_point.serialize());
+               res
        }
 }
 
 impl MsgDecodable for AnnouncementSignatures {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+8+64*2 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let secp_ctx = Secp256k1::without_caps();
                let mut channel_id = [0; 32];
@@ -1143,7 +1194,7 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                let features = GlobalFeatures::decode(&v[..])?;
                if v.len() < features.encoded_len() + 4 + 33 + 3 + 32 + 2 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let start = features.encoded_len();
 
@@ -1155,22 +1206,23 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
 
                let addrlen = byte_utils::slice_to_be16(&v[start + 72..start + 74]) as usize;
                if v.len() < start + 74 + addrlen {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
+               let addr_read_limit = start + 74 + addrlen;
 
                let mut addresses = Vec::with_capacity(4);
                let mut read_pos = start + 74;
                loop {
-                       if v.len() <= read_pos { break; }
+                       if addr_read_limit <= read_pos { break; }
                        match v[read_pos] {
                                0 => { read_pos += 1; },
                                1 => {
-                                       if v.len() < read_pos + 1 + 6 {
-                                               return Err(DecodeError::WrongLength);
-                                       }
                                        if addresses.len() > 0 {
                                                return Err(DecodeError::ExtraAddressesPerType);
                                        }
+                                       if addr_read_limit < read_pos + 1 + 6 {
+                                               return Err(DecodeError::BadLengthDescriptor);
+                                       }
                                        let mut addr = [0; 4];
                                        addr.copy_from_slice(&v[read_pos + 1..read_pos + 5]);
                                        addresses.push(NetAddress::IPv4 {
@@ -1180,12 +1232,12 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
                                        read_pos += 1 + 6;
                                },
                                2 => {
-                                       if v.len() < read_pos + 1 + 18 {
-                                               return Err(DecodeError::WrongLength);
-                                       }
                                        if addresses.len() > 1 || (addresses.len() == 1 && addresses[0].get_id() != 1) {
                                                return Err(DecodeError::ExtraAddressesPerType);
                                        }
+                                       if addr_read_limit < read_pos + 1 + 18 {
+                                               return Err(DecodeError::BadLengthDescriptor);
+                                       }
                                        let mut addr = [0; 16];
                                        addr.copy_from_slice(&v[read_pos + 1..read_pos + 17]);
                                        addresses.push(NetAddress::IPv6 {
@@ -1195,12 +1247,12 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
                                        read_pos += 1 + 18;
                                },
                                3 => {
-                                       if v.len() < read_pos + 1 + 12 {
-                                               return Err(DecodeError::WrongLength);
-                                       }
                                        if addresses.len() > 2 || (addresses.len() > 0 && addresses.last().unwrap().get_id() > 2) {
                                                return Err(DecodeError::ExtraAddressesPerType);
                                        }
+                                       if addr_read_limit < read_pos + 1 + 12 {
+                                               return Err(DecodeError::BadLengthDescriptor);
+                                       }
                                        let mut addr = [0; 10];
                                        addr.copy_from_slice(&v[read_pos + 1..read_pos + 11]);
                                        addresses.push(NetAddress::OnionV2 {
@@ -1210,12 +1262,12 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
                                        read_pos += 1 + 12;
                                },
                                4 => {
-                                       if v.len() < read_pos + 1 + 37 {
-                                               return Err(DecodeError::WrongLength);
-                                       }
                                        if addresses.len() > 3 || (addresses.len() > 0 && addresses.last().unwrap().get_id() > 3) {
                                                return Err(DecodeError::ExtraAddressesPerType);
                                        }
+                                       if addr_read_limit < read_pos + 1 + 37 {
+                                               return Err(DecodeError::BadLengthDescriptor);
+                                       }
                                        let mut ed25519_pubkey = [0; 32];
                                        ed25519_pubkey.copy_from_slice(&v[read_pos + 1..read_pos + 33]);
                                        addresses.push(NetAddress::OnionV3 {
@@ -1289,7 +1341,7 @@ impl MsgEncodable for UnsignedNodeAnnouncement {
 impl MsgDecodable for NodeAnnouncement {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 64 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let secp_ctx = Secp256k1::without_caps();
                Ok(Self {
@@ -1313,7 +1365,7 @@ impl MsgDecodable for UnsignedChannelAnnouncement {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                let features = GlobalFeatures::decode(&v[..])?;
                if v.len() < features.encoded_len() + 32 + 8 + 33*4 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let start = features.encoded_len();
                let secp_ctx = Secp256k1::without_caps();
@@ -1346,7 +1398,7 @@ impl MsgEncodable for UnsignedChannelAnnouncement {
 impl MsgDecodable for ChannelAnnouncement {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 64*4 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let secp_ctx = Secp256k1::without_caps();
                Ok(Self {
@@ -1375,7 +1427,7 @@ impl MsgEncodable for ChannelAnnouncement {
 impl MsgDecodable for UnsignedChannelUpdate {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32+8+4+2+2+8+4+4 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                Ok(Self {
                        chain_hash: deserialize(&v[0..32]).unwrap(),
@@ -1407,7 +1459,7 @@ impl MsgEncodable for UnsignedChannelUpdate {
 impl MsgDecodable for ChannelUpdate {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 128 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let secp_ctx = Secp256k1::without_caps();
                Ok(Self {
@@ -1428,7 +1480,7 @@ impl MsgEncodable for ChannelUpdate {
 impl MsgDecodable for OnionRealm0HopData {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                Ok(OnionRealm0HopData {
                        short_channel_id: byte_utils::slice_to_be64(&v[0..8]),
@@ -1451,7 +1503,7 @@ impl MsgEncodable for OnionRealm0HopData {
 impl MsgDecodable for OnionHopData {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 65 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let realm = v[0];
                if realm != 0 {
@@ -1479,7 +1531,7 @@ impl MsgEncodable for OnionHopData {
 impl MsgDecodable for OnionPacket {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 1+33+20*65+32 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let mut hop_data = [0; 20*65];
                hop_data.copy_from_slice(&v[34..1334]);
@@ -1508,15 +1560,15 @@ impl MsgEncodable for OnionPacket {
 impl MsgDecodable for DecodedOnionErrorPacket {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 32 + 4 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let failuremsg_len = byte_utils::slice_to_be16(&v[32..34]) as usize;
                if v.len() < 32 + 4 + failuremsg_len {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let padding_len = byte_utils::slice_to_be16(&v[34 + failuremsg_len..]) as usize;
                if v.len() < 32 + 4 + failuremsg_len + padding_len {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
 
                let mut hmac = [0; 32];
@@ -1543,11 +1595,11 @@ impl MsgEncodable for DecodedOnionErrorPacket {
 impl MsgDecodable for OnionErrorPacket {
        fn decode(v: &[u8]) -> Result<Self, DecodeError> {
                if v.len() < 2 {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
                if v.len() < 2 + len {
-                       return Err(DecodeError::WrongLength);
+                       return Err(DecodeError::ShortRead);
                }
                Ok(Self {
                        data: v[2..len+2].to_vec(),
@@ -1562,3 +1614,87 @@ impl MsgEncodable for OnionErrorPacket {
                res
        }
 }
+
+impl MsgEncodable for ErrorMessage {
+       fn encode(&self) -> Vec<u8> {
+               let mut res = Vec::with_capacity(34 + self.data.len());
+               res.extend_from_slice(&self.channel_id);
+               res.extend_from_slice(&byte_utils::be16_to_array(self.data.len() as u16));
+               res.extend_from_slice(&self.data.as_bytes());
+               res
+       }
+}
+impl MsgDecodable for ErrorMessage {
+       fn decode(v: &[u8]) -> Result<Self,DecodeError> {
+               if v.len() < 34 {
+                       return Err(DecodeError::ShortRead);
+               }
+               let len = byte_utils::slice_to_be16(&v[32..34]);
+               if v.len() < 34 + len as usize {
+                       return Err(DecodeError::ShortRead);
+               }
+               let data = match String::from_utf8(v[34..34 + len as usize].to_vec()) {
+                       Ok(s) => s,
+                       Err(_) => return Err(DecodeError::BadText),
+               };
+               let mut channel_id = [0; 32];
+               channel_id[..].copy_from_slice(&v[0..32]);
+               Ok(Self {
+                       channel_id,
+                       data,
+               })
+       }
+}
+
+#[cfg(test)]
+mod tests {
+       use hex;
+       use ln::msgs::MsgEncodable;
+       use ln::msgs;
+       use secp256k1::key::{PublicKey,SecretKey};
+       use secp256k1::Secp256k1;
+
+       #[test]
+       fn encoding_channel_reestablish_no_secret() {
+               let public_key = {
+                       let secp_ctx = Secp256k1::new();
+                       PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap())
+               };
+
+               let cr = msgs::ChannelReestablish {
+                       channel_id: [4, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0],
+                       next_local_commitment_number: 3,
+                       next_remote_commitment_number: 4,
+                       your_last_per_commitment_secret: None,
+                       my_current_per_commitment_point: public_key,
+               };
+
+               let encoded_value = cr.encode();
+               assert_eq!(
+                       encoded_value,
+                       vec![4, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 3, 27, 132, 197, 86, 123, 18, 100, 64, 153, 93, 62, 213, 170, 186, 5, 101, 215, 30, 24, 52, 96, 72, 25, 255, 156, 23, 245, 233, 213, 221, 7, 143]
+               );
+       }
+
+       #[test]
+       fn encoding_channel_reestablish_with_secret() {
+               let public_key = {
+                       let secp_ctx = Secp256k1::new();
+                       PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap())
+               };
+
+               let cr = msgs::ChannelReestablish {
+                       channel_id: [4, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0],
+                       next_local_commitment_number: 3,
+                       next_remote_commitment_number: 4,
+                       your_last_per_commitment_secret: Some([9; 32]),
+                       my_current_per_commitment_point: public_key,
+               };
+
+               let encoded_value = cr.encode();
+               assert_eq!(
+                       encoded_value,
+                       vec![4, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 3, 27, 132, 197, 86, 123, 18, 100, 64, 153, 93, 62, 213, 170, 186, 5, 101, 215, 30, 24, 52, 96, 72, 25, 255, 156, 23, 245, 233, 213, 221, 7, 143]
+               );
+       }
+}