X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FChannelMessageHandler.ts;h=bc81d097b14c0484550a6673c7d242d14e072215;hb=d4846238a5f4245ac3cee8dbf3f196ad964564d5;hp=52144c80955458149466f01ae90be06251168ac8;hpb=acecce750cf1159a51f9d1a4dbfd717520739e92;p=ldk-java

diff --git a/ts/structs/ChannelMessageHandler.ts b/ts/structs/ChannelMessageHandler.ts
index 52144c80..bc81d097 100644
--- a/ts/structs/ChannelMessageHandler.ts
+++ b/ts/structs/ChannelMessageHandler.ts
@@ -35,12 +35,14 @@ import * as bindings from '../bindings' // TODO: figure out location
                         // todo: in-line interface filling
                         handle_open_channel (their_node_id: Uint8Array, their_features: number, msg: number): void {
 							const their_features_hu_conv: InitFeatures = new InitFeatures(null, their_features);
+				their_features_hu_conv.ptrs_to.add(this);
 							const msg_hu_conv: OpenChannel = new OpenChannel(null, msg);
 							arg.handle_open_channel(their_node_id, their_features_hu_conv, msg_hu_conv);
 						},
 
 						handle_accept_channel (their_node_id: Uint8Array, their_features: number, msg: number): void {
 							const their_features_hu_conv: InitFeatures = new InitFeatures(null, their_features);
+				their_features_hu_conv.ptrs_to.add(this);
 							const msg_hu_conv: AcceptChannel = new AcceptChannel(null, msg);
 							arg.handle_accept_channel(their_node_id, their_features_hu_conv, msg_hu_conv);
 						},
@@ -60,9 +62,10 @@ import * as bindings from '../bindings' // TODO: figure out location
 							arg.handle_funding_locked(their_node_id, msg_hu_conv);
 						},
 
-						handle_shutdown (their_node_id: Uint8Array, msg: number): void {
+						handle_shutdown (their_node_id: Uint8Array, their_features: number, msg: number): void {
+							const their_features_hu_conv: InitFeatures = new InitFeatures(null, their_features);
 							const msg_hu_conv: Shutdown = new Shutdown(null, msg);
-							arg.handle_shutdown(their_node_id, msg_hu_conv);
+							arg.handle_shutdown(their_node_id, their_features_hu_conv, msg_hu_conv);
 						},
 
 						handle_closing_signed (their_node_id: Uint8Array, msg: number): void {
@@ -124,6 +127,11 @@ import * as bindings from '../bindings' // TODO: figure out location
 							arg.handle_channel_reestablish(their_node_id, msg_hu_conv);
 						},
 
+						handle_channel_update (their_node_id: Uint8Array, msg: number): void {
+							const msg_hu_conv: ChannelUpdate = new ChannelUpdate(null, msg);
+							arg.handle_channel_update(their_node_id, msg_hu_conv);
+						},
+
 						handle_error (their_node_id: Uint8Array, msg: number): void {
 							const msg_hu_conv: ErrorMessage = new ErrorMessage(null, msg);
 							arg.handle_error(their_node_id, msg_hu_conv);
@@ -141,7 +149,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 				handle_funding_created(their_node_id: Uint8Array, msg: FundingCreated): void;
 				handle_funding_signed(their_node_id: Uint8Array, msg: FundingSigned): void;
 				handle_funding_locked(their_node_id: Uint8Array, msg: FundingLocked): void;
-				handle_shutdown(their_node_id: Uint8Array, msg: Shutdown): void;
+				handle_shutdown(their_node_id: Uint8Array, their_features: InitFeatures, msg: Shutdown): void;
 				handle_closing_signed(their_node_id: Uint8Array, msg: ClosingSigned): void;
 				handle_update_add_htlc(their_node_id: Uint8Array, msg: UpdateAddHTLC): void;
 				handle_update_fulfill_htlc(their_node_id: Uint8Array, msg: UpdateFulfillHTLC): void;
@@ -154,6 +162,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 				peer_disconnected(their_node_id: Uint8Array, no_connection_possible: boolean): void;
 				peer_connected(their_node_id: Uint8Array, msg: Init): void;
 				handle_channel_reestablish(their_node_id: Uint8Array, msg: ChannelReestablish): void;
+				handle_channel_update(their_node_id: Uint8Array, msg: ChannelUpdate): void;
 				handle_error(their_node_id: Uint8Array, msg: ErrorMessage): void;
 				
             }
@@ -162,98 +171,102 @@ import * as bindings from '../bindings' // TODO: figure out location
                 held: ChannelMessageHandler;
             }
 	public void handle_open_channel(Uint8Array their_node_id, InitFeatures their_features, OpenChannel msg) {
-		bindings.ChannelMessageHandler_handle_open_channel(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
-		this.ptrs_to.add(their_features);
+		bindings.ChannelMessageHandler_handle_open_channel(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_accept_channel(Uint8Array their_node_id, InitFeatures their_features, AcceptChannel msg) {
-		bindings.ChannelMessageHandler_handle_accept_channel(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
-		this.ptrs_to.add(their_features);
+		bindings.ChannelMessageHandler_handle_accept_channel(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_funding_created(Uint8Array their_node_id, FundingCreated msg) {
-		bindings.ChannelMessageHandler_handle_funding_created(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_funding_created(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_funding_signed(Uint8Array their_node_id, FundingSigned msg) {
-		bindings.ChannelMessageHandler_handle_funding_signed(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_funding_signed(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_funding_locked(Uint8Array their_node_id, FundingLocked msg) {
-		bindings.ChannelMessageHandler_handle_funding_locked(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_funding_locked(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
-	public void handle_shutdown(Uint8Array their_node_id, Shutdown msg) {
-		bindings.ChannelMessageHandler_handle_shutdown(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+	public void handle_shutdown(Uint8Array their_node_id, InitFeatures their_features, Shutdown msg) {
+		bindings.ChannelMessageHandler_handle_shutdown(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
+		this.ptrs_to.add(their_features);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_closing_signed(Uint8Array their_node_id, ClosingSigned msg) {
-		bindings.ChannelMessageHandler_handle_closing_signed(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_closing_signed(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_update_add_htlc(Uint8Array their_node_id, UpdateAddHTLC msg) {
-		bindings.ChannelMessageHandler_handle_update_add_htlc(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_update_add_htlc(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_update_fulfill_htlc(Uint8Array their_node_id, UpdateFulfillHTLC msg) {
-		bindings.ChannelMessageHandler_handle_update_fulfill_htlc(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_update_fulfill_htlc(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_update_fail_htlc(Uint8Array their_node_id, UpdateFailHTLC msg) {
-		bindings.ChannelMessageHandler_handle_update_fail_htlc(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_update_fail_htlc(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_update_fail_malformed_htlc(Uint8Array their_node_id, UpdateFailMalformedHTLC msg) {
-		bindings.ChannelMessageHandler_handle_update_fail_malformed_htlc(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_update_fail_malformed_htlc(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_commitment_signed(Uint8Array their_node_id, CommitmentSigned msg) {
-		bindings.ChannelMessageHandler_handle_commitment_signed(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_commitment_signed(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_revoke_and_ack(Uint8Array their_node_id, RevokeAndACK msg) {
-		bindings.ChannelMessageHandler_handle_revoke_and_ack(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_revoke_and_ack(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_update_fee(Uint8Array their_node_id, UpdateFee msg) {
-		bindings.ChannelMessageHandler_handle_update_fee(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_update_fee(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_announcement_signatures(Uint8Array their_node_id, AnnouncementSignatures msg) {
-		bindings.ChannelMessageHandler_handle_announcement_signatures(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_announcement_signatures(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void peer_disconnected(Uint8Array their_node_id, boolean no_connection_possible) {
-		bindings.ChannelMessageHandler_peer_disconnected(this.ptr, their_node_id, no_connection_possible);
+		bindings.ChannelMessageHandler_peer_disconnected(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), no_connection_possible);
 	}
 
 	public void peer_connected(Uint8Array their_node_id, Init msg) {
-		bindings.ChannelMessageHandler_peer_connected(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_peer_connected(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_channel_reestablish(Uint8Array their_node_id, ChannelReestablish msg) {
-		bindings.ChannelMessageHandler_handle_channel_reestablish(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_channel_reestablish(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
+		this.ptrs_to.add(msg);
+	}
+
+	public void handle_channel_update(Uint8Array their_node_id, ChannelUpdate msg) {
+		bindings.ChannelMessageHandler_handle_channel_update(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}
 
 	public void handle_error(Uint8Array their_node_id, ErrorMessage msg) {
-		bindings.ChannelMessageHandler_handle_error(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+		bindings.ChannelMessageHandler_handle_error(this.ptr, InternalUtils.check_arr_len(their_node_id, 33), msg == null ? 0 : msg.ptr & ~1);
 		this.ptrs_to.add(msg);
 	}