X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fmsgs.rs;h=bc7c0ed98b3c38052df2fa06f8eccb9078a2bd1f;hb=aec0fa485c8e1113f0a6d24c2f18e4ba90fe568d;hp=681817a9e1c007720d15da34c95f4f26ef51eeab;hpb=8e2974fc2a5871c33584f8b5c90b65a8450f2a5d;p=rust-lightning

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 681817a9..bc7c0ed9 100644
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -61,9 +61,16 @@ impl LocalFeatures {
 		self.flags.len() > 0 && (self.flags[0] & 1) != 0
 	}
 
-	pub fn supports_initial_routing_sync(&self) -> bool {
+	pub fn initial_routing_sync(&self) -> bool {
 		self.flags.len() > 0 && (self.flags[0] & (1 << 3)) != 0
 	}
+	pub fn set_initial_routing_sync(&mut self) {
+		if self.flags.len() == 0 {
+			self.flags.resize(1, 1 << 3);
+		} else {
+			self.flags[0] |= 1 << 3;
+		}
+	}
 
 	pub fn supports_upfront_shutdown_script(&self) -> bool {
 		self.flags.len() > 0 && (self.flags[0] & (3 << 4)) != 0
@@ -132,6 +139,15 @@ pub struct Init {
 	pub local_features: LocalFeatures,
 }
 
+pub struct Ping {
+	pub ponglen: u16,
+	pub byteslen: u16,
+}
+
+pub struct Pong {
+	pub byteslen: u16,
+}
+
 pub struct OpenChannel {
 	pub chain_hash: Sha256dHash,
 	pub temporary_channel_id: Uint256,
@@ -357,7 +373,9 @@ pub enum ErrorAction {
 		msg: UpdateFailHTLC
 	},
 	/// The peer took some action which made us think they were useless. Disconnect them.
-	DisconnectPeer {},
+	DisconnectPeer,
+	/// The peer did something harmless that we weren't able to process, just log and ignore
+	IgnoreError,
 }
 
 pub struct HandleError { //TODO: rename me
@@ -386,7 +404,7 @@ pub enum HTLCFailChannelUpdate {
 /// A trait to describe an object which can receive channel messages. Messages MAY be called in
 /// paralell when they originate from different their_node_ids, however they MUST NOT be called in
 /// paralell when the two calls have the same their_node_id.
-pub trait ChannelMessageHandler : events::EventsProvider {
+pub trait ChannelMessageHandler : events::EventsProvider + Send + Sync {
 	//Channel init:
 	fn handle_open_channel(&self, their_node_id: &PublicKey, msg: &OpenChannel) -> Result<AcceptChannel, HandleError>;
 	fn handle_accept_channel(&self, their_node_id: &PublicKey, msg: &AcceptChannel) -> Result<(), HandleError>;
@@ -419,7 +437,7 @@ pub trait ChannelMessageHandler : events::EventsProvider {
 	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);
 }
 
-pub trait RoutingMessageHandler {
+pub trait RoutingMessageHandler : Send + Sync {
 	fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<(), HandleError>;
 	/// Handle a channel_announcement message, returning true if it should be forwarded on, false
 	/// or returning an Err otherwise.
@@ -506,7 +524,7 @@ macro_rules! secp_signature {
 
 impl MsgDecodable for LocalFeatures {
 	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 3 { return Err(DecodeError::WrongLength); }
+		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);
@@ -528,7 +546,7 @@ impl MsgEncodable for LocalFeatures {
 
 impl MsgDecodable for GlobalFeatures {
 	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 3 { return Err(DecodeError::WrongLength); }
+		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);
@@ -570,6 +588,54 @@ impl MsgEncodable for Init {
 	}
 }
 
+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);
+		}
+		Ok(Self {
+			ponglen,
+			byteslen,
+		})
+	}
+}
+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);
+		}
+		let byteslen = byte_utils::slice_to_be16(&v[0..2]);
+		if v.len() < 2 + byteslen as usize {
+			return Err(DecodeError::WrongLength);
+		}
+		Ok(Self {
+			byteslen
+		})
+	}
+}
+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 {
@@ -613,7 +679,33 @@ impl MsgDecodable for OpenChannel {
 }
 impl MsgEncodable for OpenChannel {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -722,7 +814,10 @@ impl MsgDecodable for FundingSigned {
 }
 impl MsgEncodable for FundingSigned {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -809,13 +904,20 @@ impl MsgDecodable for UpdateAddHTLC {
 			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..])?,
+			onion_routing_packet: OnionPacket::decode(&v[84..84+1366])?,
 		})
 	}
 }
 impl MsgEncodable for UpdateAddHTLC {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -835,7 +937,11 @@ impl MsgDecodable for UpdateFulfillHTLC {
 }
 impl MsgEncodable for UpdateFulfillHTLC {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -853,7 +959,12 @@ impl MsgDecodable for UpdateFailHTLC {
 }
 impl MsgEncodable for UpdateFailHTLC {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -874,7 +985,12 @@ impl MsgDecodable for UpdateFailMalformedHTLC {
 }
 impl MsgEncodable for UpdateFailMalformedHTLC {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -901,7 +1017,15 @@ impl MsgDecodable for CommitmentSigned {
 }
 impl MsgEncodable for CommitmentSigned {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -922,7 +1046,11 @@ impl MsgDecodable for RevokeAndACK {
 }
 impl MsgEncodable for RevokeAndACK {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -939,7 +1067,10 @@ impl MsgDecodable for UpdateFee {
 }
 impl MsgEncodable for UpdateFee {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -1141,7 +1272,12 @@ impl MsgDecodable for NodeAnnouncement {
 }
 impl MsgEncodable for NodeAnnouncement {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -1196,7 +1332,15 @@ impl MsgDecodable for ChannelAnnouncement {
 }
 impl MsgEncodable for ChannelAnnouncement {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
 
@@ -1384,7 +1528,9 @@ impl MsgDecodable for OnionErrorPacket {
 }
 impl MsgEncodable for OnionErrorPacket {
 	fn encode(&self) -> Vec<u8> {
-		unimplemented!();
+		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
 	}
 }
-