X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fmsgs.rs;h=c43a5dc9c4d4ff5c0b379d6cdc94f31c904bdc12;hb=9373c5993fcc4943f31e20fb0e0367d2bddec596;hp=bc7c0ed98b3c38052df2fa06f8eccb9078a2bd1f;hpb=d8474c9d3c422dddf6cf4b5a4f52157a0277203a;p=rust-lightning

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index bc7c0ed9..c43a5dc9 100644
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -1,44 +1,40 @@
 use secp256k1::key::PublicKey;
 use secp256k1::{Secp256k1, Signature};
-use bitcoin::util::uint::Uint256;
+use secp256k1;
 use bitcoin::util::hash::Sha256dHash;
-use bitcoin::network::serialize::{deserialize,serialize};
 use bitcoin::blockdata::script::Script;
 
 use std::error::Error;
-use std::fmt;
+use std::{cmp, fmt};
+use std::io::Read;
 use std::result::Result;
 
-use util::{byte_utils, internal_traits, events};
-
-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
-	}
-}
+use util::{byte_utils, events};
+use util::ser::{Readable, Writeable, Writer};
+
 #[derive(Debug)]
 pub enum DecodeError {
 	/// Unknown realm byte in an OnionHopData packet
 	UnknownRealmByte,
+	/// Unknown feature mandating we fail to parse message
+	UnknownRequiredFeature,
 	/// Failed to decode a public key (ie it's invalid)
 	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,
-}
-pub trait MsgDecodable: Sized {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError>;
+	/// A length descriptor in the packet didn't describe the later data correctly
+	/// (currently only generated in node_announcement)
+	BadLengthDescriptor,
+	/// Error from std::io
+	Io(::std::io::Error),
+	/// 1 or 0 is not found for boolean value
+	InvalidValue,
 }
 
 /// Tracks localfeatures which are only in init messages
@@ -48,23 +44,23 @@ pub struct LocalFeatures {
 }
 
 impl LocalFeatures {
-	pub fn new() -> LocalFeatures {
+	pub(crate) fn new() -> LocalFeatures {
 		LocalFeatures {
 			flags: Vec::new(),
 		}
 	}
 
-	pub fn supports_data_loss_protect(&self) -> bool {
+	pub(crate) fn supports_data_loss_protect(&self) -> bool {
 		self.flags.len() > 0 && (self.flags[0] & 3) != 0
 	}
-	pub fn requires_data_loss_protect(&self) -> bool {
+	pub(crate) fn requires_data_loss_protect(&self) -> bool {
 		self.flags.len() > 0 && (self.flags[0] & 1) != 0
 	}
 
-	pub fn initial_routing_sync(&self) -> bool {
+	pub(crate) fn initial_routing_sync(&self) -> bool {
 		self.flags.len() > 0 && (self.flags[0] & (1 << 3)) != 0
 	}
-	pub fn set_initial_routing_sync(&mut self) {
+	pub(crate) fn set_initial_routing_sync(&mut self) {
 		if self.flags.len() == 0 {
 			self.flags.resize(1, 1 << 3);
 		} else {
@@ -72,14 +68,14 @@ impl LocalFeatures {
 		}
 	}
 
-	pub fn supports_upfront_shutdown_script(&self) -> bool {
+	pub(crate) fn supports_upfront_shutdown_script(&self) -> bool {
 		self.flags.len() > 0 && (self.flags[0] & (3 << 4)) != 0
 	}
-	pub fn requires_upfront_shutdown_script(&self) -> bool {
+	pub(crate) fn requires_upfront_shutdown_script(&self) -> bool {
 		self.flags.len() > 0 && (self.flags[0] & (1 << 4)) != 0
 	}
 
-	pub fn requires_unknown_bits(&self) -> bool {
+	pub(crate) fn requires_unknown_bits(&self) -> bool {
 		for (idx, &byte) in self.flags.iter().enumerate() {
 			if idx != 0 && (byte & 0x55) != 0 {
 				return true;
@@ -90,7 +86,7 @@ impl LocalFeatures {
 		return false;
 	}
 
-	pub fn supports_unknown_bits(&self) -> bool {
+	pub(crate) fn supports_unknown_bits(&self) -> bool {
 		for (idx, &byte) in self.flags.iter().enumerate() {
 			if idx != 0 && byte != 0 {
 				return true;
@@ -109,13 +105,13 @@ pub struct GlobalFeatures {
 }
 
 impl GlobalFeatures {
-	pub fn new() -> GlobalFeatures {
+	pub(crate) fn new() -> GlobalFeatures {
 		GlobalFeatures {
 			flags: Vec::new(),
 		}
 	}
 
-	pub fn requires_unknown_bits(&self) -> bool {
+	pub(crate) fn requires_unknown_bits(&self) -> bool {
 		for &byte in self.flags.iter() {
 			if (byte & 0x55) != 0 {
 				return true;
@@ -124,7 +120,7 @@ impl GlobalFeatures {
 		return false;
 	}
 
-	pub fn supports_unknown_bits(&self) -> bool {
+	pub(crate) fn supports_unknown_bits(&self) -> bool {
 		for &byte in self.flags.iter() {
 			if byte != 0 {
 				return true;
@@ -135,151 +131,160 @@ impl GlobalFeatures {
 }
 
 pub struct Init {
-	pub global_features: GlobalFeatures,
-	pub local_features: LocalFeatures,
+	pub(crate) global_features: GlobalFeatures,
+	pub(crate) local_features: LocalFeatures,
+}
+
+pub struct ErrorMessage {
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) data: String,
 }
 
 pub struct Ping {
-	pub ponglen: u16,
-	pub byteslen: u16,
+	pub(crate) ponglen: u16,
+	pub(crate) byteslen: u16,
 }
 
 pub struct Pong {
-	pub byteslen: u16,
+	pub(crate) byteslen: u16,
 }
 
 pub struct OpenChannel {
-	pub chain_hash: Sha256dHash,
-	pub temporary_channel_id: Uint256,
-	pub funding_satoshis: u64,
-	pub push_msat: u64,
-	pub dust_limit_satoshis: u64,
-	pub max_htlc_value_in_flight_msat: u64,
-	pub channel_reserve_satoshis: u64,
-	pub htlc_minimum_msat: u64,
-	pub feerate_per_kw: u32,
-	pub to_self_delay: u16,
-	pub max_accepted_htlcs: u16,
-	pub funding_pubkey: PublicKey,
-	pub revocation_basepoint: PublicKey,
-	pub payment_basepoint: PublicKey,
-	pub delayed_payment_basepoint: PublicKey,
-	pub htlc_basepoint: PublicKey,
-	pub first_per_commitment_point: PublicKey,
-	pub channel_flags: u8,
-	pub shutdown_scriptpubkey: Option<Script>,
+	pub(crate) chain_hash: Sha256dHash,
+	pub(crate) temporary_channel_id: [u8; 32],
+	pub(crate) funding_satoshis: u64,
+	pub(crate) push_msat: u64,
+	pub(crate) dust_limit_satoshis: u64,
+	pub(crate) max_htlc_value_in_flight_msat: u64,
+	pub(crate) channel_reserve_satoshis: u64,
+	pub(crate) htlc_minimum_msat: u64,
+	pub(crate) feerate_per_kw: u32,
+	pub(crate) to_self_delay: u16,
+	pub(crate) max_accepted_htlcs: u16,
+	pub(crate) funding_pubkey: PublicKey,
+	pub(crate) revocation_basepoint: PublicKey,
+	pub(crate) payment_basepoint: PublicKey,
+	pub(crate) delayed_payment_basepoint: PublicKey,
+	pub(crate) htlc_basepoint: PublicKey,
+	pub(crate) first_per_commitment_point: PublicKey,
+	pub(crate) channel_flags: u8,
+	pub(crate) shutdown_scriptpubkey: Option<Script>,
 }
 
 pub struct AcceptChannel {
-	pub temporary_channel_id: Uint256,
-	pub dust_limit_satoshis: u64,
-	pub max_htlc_value_in_flight_msat: u64,
-	pub channel_reserve_satoshis: u64,
-	pub htlc_minimum_msat: u64,
-	pub minimum_depth: u32,
-	pub to_self_delay: u16,
-	pub max_accepted_htlcs: u16,
-	pub funding_pubkey: PublicKey,
-	pub revocation_basepoint: PublicKey,
-	pub payment_basepoint: PublicKey,
-	pub delayed_payment_basepoint: PublicKey,
-	pub htlc_basepoint: PublicKey,
-	pub first_per_commitment_point: PublicKey,
-	pub shutdown_scriptpubkey: Option<Script>,
+	pub(crate) temporary_channel_id: [u8; 32],
+	pub(crate) dust_limit_satoshis: u64,
+	pub(crate) max_htlc_value_in_flight_msat: u64,
+	pub(crate) channel_reserve_satoshis: u64,
+	pub(crate) htlc_minimum_msat: u64,
+	pub(crate) minimum_depth: u32,
+	pub(crate) to_self_delay: u16,
+	pub(crate) max_accepted_htlcs: u16,
+	pub(crate) funding_pubkey: PublicKey,
+	pub(crate) revocation_basepoint: PublicKey,
+	pub(crate) payment_basepoint: PublicKey,
+	pub(crate) delayed_payment_basepoint: PublicKey,
+	pub(crate) htlc_basepoint: PublicKey,
+	pub(crate) first_per_commitment_point: PublicKey,
+	pub(crate) shutdown_scriptpubkey: Option<Script>,
 }
 
 pub struct FundingCreated {
-	pub temporary_channel_id: Uint256,
-	pub funding_txid: Sha256dHash,
-	pub funding_output_index: u16,
-	pub signature: Signature,
+	pub(crate) temporary_channel_id: [u8; 32],
+	pub(crate) funding_txid: Sha256dHash,
+	pub(crate) funding_output_index: u16,
+	pub(crate) signature: Signature,
 }
 
 pub struct FundingSigned {
-	pub channel_id: Uint256,
-	pub signature: Signature,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) signature: Signature,
 }
 
 pub struct FundingLocked {
-	pub channel_id: Uint256,
-	pub next_per_commitment_point: PublicKey,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) next_per_commitment_point: PublicKey,
 }
 
 pub struct Shutdown {
-	pub channel_id: Uint256,
-	pub scriptpubkey: Script,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) scriptpubkey: Script,
 }
 
 pub struct ClosingSigned {
-	pub channel_id: Uint256,
-	pub fee_satoshis: u64,
-	pub signature: Signature,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) fee_satoshis: u64,
+	pub(crate) signature: Signature,
 }
 
 #[derive(Clone)]
 pub struct UpdateAddHTLC {
-	pub channel_id: Uint256,
-	pub htlc_id: u64,
-	pub amount_msat: u64,
-	pub payment_hash: [u8; 32],
-	pub cltv_expiry: u32,
-	pub onion_routing_packet: OnionPacket,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) htlc_id: u64,
+	pub(crate) amount_msat: u64,
+	pub(crate) payment_hash: [u8; 32],
+	pub(crate) cltv_expiry: u32,
+	pub(crate) onion_routing_packet: OnionPacket,
 }
 
 #[derive(Clone)]
 pub struct UpdateFulfillHTLC {
-	pub channel_id: Uint256,
-	pub htlc_id: u64,
-	pub payment_preimage: [u8; 32],
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) htlc_id: u64,
+	pub(crate) payment_preimage: [u8; 32],
 }
 
 #[derive(Clone)]
 pub struct UpdateFailHTLC {
-	pub channel_id: Uint256,
-	pub htlc_id: u64,
-	pub reason: OnionErrorPacket,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) htlc_id: u64,
+	pub(crate) reason: OnionErrorPacket,
 }
 
 #[derive(Clone)]
 pub struct UpdateFailMalformedHTLC {
-	pub channel_id: Uint256,
-	pub htlc_id: u64,
-	pub sha256_of_onion: [u8; 32],
-	pub failure_code: u16,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) htlc_id: u64,
+	pub(crate) sha256_of_onion: [u8; 32],
+	pub(crate) failure_code: u16,
 }
 
 #[derive(Clone)]
 pub struct CommitmentSigned {
-	pub channel_id: Uint256,
-	pub signature: Signature,
-	pub htlc_signatures: Vec<Signature>,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) signature: Signature,
+	pub(crate) htlc_signatures: Vec<Signature>,
 }
 
 pub struct RevokeAndACK {
-	pub channel_id: Uint256,
-	pub per_commitment_secret: [u8; 32],
-	pub next_per_commitment_point: PublicKey,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) per_commitment_secret: [u8; 32],
+	pub(crate) next_per_commitment_point: PublicKey,
 }
 
 pub struct UpdateFee {
-	pub channel_id: Uint256,
-	pub feerate_per_kw: u32,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) feerate_per_kw: u32,
+}
+
+pub(crate) struct DataLossProtect {
+	pub(crate) your_last_per_commitment_secret: [u8; 32],
+	pub(crate) my_current_per_commitment_point: PublicKey,
 }
 
 pub struct ChannelReestablish {
-	pub channel_id: Uint256,
-	pub next_local_commitment_number: u64,
-	pub next_remote_commitment_number: u64,
-	pub your_last_per_commitment_secret: Option<[u8; 32]>,
-	pub my_current_per_commitment_point: PublicKey,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) next_local_commitment_number: u64,
+	pub(crate) next_remote_commitment_number: u64,
+	pub(crate) data_loss_protect: Option<DataLossProtect>,
 }
 
 #[derive(Clone)]
 pub struct AnnouncementSignatures {
-	pub channel_id: Uint256,
-	pub short_channel_id: u64,
-	pub node_signature: Signature,
-	pub bitcoin_signature: Signature,
+	pub(crate) channel_id: [u8; 32],
+	pub(crate) short_channel_id: u64,
+	pub(crate) node_signature: Signature,
+	pub(crate) bitcoin_signature: Signature,
 }
 
 #[derive(Clone)]
@@ -322,74 +327,80 @@ pub struct UnsignedNodeAnnouncement {
 	pub alias: [u8; 32],
 	/// List of addresses on which this node is reachable. Note that you may only have up to one
 	/// address of each type, if you have more, they may be silently discarded or we may panic!
-	pub addresses: Vec<NetAddress>,
+	pub(crate) addresses: Vec<NetAddress>,
+	pub(crate) excess_address_data: Vec<u8>,
+	pub(crate) excess_data: Vec<u8>,
 }
 pub struct NodeAnnouncement {
-	pub signature: Signature,
-	pub contents: UnsignedNodeAnnouncement,
+	pub(crate) signature: Signature,
+	pub(crate) contents: UnsignedNodeAnnouncement,
 }
 
 #[derive(PartialEq, Clone)]
 pub struct UnsignedChannelAnnouncement {
-	pub features: GlobalFeatures,
-	pub chain_hash: Sha256dHash,
-	pub short_channel_id: u64,
-	pub node_id_1: PublicKey,
-	pub node_id_2: PublicKey,
-	pub bitcoin_key_1: PublicKey,
-	pub bitcoin_key_2: PublicKey,
+	pub(crate) features: GlobalFeatures,
+	pub(crate) chain_hash: Sha256dHash,
+	pub(crate) short_channel_id: u64,
+	pub        node_id_1: PublicKey,
+	pub        node_id_2: PublicKey,
+	pub(crate) bitcoin_key_1: PublicKey,
+	pub(crate) bitcoin_key_2: PublicKey,
+	pub(crate) excess_data: Vec<u8>,
 }
 #[derive(PartialEq, Clone)]
 pub struct ChannelAnnouncement {
-	pub node_signature_1: Signature,
-	pub node_signature_2: Signature,
-	pub bitcoin_signature_1: Signature,
-	pub bitcoin_signature_2: Signature,
-	pub contents: UnsignedChannelAnnouncement,
+	pub(crate) node_signature_1: Signature,
+	pub(crate) node_signature_2: Signature,
+	pub(crate) bitcoin_signature_1: Signature,
+	pub(crate) bitcoin_signature_2: Signature,
+	pub(crate) contents: UnsignedChannelAnnouncement,
 }
 
 #[derive(PartialEq, Clone)]
-pub struct UnsignedChannelUpdate {
-	pub chain_hash: Sha256dHash,
-	pub short_channel_id: u64,
-	pub timestamp: u32,
-	pub flags: u16,
-	pub cltv_expiry_delta: u16,
-	pub htlc_minimum_msat: u64,
-	pub fee_base_msat: u32,
-	pub fee_proportional_millionths: u32,
+pub(crate) struct UnsignedChannelUpdate {
+	pub(crate) chain_hash: Sha256dHash,
+	pub(crate) short_channel_id: u64,
+	pub(crate) timestamp: u32,
+	pub(crate) flags: u16,
+	pub(crate) cltv_expiry_delta: u16,
+	pub(crate) htlc_minimum_msat: u64,
+	pub(crate) fee_base_msat: u32,
+	pub(crate) fee_proportional_millionths: u32,
+	pub(crate) excess_data: Vec<u8>,
 }
 #[derive(PartialEq, Clone)]
 pub struct ChannelUpdate {
-	pub signature: Signature,
-	pub contents: UnsignedChannelUpdate,
+	pub(crate) signature: Signature,
+	pub(crate) contents: UnsignedChannelUpdate,
 }
 
 /// Used to put an error message in a HandleError
 pub enum ErrorAction {
-	/// Indicates an inbound HTLC add resulted in a failure, and the UpdateFailHTLC provided in msg
-	/// should be sent back to the sender.
-	UpdateFailHTLC {
-		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
 	pub err: &'static str,
-	pub msg: Option<ErrorAction>, //TODO: Make this required and rename it
+	pub action: Option<ErrorAction>, //TODO: Make this required
 }
 
 /// Struct used to return values from revoke_and_ack messages, containing a bunch of commitment
 /// transaction updates if they were pending.
 pub struct CommitmentUpdate {
-	pub update_add_htlcs: Vec<UpdateAddHTLC>,
-	pub update_fulfill_htlcs: Vec<UpdateFulfillHTLC>,
-	pub update_fail_htlcs: Vec<UpdateFailHTLC>,
-	pub commitment_signed: CommitmentSigned,
+	pub(crate) update_add_htlcs: Vec<UpdateAddHTLC>,
+	pub(crate) update_fulfill_htlcs: Vec<UpdateFulfillHTLC>,
+	pub(crate) update_fail_htlcs: Vec<UpdateFailHTLC>,
+	pub(crate) update_fail_malformed_htlcs: Vec<UpdateFailMalformedHTLC>,
+	pub(crate) commitment_signed: CommitmentSigned,
 }
 
 pub enum HTLCFailChannelUpdate {
@@ -429,66 +440,90 @@ pub trait ChannelMessageHandler : events::EventsProvider + Send + Sync {
 	// Channel-to-announce:
 	fn handle_announcement_signatures(&self, their_node_id: &PublicKey, msg: &AnnouncementSignatures) -> Result<(), HandleError>;
 
-	// Informational:
+	// 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);
+
+	fn peer_connected(&self, their_node_id: &PublicKey) -> Vec<ChannelReestablish>;
+	fn handle_channel_reestablish(&self, their_node_id: &PublicKey, msg: &ChannelReestablish) -> Result<(Option<FundingLocked>, Option<RevokeAndACK>, Option<CommitmentUpdate>), HandleError>;
+
+	// Error:
+	fn handle_error(&self, their_node_id: &PublicKey, msg: &ErrorMessage);
 }
 
 pub trait RoutingMessageHandler : Send + Sync {
-	fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<(), HandleError>;
+	fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<bool, HandleError>;
 	/// 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, HandleError>;
-	fn handle_channel_update(&self, msg: &ChannelUpdate) -> Result<(), HandleError>;
+	fn handle_channel_update(&self, msg: &ChannelUpdate) -> Result<bool, HandleError>;
 	fn handle_htlc_fail_channel_update(&self, update: &HTLCFailChannelUpdate);
 }
 
-pub struct OnionRealm0HopData {
-	pub short_channel_id: u64,
-	pub amt_to_forward: u64,
-	pub outgoing_cltv_value: u32,
+pub(crate) struct OnionRealm0HopData {
+	pub(crate) short_channel_id: u64,
+	pub(crate) amt_to_forward: u64,
+	pub(crate) outgoing_cltv_value: u32,
 	// 12 bytes of 0-padding
 }
 
-pub struct OnionHopData {
-	pub realm: u8,
-	pub data: OnionRealm0HopData,
-	pub hmac: [u8; 32],
-}
-unsafe impl internal_traits::NoDealloc for OnionHopData{}
+mod fuzzy_internal_msgs {
+	// These types aren't intended to be pub, but are exposed for direct fuzzing (as we deserialize
+	// them from untrusted input):
 
-#[derive(Clone)]
-pub struct OnionPacket {
-	pub version: u8,
-	pub public_key: PublicKey,
-	pub hop_data: [u8; 20*65],
-	pub hmac: [u8; 32],
+	use super::OnionRealm0HopData;
+	pub struct OnionHopData {
+		pub(crate) realm: u8,
+		pub(crate) data: OnionRealm0HopData,
+		pub(crate) hmac: [u8; 32],
+	}
+	unsafe impl ::util::internal_traits::NoDealloc for OnionHopData{}
+
+	pub struct DecodedOnionErrorPacket {
+		pub(crate) hmac: [u8; 32],
+		pub(crate) failuremsg: Vec<u8>,
+		pub(crate) pad: Vec<u8>,
+	}
 }
+#[cfg(feature = "fuzztarget")]
+pub use self::fuzzy_internal_msgs::*;
+#[cfg(not(feature = "fuzztarget"))]
+pub(crate) use self::fuzzy_internal_msgs::*;
 
-pub struct DecodedOnionErrorPacket {
-	pub hmac: [u8; 32],
-	pub failuremsg: Vec<u8>,
-	pub pad: Vec<u8>,
+#[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.
+	pub(crate) public_key: Result<PublicKey, secp256k1::Error>,
+	pub(crate) hop_data: [u8; 20*65],
+	pub(crate) hmac: [u8; 32],
 }
 
 #[derive(Clone)]
-pub struct OnionErrorPacket {
+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...
-	pub data: Vec<u8>,
+	pub(crate) data: Vec<u8>,
 }
 
 impl Error for DecodeError {
 	fn description(&self) -> &str {
 		match *self {
 			DecodeError::UnknownRealmByte => "Unknown realm byte in Onion packet",
+			DecodeError::UnknownRequiredFeature => "Unknown required feature preventing decode",
 			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",
+			DecodeError::Io(ref e) => e.description(),
+			DecodeError::InvalidValue => "0 or 1 is not found for boolean",
 		}
 	}
 }
@@ -504,1033 +539,680 @@ impl fmt::Debug for HandleError {
 	}
 }
 
-macro_rules! secp_pubkey {
-	( $ctx: expr, $slice: expr ) => {
-		match PublicKey::from_slice($ctx, $slice) {
-			Ok(key) => key,
-			Err(_) => return Err(DecodeError::BadPublicKey)
-		}
-	};
-}
-
-macro_rules! secp_signature {
-	( $ctx: expr, $slice: expr ) => {
-		match Signature::from_compact($ctx, $slice) {
-			Ok(sig) => sig,
-			Err(_) => return Err(DecodeError::BadSignature)
+impl From<::std::io::Error> for DecodeError {
+	fn from(e: ::std::io::Error) -> Self {
+		if e.kind() == ::std::io::ErrorKind::UnexpectedEof {
+			DecodeError::ShortRead
+		} else {
+			DecodeError::Io(e)
 		}
-	};
-}
-
-impl MsgDecodable for LocalFeatures {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 2 { return Err(DecodeError::WrongLength); }
-		let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
-		if v.len() < len + 2 { return Err(DecodeError::WrongLength); }
-		let mut flags = Vec::with_capacity(len);
-		flags.extend_from_slice(&v[2..2 + len]);
-		Ok(Self {
-			flags: flags
-		})
-	}
-}
-impl MsgEncodable for LocalFeatures {
-	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 MsgDecodable for GlobalFeatures {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 2 { return Err(DecodeError::WrongLength); }
-		let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
-		if v.len() < len + 2 { return Err(DecodeError::WrongLength); }
-		let mut flags = Vec::with_capacity(len);
-		flags.extend_from_slice(&v[2..2 + len]);
-		Ok(Self {
-			flags: flags
-		})
-	}
-}
-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 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);
+impl_writeable_len_match!(AcceptChannel, {
+		{AcceptChannel{ shutdown_scriptpubkey: Some(ref script), ..}, 270 + 2 + script.len()},
+		{_, 270}
+	}, {
+	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_basepoint,
+	delayed_payment_basepoint,
+	htlc_basepoint,
+	first_per_commitment_point,
+	shutdown_scriptpubkey
+});
+
+impl_writeable!(AnnouncementSignatures, 32+8+64*2, {
+	channel_id,
+	short_channel_id,
+	node_signature,
+	bitcoin_signature
+});
+
+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)?;
+		self.next_remote_commitment_number.write(w)?;
+		if let Some(ref data_loss_protect) = self.data_loss_protect {
+			data_loss_protect.your_last_per_commitment_secret.write(w)?;
+			data_loss_protect.my_current_per_commitment_point.write(w)?;
 		}
-		let local_features = LocalFeatures::decode(&v[global_features.flags.len() + 2..])?;
-		Ok(Self {
-			global_features: global_features,
-			local_features: local_features,
-		})
-	}
-}
-impl MsgEncodable for Init {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(self.global_features.flags.len() + self.local_features.flags.len());
-		res.extend_from_slice(&self.global_features.encode()[..]);
-		res.extend_from_slice(&self.local_features.encode()[..]);
-		res
+		Ok(())
 	}
 }
 
-impl MsgDecodable for Ping {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 4 {
-			return Err(DecodeError::WrongLength);
-		}
-		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);
-		}
+impl<R: Read> Readable<R> for ChannelReestablish{
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {
-			ponglen,
-			byteslen,
+			channel_id: Readable::read(r)?,
+			next_local_commitment_number: Readable::read(r)?,
+			next_remote_commitment_number: Readable::read(r)?,
+			data_loss_protect: {
+				match <[u8; 32] as Readable<R>>::read(r) {
+					Ok(your_last_per_commitment_secret) =>
+						Some(DataLossProtect {
+							your_last_per_commitment_secret,
+							my_current_per_commitment_point: Readable::read(r)?,
+						}),
+					Err(DecodeError::ShortRead) => None,
+					Err(e) => return Err(e)
+				}
+			}
 		})
 	}
 }
-impl MsgEncodable for Ping {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(self.byteslen as usize + 2);
-		res.extend_from_slice(&byte_utils::be16_to_array(self.byteslen));
-		res.resize(2 + self.byteslen as usize, 0);
-		res
-	}
-}
 
-impl MsgDecodable for Pong {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 2 {
-			return Err(DecodeError::WrongLength);
+impl_writeable!(ClosingSigned, 32+8+64, {
+	channel_id,
+	fee_satoshis,
+	signature
+});
+
+impl_writeable_len_match!(CommitmentSigned, {
+		{ CommitmentSigned { ref htlc_signatures, .. }, 32+64+2+htlc_signatures.len()*64 }
+	}, {
+	channel_id,
+	signature,
+	htlc_signatures
+});
+
+impl_writeable_len_match!(DecodedOnionErrorPacket, {
+		{ DecodedOnionErrorPacket { ref failuremsg, ref pad, .. }, 32 + 4 + failuremsg.len() + pad.len() }
+	}, {
+	hmac,
+	failuremsg,
+	pad
+});
+
+impl_writeable!(FundingCreated, 32+32+2+64, {
+	temporary_channel_id,
+	funding_txid,
+	funding_output_index,
+	signature
+});
+
+impl_writeable!(FundingSigned, 32+64, {
+	channel_id,
+	signature
+});
+
+impl_writeable!(FundingLocked, 32+33, {
+	channel_id,
+	next_per_commitment_point
+});
+
+impl_writeable_len_match!(GlobalFeatures, {
+		{ GlobalFeatures { ref flags }, flags.len() + 2 }
+	}, {
+	flags
+});
+
+impl_writeable_len_match!(LocalFeatures, {
+		{ LocalFeatures { ref flags }, flags.len() + 2 }
+	}, {
+	flags
+});
+
+impl_writeable_len_match!(Init, {
+		{ Init { ref global_features, ref local_features }, global_features.flags.len() + local_features.flags.len() + 4 }
+	}, {
+	global_features,
+	local_features
+});
+
+impl_writeable_len_match!(OpenChannel, {
+		{ OpenChannel { shutdown_scriptpubkey: Some(ref script), .. }, 319 + 2 + script.len() },
+		{ OpenChannel { shutdown_scriptpubkey: None, .. }, 319 }
+	}, {
+	chain_hash,
+	temporary_channel_id,
+	funding_satoshis,
+	push_msat,
+	dust_limit_satoshis,
+	max_htlc_value_in_flight_msat,
+	channel_reserve_satoshis,
+	htlc_minimum_msat,
+	feerate_per_kw,
+	to_self_delay,
+	max_accepted_htlcs,
+	funding_pubkey,
+	revocation_basepoint,
+	payment_basepoint,
+	delayed_payment_basepoint,
+	htlc_basepoint,
+	first_per_commitment_point,
+	channel_flags,
+	shutdown_scriptpubkey
+});
+
+impl_writeable!(RevokeAndACK, 32+32+33, {
+	channel_id,
+	per_commitment_secret,
+	next_per_commitment_point
+});
+
+impl_writeable_len_match!(Shutdown, {
+		{ Shutdown { ref scriptpubkey, .. }, 32 + 2 + scriptpubkey.len() }
+	}, {
+	channel_id,
+	scriptpubkey
+});
+
+impl_writeable_len_match!(UpdateFailHTLC, {
+		{ UpdateFailHTLC { ref reason, .. }, 32 + 10 + reason.data.len() }
+	}, {
+	channel_id,
+	htlc_id,
+	reason
+});
+
+impl_writeable!(UpdateFailMalformedHTLC, 32+8+32+2, {
+	channel_id,
+	htlc_id,
+	sha256_of_onion,
+	failure_code
+});
+
+impl_writeable!(UpdateFee, 32+4, {
+	channel_id,
+	feerate_per_kw
+});
+
+impl_writeable!(UpdateFulfillHTLC, 32+8+32, {
+	channel_id,
+	htlc_id,
+	payment_preimage
+});
+
+impl_writeable_len_match!(OnionErrorPacket, {
+		{ OnionErrorPacket { ref data, .. }, 2 + data.len() }
+	}, {
+	data
+});
+
+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 {
+			Ok(pubkey) => pubkey.write(w)?,
+			Err(_) => [0u8;33].write(w)?,
 		}
-		let byteslen = byte_utils::slice_to_be16(&v[0..2]);
-		if v.len() < 2 + byteslen as usize {
-			return Err(DecodeError::WrongLength);
-		}
-		Ok(Self {
-			byteslen
+		w.write_all(&self.hop_data)?;
+		self.hmac.write(w)?;
+		Ok(())
+	}
+}
+
+impl<R: Read> Readable<R> for OnionPacket {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		Ok(OnionPacket {
+			version: Readable::read(r)?,
+			public_key: {
+				let mut buf = [0u8;33];
+				r.read_exact(&mut buf)?;
+				PublicKey::from_slice(&Secp256k1::without_caps(), &buf)
+			},
+			hop_data: Readable::read(r)?,
+			hmac: Readable::read(r)?,
 		})
 	}
 }
-impl MsgEncodable for Pong {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(self.byteslen as usize + 2);
-		res.extend_from_slice(&byte_utils::be16_to_array(self.byteslen));
-		res.resize(2 + self.byteslen as usize, 0);
-		res
-	}
-}
 
-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);
-		}
-		let ctx = Secp256k1::without_caps();
+impl_writeable!(UpdateAddHTLC, 32+8+8+32+4+1366, {
+	channel_id,
+	htlc_id,
+	amount_msat,
+	payment_hash,
+	cltv_expiry,
+	onion_routing_packet
+});
 
-		let mut shutdown_scriptpubkey = None;
-		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);
-			}
-			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 {
-			chain_hash: deserialize(&v[0..32]).unwrap(),
-			temporary_channel_id: deserialize(&v[32..64]).unwrap(),
-			funding_satoshis: byte_utils::slice_to_be64(&v[64..72]),
-			push_msat: byte_utils::slice_to_be64(&v[72..80]),
-			dust_limit_satoshis: byte_utils::slice_to_be64(&v[80..88]),
-			max_htlc_value_in_flight_msat: byte_utils::slice_to_be64(&v[88..96]),
-			channel_reserve_satoshis: byte_utils::slice_to_be64(&v[96..104]),
-			htlc_minimum_msat: byte_utils::slice_to_be64(&v[104..112]),
-			feerate_per_kw: byte_utils::slice_to_be32(&v[112..116]),
-			to_self_delay: byte_utils::slice_to_be16(&v[116..118]),
-			max_accepted_htlcs: byte_utils::slice_to_be16(&v[118..120]),
-			funding_pubkey: secp_pubkey!(&ctx, &v[120..153]),
-			revocation_basepoint: secp_pubkey!(&ctx, &v[153..186]),
-			payment_basepoint: secp_pubkey!(&ctx, &v[186..219]),
-			delayed_payment_basepoint: secp_pubkey!(&ctx, &v[219..252]),
-			htlc_basepoint: secp_pubkey!(&ctx, &v[252..285]),
-			first_per_commitment_point: secp_pubkey!(&ctx, &v[285..318]),
-			channel_flags: v[318],
-			shutdown_scriptpubkey: shutdown_scriptpubkey
-		})
-	}
-}
-impl MsgEncodable for OpenChannel {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = match &self.shutdown_scriptpubkey {
-			&Some(ref script) => Vec::with_capacity(319 + 2 + script.len()),
-			&None => Vec::with_capacity(319),
-		};
-		res.extend_from_slice(&serialize(&self.chain_hash).unwrap());
-		res.extend_from_slice(&serialize(&self.temporary_channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be64_to_array(self.funding_satoshis));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.push_msat));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.dust_limit_satoshis));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.max_htlc_value_in_flight_msat));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.channel_reserve_satoshis));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_minimum_msat));
-		res.extend_from_slice(&byte_utils::be32_to_array(self.feerate_per_kw));
-		res.extend_from_slice(&byte_utils::be16_to_array(self.to_self_delay));
-		res.extend_from_slice(&byte_utils::be16_to_array(self.max_accepted_htlcs));
-		res.extend_from_slice(&self.funding_pubkey.serialize());
-		res.extend_from_slice(&self.revocation_basepoint.serialize());
-		res.extend_from_slice(&self.payment_basepoint.serialize());
-		res.extend_from_slice(&self.delayed_payment_basepoint.serialize());
-		res.extend_from_slice(&self.htlc_basepoint.serialize());
-		res.extend_from_slice(&self.first_per_commitment_point.serialize());
-		res.push(self.channel_flags);
-		if let &Some(ref script) = &self.shutdown_scriptpubkey {
-			res.extend_from_slice(&byte_utils::be16_to_array(script.len() as u16));
-			res.extend_from_slice(&script[..]);
-		}
-		res
+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)?;
+		self.outgoing_cltv_value.write(w)?;
+		w.write_all(&[0;12])?;
+		Ok(())
 	}
 }
 
-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);
-		}
-		let ctx = Secp256k1::without_caps();
-
-		let mut shutdown_scriptpubkey = None;
-		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);
+impl<R: Read> Readable<R> for OnionRealm0HopData {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		Ok(OnionRealm0HopData {
+			short_channel_id: Readable::read(r)?,
+			amt_to_forward: Readable::read(r)?,
+			outgoing_cltv_value: {
+				let v: u32 = Readable::read(r)?;
+				r.read_exact(&mut [0; 12])?;
+				v
 			}
-			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);
-		}
-
-		Ok(Self {
-			temporary_channel_id: deserialize(&v[0..32]).unwrap(),
-			dust_limit_satoshis: byte_utils::slice_to_be64(&v[32..40]),
-			max_htlc_value_in_flight_msat: byte_utils::slice_to_be64(&v[40..48]),
-			channel_reserve_satoshis: byte_utils::slice_to_be64(&v[48..56]),
-			htlc_minimum_msat: byte_utils::slice_to_be64(&v[56..64]),
-			minimum_depth: byte_utils::slice_to_be32(&v[64..68]),
-			to_self_delay: byte_utils::slice_to_be16(&v[68..70]),
-			max_accepted_htlcs: byte_utils::slice_to_be16(&v[70..72]),
-			funding_pubkey: secp_pubkey!(&ctx, &v[72..105]),
-			revocation_basepoint: secp_pubkey!(&ctx, &v[105..138]),
-			payment_basepoint: secp_pubkey!(&ctx, &v[138..171]),
-			delayed_payment_basepoint: secp_pubkey!(&ctx, &v[171..204]),
-			htlc_basepoint: secp_pubkey!(&ctx, &v[204..237]),
-			first_per_commitment_point: secp_pubkey!(&ctx, &v[237..270]),
-			shutdown_scriptpubkey: shutdown_scriptpubkey
 		})
 	}
 }
-impl MsgEncodable for AcceptChannel {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = match &self.shutdown_scriptpubkey {
-			&Some(ref script) => Vec::with_capacity(270 + 2 + script.len()),
-			&None => Vec::with_capacity(270),
-		};
-		res.extend_from_slice(&serialize(&self.temporary_channel_id).unwrap()[..]);
-		res.extend_from_slice(&byte_utils::be64_to_array(self.dust_limit_satoshis));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.max_htlc_value_in_flight_msat));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.channel_reserve_satoshis));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_minimum_msat));
-		res.extend_from_slice(&byte_utils::be32_to_array(self.minimum_depth));
-		res.extend_from_slice(&byte_utils::be16_to_array(self.to_self_delay));
-		res.extend_from_slice(&byte_utils::be16_to_array(self.max_accepted_htlcs));
-		res.extend_from_slice(&self.funding_pubkey.serialize());
-		res.extend_from_slice(&self.revocation_basepoint.serialize());
-		res.extend_from_slice(&self.payment_basepoint.serialize());
-		res.extend_from_slice(&self.delayed_payment_basepoint.serialize());
-		res.extend_from_slice(&self.htlc_basepoint.serialize());
-		res.extend_from_slice(&self.first_per_commitment_point.serialize());
-		if let &Some(ref script) = &self.shutdown_scriptpubkey {
-			res.extend_from_slice(&byte_utils::be16_to_array(script.len() as u16));
-			res.extend_from_slice(&script[..]);
-		}
-		res
-	}
-}
 
-impl MsgDecodable for FundingCreated {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+32+2+64 {
-			return Err(DecodeError::WrongLength);
-		}
-		let ctx = Secp256k1::without_caps();
-		Ok(Self {
-			temporary_channel_id: deserialize(&v[0..32]).unwrap(),
-			funding_txid: deserialize(&v[32..64]).unwrap(),
-			funding_output_index: byte_utils::slice_to_be16(&v[64..66]),
-			signature: secp_signature!(&ctx, &v[66..130]),
-		})
-	}
-}
-impl MsgEncodable for FundingCreated {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+32+2+64);
-		res.extend_from_slice(&serialize(&self.temporary_channel_id).unwrap()[..]);
-		res.extend_from_slice(&serialize(&self.funding_txid).unwrap()[..]);
-		res.extend_from_slice(&byte_utils::be16_to_array(self.funding_output_index));
-		let secp_ctx = Secp256k1::without_caps();
-		res.extend_from_slice(&self.signature.serialize_compact(&secp_ctx));
-		res
-	}
-}
-
-impl MsgDecodable for FundingSigned {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+64 {
-			return Err(DecodeError::WrongLength);
-		}
-		let ctx = Secp256k1::without_caps();
-		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			signature: secp_signature!(&ctx, &v[32..96]),
-		})
-	}
-}
-impl MsgEncodable for FundingSigned {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+64);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&self.signature.serialize_compact(&Secp256k1::without_caps()));
-		res
+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)?;
+		self.hmac.write(w)?;
+		Ok(())
 	}
 }
 
-impl MsgDecodable for FundingLocked {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+33 {
-			return Err(DecodeError::WrongLength);
-		}
-		let ctx = Secp256k1::without_caps();
-		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			next_per_commitment_point: secp_pubkey!(&ctx, &v[32..65]),
-		})
-	}
-}
-impl MsgEncodable for FundingLocked {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+33);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&self.next_per_commitment_point.serialize());
-		res
-	}
-}
-
-impl MsgDecodable for Shutdown {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32 + 2 {
-			return Err(DecodeError::WrongLength);
-		}
-		let scriptlen = byte_utils::slice_to_be16(&v[32..34]) as usize;
-		if v.len() < 32 + 2 + scriptlen {
-			return Err(DecodeError::WrongLength);
-		}
-		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			scriptpubkey: Script::from(v[34..34 + scriptlen].to_vec()),
+impl<R: Read> Readable<R> for OnionHopData {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		Ok(OnionHopData {
+			realm: {
+				let r: u8 = Readable::read(r)?;
+				if r != 0 {
+					return Err(DecodeError::UnknownRealmByte);
+				}
+				r
+			},
+			data: Readable::read(r)?,
+			hmac: Readable::read(r)?,
 		})
 	}
 }
-impl MsgEncodable for Shutdown {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32 + 2 + self.scriptpubkey.len());
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be16_to_array(self.scriptpubkey.len() as u16));
-		res.extend_from_slice(&self.scriptpubkey[..]);
-		res
-	}
-}
 
-impl MsgDecodable for ClosingSigned {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32 + 8 + 64 {
-			return Err(DecodeError::WrongLength);
-		}
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			fee_satoshis: byte_utils::slice_to_be64(&v[32..40]),
-			signature: secp_signature!(&secp_ctx, &v[40..104]),
-		})
-	}
-}
-impl MsgEncodable for ClosingSigned {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+8+64);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be64_to_array(self.fee_satoshis));
-		let secp_ctx = Secp256k1::without_caps();
-		res.extend_from_slice(&self.signature.serialize_compact(&secp_ctx));
-		res
+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
+		Ok(())
 	}
 }
 
-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);
-		}
-		let mut payment_hash = [0; 32];
-		payment_hash.copy_from_slice(&v[48..80]);
-		Ok(Self{
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			htlc_id: byte_utils::slice_to_be64(&v[32..40]),
-			amount_msat: byte_utils::slice_to_be64(&v[40..48]),
-			payment_hash,
-			cltv_expiry: byte_utils::slice_to_be32(&v[80..84]),
-			onion_routing_packet: OnionPacket::decode(&v[84..84+1366])?,
+impl<R: Read> Readable<R> for Ping {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		Ok(Ping {
+			ponglen: Readable::read(r)?,
+			byteslen: {
+				let byteslen = Readable::read(r)?;
+				r.read_exact(&mut vec![0u8; byteslen as usize][..])?;
+				byteslen
+			}
 		})
 	}
 }
-impl MsgEncodable for UpdateAddHTLC {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+8+8+32+4+1+1366);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_id));
-		res.extend_from_slice(&byte_utils::be64_to_array(self.amount_msat));
-		res.extend_from_slice(&self.payment_hash);
-		res.extend_from_slice(&byte_utils::be32_to_array(self.cltv_expiry));
-		res.extend_from_slice(&self.onion_routing_packet.encode()[..]);
-		res
-	}
-}
 
-impl MsgDecodable for UpdateFulfillHTLC {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+8+32 {
-			return Err(DecodeError::WrongLength);
-		}
-		let mut payment_preimage = [0; 32];
-		payment_preimage.copy_from_slice(&v[40..72]);
-		Ok(Self{
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			htlc_id: byte_utils::slice_to_be64(&v[32..40]),
-			payment_preimage,
-		})
-	}
-}
-impl MsgEncodable for UpdateFulfillHTLC {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+8+32);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_id));
-		res.extend_from_slice(&self.payment_preimage);
-		res
+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(())
 	}
 }
 
-impl MsgDecodable for UpdateFailHTLC {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+8 {
-			return Err(DecodeError::WrongLength);
-		}
-		Ok(Self{
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			htlc_id: byte_utils::slice_to_be64(&v[32..40]),
-			reason: OnionErrorPacket::decode(&v[40..])?,
+impl<R: Read> Readable<R> for Pong {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		Ok(Pong {
+			byteslen: {
+				let byteslen = Readable::read(r)?;
+				r.read_exact(&mut vec![0u8; byteslen as usize][..])?;
+				byteslen
+			}
 		})
 	}
 }
-impl MsgEncodable for UpdateFailHTLC {
-	fn encode(&self) -> Vec<u8> {
-		let reason = self.reason.encode();
-		let mut res = Vec::with_capacity(32+8+reason.len());
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_id));
-		res.extend_from_slice(&reason[..]);
-		res
-	}
-}
 
-impl MsgDecodable for UpdateFailMalformedHTLC {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+8+32+2 {
-			return Err(DecodeError::WrongLength);
-		}
-		let mut sha256_of_onion = [0; 32];
-		sha256_of_onion.copy_from_slice(&v[40..72]);
-		Ok(Self{
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			htlc_id: byte_utils::slice_to_be64(&v[32..40]),
-			sha256_of_onion,
-			failure_code: byte_utils::slice_to_be16(&v[72..74]),
-		})
-	}
-}
-impl MsgEncodable for UpdateFailMalformedHTLC {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+8+32+2);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_id));
-		res.extend_from_slice(&self.sha256_of_onion);
-		res.extend_from_slice(&byte_utils::be16_to_array(self.failure_code));
-		res
+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)?;
+		self.short_channel_id.write(w)?;
+		self.node_id_1.write(w)?;
+		self.node_id_2.write(w)?;
+		self.bitcoin_key_1.write(w)?;
+		self.bitcoin_key_2.write(w)?;
+		w.write_all(&self.excess_data[..])?;
+		Ok(())
 	}
 }
 
-impl MsgDecodable for CommitmentSigned {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+64+2 {
-			return Err(DecodeError::WrongLength);
-		}
-		let htlcs = byte_utils::slice_to_be16(&v[96..98]) as usize;
-		if v.len() < 32+64+2+htlcs*64 {
-			return Err(DecodeError::WrongLength);
-		}
-		let mut htlc_signatures = Vec::with_capacity(htlcs);
-		let secp_ctx = Secp256k1::without_caps();
-		for i in 0..htlcs {
-			htlc_signatures.push(secp_signature!(&secp_ctx, &v[98+i*64..98+(i+1)*64]));
-		}
+impl<R: Read> Readable<R> for UnsignedChannelAnnouncement {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			signature: secp_signature!(&secp_ctx, &v[32..96]),
-			htlc_signatures,
+			features: {
+				let f: GlobalFeatures = Readable::read(r)?;
+				if f.requires_unknown_bits() {
+					return Err(DecodeError::UnknownRequiredFeature);
+				}
+				f
+			},
+			chain_hash: Readable::read(r)?,
+			short_channel_id: Readable::read(r)?,
+			node_id_1: Readable::read(r)?,
+			node_id_2: Readable::read(r)?,
+			bitcoin_key_1: Readable::read(r)?,
+			bitcoin_key_2: Readable::read(r)?,
+			excess_data: {
+				let mut excess_data = vec![];
+				r.read_to_end(&mut excess_data)?;
+				excess_data
+			},
 		})
 	}
 }
-impl MsgEncodable for CommitmentSigned {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+64+2+self.htlc_signatures.len()*64);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		let secp_ctx = Secp256k1::without_caps();
-		res.extend_from_slice(&self.signature.serialize_compact(&secp_ctx));
-		res.extend_from_slice(&byte_utils::be16_to_array(self.htlc_signatures.len() as u16));
-		for i in 0..self.htlc_signatures.len() {
-			res.extend_from_slice(&self.htlc_signatures[i].serialize_compact(&secp_ctx));
-		}
-		res
-	}
-}
 
-impl MsgDecodable for RevokeAndACK {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+32+33 {
-			return Err(DecodeError::WrongLength);
-		}
-		let mut per_commitment_secret = [0; 32];
-		per_commitment_secret.copy_from_slice(&v[32..64]);
-		let secp_ctx = Secp256k1::without_caps();
+impl_writeable_len_match!(ChannelAnnouncement, {
+		{ ChannelAnnouncement { contents: UnsignedChannelAnnouncement {ref features, ref excess_data, ..}, .. },
+			2 + 2*32 + 4*33 + features.flags.len() + excess_data.len() + 4*64 }
+	}, {
+	node_signature_1,
+	node_signature_2,
+	bitcoin_signature_1,
+	bitcoin_signature_2,
+	contents
+});
+
+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)?;
+		self.timestamp.write(w)?;
+		self.flags.write(w)?;
+		self.cltv_expiry_delta.write(w)?;
+		self.htlc_minimum_msat.write(w)?;
+		self.fee_base_msat.write(w)?;
+		self.fee_proportional_millionths.write(w)?;
+		w.write_all(&self.excess_data[..])?;
+		Ok(())
+	}
+}
+
+impl<R: Read> Readable<R> for UnsignedChannelUpdate {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			per_commitment_secret,
-			next_per_commitment_point: secp_pubkey!(&secp_ctx, &v[64..97]),
+			chain_hash: Readable::read(r)?,
+			short_channel_id: Readable::read(r)?,
+			timestamp: Readable::read(r)?,
+			flags: Readable::read(r)?,
+			cltv_expiry_delta: Readable::read(r)?,
+			htlc_minimum_msat: Readable::read(r)?,
+			fee_base_msat: Readable::read(r)?,
+			fee_proportional_millionths: Readable::read(r)?,
+			excess_data: {
+				let mut excess_data = vec![];
+				r.read_to_end(&mut excess_data)?;
+				excess_data
+			},
 		})
 	}
 }
-impl MsgEncodable for RevokeAndACK {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+32+33);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&self.per_commitment_secret);
-		res.extend_from_slice(&self.next_per_commitment_point.serialize());
-		res
+
+impl_writeable_len_match!(ChannelUpdate, {
+		{ ChannelUpdate { contents: UnsignedChannelUpdate {ref excess_data, ..}, .. },
+			64 + excess_data.len() + 64 }
+	}, {
+	signature,
+	contents
+});
+
+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)?;
+		w.write_all(self.data.as_bytes())?;
+		Ok(())
 	}
 }
 
-impl MsgDecodable for UpdateFee {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+4 {
-			return Err(DecodeError::WrongLength);
-		}
+impl<R: Read> Readable<R> for ErrorMessage {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			feerate_per_kw: byte_utils::slice_to_be32(&v[32..36]),
+			channel_id: Readable::read(r)?,
+			data: {
+				let mut sz: usize = <u16 as Readable<R>>::read(r)? as usize;
+				let mut data = vec![];
+				let data_len = r.read_to_end(&mut data)?;
+				sz = cmp::min(data_len, sz);
+				match String::from_utf8(data[..sz as usize].to_vec()) {
+					Ok(s) => s,
+					Err(_) => return Err(DecodeError::BadText),
+				}
+			}
 		})
 	}
 }
-impl MsgEncodable for UpdateFee {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+4);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be32_to_array(self.feerate_per_kw));
-		res
-	}
-}
 
-impl MsgDecodable for ChannelReestablish {
-	fn decode(_v: &[u8]) -> Result<Self, DecodeError> {
-		unimplemented!();
-	}
-}
-impl MsgEncodable for ChannelReestablish {
-	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
-	}
-}
+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)?;
+		self.node_id.write(w)?;
+		w.write_all(&self.rgb)?;
+		self.alias.write(w)?;
 
-impl MsgDecodable for AnnouncementSignatures {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32+8+64*2 {
-			return Err(DecodeError::WrongLength);
+		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));
+				},
+			}
 		}
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			channel_id: deserialize(&v[0..32]).unwrap(),
-			short_channel_id: byte_utils::slice_to_be64(&v[32..40]),
-			node_signature: secp_signature!(&secp_ctx, &v[40..104]),
-			bitcoin_signature: secp_signature!(&secp_ctx, &v[104..168]),
-		})
-	}
-}
-impl MsgEncodable for AnnouncementSignatures {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(32+8+64*2);
-		res.extend_from_slice(&serialize(&self.channel_id).unwrap());
-		res.extend_from_slice(&byte_utils::be64_to_array(self.short_channel_id));
-		let secp_ctx = Secp256k1::without_caps();
-		res.extend_from_slice(&self.node_signature.serialize_compact(&secp_ctx));
-		res.extend_from_slice(&self.bitcoin_signature.serialize_compact(&secp_ctx));
-		res
+		((addr_slice.len() + self.excess_address_data.len()) as u16).write(w)?;
+		w.write_all(&addr_slice[..])?;
+		w.write_all(&self.excess_address_data[..])?;
+		w.write_all(&self.excess_data[..])?;
+		Ok(())
 	}
 }
 
-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);
+impl<R: Read> Readable<R> for UnsignedNodeAnnouncement {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		let features: GlobalFeatures = Readable::read(r)?;
+		if features.requires_unknown_bits() {
+			return Err(DecodeError::UnknownRequiredFeature);
 		}
-		let start = features.encoded_len();
-
+		let timestamp: u32 = Readable::read(r)?;
+		let node_id: PublicKey = Readable::read(r)?;
 		let mut rgb = [0; 3];
-		rgb.copy_from_slice(&v[start + 37..start + 40]);
-
-		let mut alias = [0; 32];
-		alias.copy_from_slice(&v[start + 40..start + 72]);
-
-		let addrlen = byte_utils::slice_to_be16(&v[start + 72..start + 74]) as usize;
-		if v.len() < start + 74 + addrlen {
-			return Err(DecodeError::WrongLength);
-		}
+		r.read_exact(&mut rgb)?;
+		let alias: [u8; 32] = Readable::read(r)?;
 
+		let addrlen: u16 = Readable::read(r)?;
+		let mut addr_readpos = 0;
 		let mut addresses = Vec::with_capacity(4);
-		let mut read_pos = start + 74;
+		let mut f: u8 = 0;
+		let mut excess = 0;
 		loop {
-			if v.len() <= read_pos { break; }
-			match v[read_pos] {
-				0 => { read_pos += 1; },
+			if addrlen <= addr_readpos { break; }
+			f = Readable::read(r)?;
+			match f {
 				1 => {
-					if v.len() < read_pos + 1 + 6 {
-						return Err(DecodeError::WrongLength);
-					}
 					if addresses.len() > 0 {
 						return Err(DecodeError::ExtraAddressesPerType);
 					}
-					let mut addr = [0; 4];
-					addr.copy_from_slice(&v[read_pos + 1..read_pos + 5]);
+					if addrlen < addr_readpos + 1 + 6 {
+						return Err(DecodeError::BadLengthDescriptor);
+					}
 					addresses.push(NetAddress::IPv4 {
-						addr,
-						port: byte_utils::slice_to_be16(&v[read_pos + 5..read_pos + 7]),
+						addr: {
+							let mut addr = [0; 4];
+							r.read_exact(&mut addr)?;
+							addr
+						},
+						port: Readable::read(r)?,
 					});
-					read_pos += 1 + 6;
+					addr_readpos += 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);
 					}
-					let mut addr = [0; 16];
-					addr.copy_from_slice(&v[read_pos + 1..read_pos + 17]);
+					if addrlen < addr_readpos + 1 + 18 {
+						return Err(DecodeError::BadLengthDescriptor);
+					}
 					addresses.push(NetAddress::IPv6 {
-						addr,
-						port: byte_utils::slice_to_be16(&v[read_pos + 17..read_pos + 19]),
+						addr: {
+							let mut addr = [0; 16];
+							r.read_exact(&mut addr)?;
+							addr
+						},
+						port: Readable::read(r)?,
 					});
-					read_pos += 1 + 18;
+					addr_readpos += 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);
 					}
-					let mut addr = [0; 10];
-					addr.copy_from_slice(&v[read_pos + 1..read_pos + 11]);
+					if addrlen < addr_readpos + 1 + 12 {
+						return Err(DecodeError::BadLengthDescriptor);
+					}
 					addresses.push(NetAddress::OnionV2 {
-						addr,
-						port: byte_utils::slice_to_be16(&v[read_pos + 11..read_pos + 13]),
+						addr: {
+							let mut addr = [0; 10];
+							r.read_exact(&mut addr)?;
+							addr
+						},
+						port: Readable::read(r)?,
 					});
-					read_pos += 1 + 12;
+					addr_readpos += 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);
 					}
-					let mut ed25519_pubkey = [0; 32];
-					ed25519_pubkey.copy_from_slice(&v[read_pos + 1..read_pos + 33]);
+					if addrlen < addr_readpos + 1 + 37 {
+						return Err(DecodeError::BadLengthDescriptor);
+					}
 					addresses.push(NetAddress::OnionV3 {
-						ed25519_pubkey,
-						checksum: byte_utils::slice_to_be16(&v[read_pos + 33..read_pos + 35]),
-						version: v[read_pos + 35],
-						port: byte_utils::slice_to_be16(&v[read_pos + 36..read_pos + 38]),
+						ed25519_pubkey: Readable::read(r)?,
+						checksum: Readable::read(r)?,
+						version: Readable::read(r)?,
+						port: Readable::read(r)?,
 					});
-					read_pos += 1 + 37;
+					addr_readpos += 1 + 37
 				},
-				_ => { break; } // We've read all we can, we dont understand anything higher (and they're sorted)
+				_ => { excess = 1; break; }
 			}
 		}
 
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			features,
-			timestamp: byte_utils::slice_to_be32(&v[start..start + 4]),
-			node_id: secp_pubkey!(&secp_ctx, &v[start + 4..start + 37]),
-			rgb,
-			alias,
-			addresses,
-		})
-	}
-}
-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());
-		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));
-				},
+		let mut excess_data = vec![];
+		let excess_address_data = if addr_readpos < addrlen {
+			let mut excess_address_data = vec![0; (addrlen - addr_readpos) as usize];
+			r.read_exact(&mut excess_address_data[excess..])?;
+			if excess == 1 {
+				excess_address_data[0] = f;
 			}
-		}
-		res.extend_from_slice(&byte_utils::be16_to_array(addr_slice.len() as u16));
-		res.extend_from_slice(&addr_slice[..]);
-		res
-	}
-}
-
-impl MsgDecodable for NodeAnnouncement {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 64 {
-			return Err(DecodeError::WrongLength);
-		}
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			signature: secp_signature!(&secp_ctx, &v[0..64]),
-			contents: UnsignedNodeAnnouncement::decode(&v[64..])?,
-		})
-	}
-}
-impl MsgEncodable for NodeAnnouncement {
-	fn encode(&self) -> Vec<u8> {
-		let contents = self.contents.encode();
-		let mut res = Vec::with_capacity(64 + contents.len());
-		let secp_ctx = Secp256k1::without_caps();
-		res.extend_from_slice(&self.signature.serialize_compact(&secp_ctx));
-		res.extend_from_slice(&contents);
-		res
-	}
-}
-
-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);
-		}
-		let start = features.encoded_len();
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			features,
-			chain_hash: deserialize(&v[start..start + 32]).unwrap(),
-			short_channel_id: byte_utils::slice_to_be64(&v[start + 32..start + 40]),
-			node_id_1: secp_pubkey!(&secp_ctx, &v[start + 40..start + 73]),
-			node_id_2: secp_pubkey!(&secp_ctx, &v[start + 73..start + 106]),
-			bitcoin_key_1: secp_pubkey!(&secp_ctx, &v[start + 106..start + 139]),
-			bitcoin_key_2: secp_pubkey!(&secp_ctx, &v[start + 139..start + 172]),
-		})
-	}
-}
-impl MsgEncodable for UnsignedChannelAnnouncement {
-	fn encode(&self) -> Vec<u8> {
-		let features = self.features.encode();
-		let mut res = Vec::with_capacity(172 + features.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
-	}
-}
-
-impl MsgDecodable for ChannelAnnouncement {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 64*4 {
-			return Err(DecodeError::WrongLength);
-		}
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			node_signature_1: secp_signature!(&secp_ctx, &v[0..64]),
-			node_signature_2: secp_signature!(&secp_ctx, &v[64..128]),
-			bitcoin_signature_1: secp_signature!(&secp_ctx, &v[128..192]),
-			bitcoin_signature_2: secp_signature!(&secp_ctx, &v[192..256]),
-			contents: UnsignedChannelAnnouncement::decode(&v[256..])?,
-		})
-	}
-}
-impl MsgEncodable for ChannelAnnouncement {
-	fn encode(&self) -> Vec<u8> {
-		let secp_ctx = Secp256k1::without_caps();
-		let contents = self.contents.encode();
-		let mut res = Vec::with_capacity(64 + contents.len());
-		res.extend_from_slice(&self.node_signature_1.serialize_compact(&secp_ctx));
-		res.extend_from_slice(&self.node_signature_2.serialize_compact(&secp_ctx));
-		res.extend_from_slice(&self.bitcoin_signature_1.serialize_compact(&secp_ctx));
-		res.extend_from_slice(&self.bitcoin_signature_2.serialize_compact(&secp_ctx));
-		res.extend_from_slice(&contents);
-		res
-	}
-}
-
-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);
-		}
-		Ok(Self {
-			chain_hash: deserialize(&v[0..32]).unwrap(),
-			short_channel_id: byte_utils::slice_to_be64(&v[32..40]),
-			timestamp: byte_utils::slice_to_be32(&v[40..44]),
-			flags: byte_utils::slice_to_be16(&v[44..46]),
-			cltv_expiry_delta: byte_utils::slice_to_be16(&v[46..48]),
-			htlc_minimum_msat: byte_utils::slice_to_be64(&v[48..56]),
-			fee_base_msat: byte_utils::slice_to_be32(&v[56..60]),
-			fee_proportional_millionths: byte_utils::slice_to_be32(&v[60..64]),
-		})
-	}
-}
-impl MsgEncodable for UnsignedChannelUpdate {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(64);
-		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
-	}
-}
+			excess_address_data
+		} else {
+			if excess == 1 {
+				excess_data.push(f);
+			}
+			Vec::new()
+		};
 
-impl MsgDecodable for ChannelUpdate {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 128 {
-			return Err(DecodeError::WrongLength);
-		}
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			signature: secp_signature!(&secp_ctx, &v[0..64]),
-			contents: UnsignedChannelUpdate::decode(&v[64..])?,
+		Ok(UnsignedNodeAnnouncement {
+			features: features,
+			timestamp: timestamp,
+			node_id: node_id,
+			rgb: rgb,
+			alias: alias,
+			addresses: addresses,
+			excess_address_data: excess_address_data,
+			excess_data: {
+				r.read_to_end(&mut excess_data)?;
+				excess_data
+			},
 		})
 	}
 }
-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 MsgDecodable for OnionRealm0HopData {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32 {
-			return Err(DecodeError::WrongLength);
-		}
-		Ok(OnionRealm0HopData {
-			short_channel_id: byte_utils::slice_to_be64(&v[0..8]),
-			amt_to_forward: byte_utils::slice_to_be64(&v[8..16]),
-			outgoing_cltv_value: byte_utils::slice_to_be32(&v[16..20]),
-		})
-	}
-}
-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 MsgDecodable for OnionHopData {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 65 {
-			return Err(DecodeError::WrongLength);
-		}
-		let realm = v[0];
-		if realm != 0 {
-			return Err(DecodeError::UnknownRealmByte);
-		}
-		let mut hmac = [0; 32];
-		hmac[..].copy_from_slice(&v[33..65]);
-		Ok(OnionHopData {
-			realm: realm,
-			data: OnionRealm0HopData::decode(&v[1..33])?,
-			hmac: hmac,
-		})
-	}
-}
-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_writeable_len_match!(NodeAnnouncement, {
+		{ NodeAnnouncement { contents: UnsignedNodeAnnouncement { ref features, ref addresses, ref excess_address_data, ref excess_data, ..}, .. },
+			64 + 76 + features.flags.len() + addresses.len()*38 + excess_address_data.len() + excess_data.len() }
+	}, {
+	signature,
+	contents
+});
+
+#[cfg(test)]
+mod tests {
+	use hex;
+	use ln::msgs;
+	use util::ser::Writeable;
+	use secp256k1::key::{PublicKey,SecretKey};
+	use secp256k1::Secp256k1;
+
+	#[test]
+	fn encoding_channel_reestablish_no_secret() {
+		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,
+			data_loss_protect: None,
+		};
 
-impl MsgDecodable for OnionPacket {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 1+33+20*65+32 {
-			return Err(DecodeError::WrongLength);
-		}
-		let mut hop_data = [0; 20*65];
-		hop_data.copy_from_slice(&v[34..1334]);
-		let mut hmac = [0; 32];
-		hmac.copy_from_slice(&v[1334..1366]);
-		let secp_ctx = Secp256k1::without_caps();
-		Ok(Self {
-			version: v[0],
-			public_key: secp_pubkey!(&secp_ctx, &v[1..34]),
-			hop_data,
-			hmac,
-		})
-	}
-}
-impl MsgEncodable for OnionPacket {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(1 + 33 + 20*65 + 32);
-		res.push(self.version);
-		res.extend_from_slice(&self.public_key.serialize());
-		res.extend_from_slice(&self.hop_data);
-		res.extend_from_slice(&self.hmac);
-		res
+		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]
+		);
 	}
-}
 
-impl MsgDecodable for DecodedOnionErrorPacket {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 32 + 4 {
-			return Err(DecodeError::WrongLength);
-		}
-		let failuremsg_len = byte_utils::slice_to_be16(&v[32..34]) as usize;
-		if v.len() < 32 + 4 + failuremsg_len {
-			return Err(DecodeError::WrongLength);
-		}
-		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);
-		}
+	#[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 mut hmac = [0; 32];
-		hmac.copy_from_slice(&v[0..32]);
-		Ok(Self {
-			hmac,
-			failuremsg: v[34..34 + failuremsg_len].to_vec(),
-			pad: v[36 + failuremsg_len..36 + failuremsg_len + padding_len].to_vec(),
-		})
-	}
-}
-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
-	}
-}
+		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,
+			data_loss_protect: Some(msgs::DataLossProtect { your_last_per_commitment_secret: [9;32], my_current_per_commitment_point: public_key}),
+		};
 
-impl MsgDecodable for OnionErrorPacket {
-	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 2 {
-			return Err(DecodeError::WrongLength);
-		}
-		let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
-		if v.len() < 2 + len {
-			return Err(DecodeError::WrongLength);
-		}
-		Ok(Self {
-			data: v[2..len+2].to_vec(),
-		})
-	}
-}
-impl MsgEncodable for OnionErrorPacket {
-	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(2 + self.data.len());
-		res.extend_from_slice(&byte_utils::be16_to_array(self.data.len() as u16));
-		res.extend_from_slice(&self.data);
-		res
+		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]
+		);
 	}
 }