X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FRoutingMessageHandler.mts;fp=ts%2Fstructs%2FRoutingMessageHandler.mts;h=77efe5064d3696a7ed47d509d87118aae66eba0a;hb=c235b1252356e371b27ba8735595c59aaf69c2d1;hp=9caf24d4d975fcfb049764b4a268e09233446ea7;hpb=5e9de82b3a7712a41189756d9d16d946142b2ac5;p=ldk-java

diff --git a/ts/structs/RoutingMessageHandler.mts b/ts/structs/RoutingMessageHandler.mts
index 9caf24d4..77efe506 100644
--- a/ts/structs/RoutingMessageHandler.mts
+++ b/ts/structs/RoutingMessageHandler.mts
@@ -2,7 +2,7 @@ import { TxOut } from '../structs/TxOut.mjs';
 import { BigEndianScalar } from '../structs/BigEndianScalar.mjs';
 import { AccessError } from '../enums/AccessError.mjs';
 import { COption_NoneZ } from '../enums/COption_NoneZ.mjs';
-import { ChannelMonitorUpdateErr } from '../enums/ChannelMonitorUpdateErr.mjs';
+import { ChannelMonitorUpdateStatus } from '../enums/ChannelMonitorUpdateStatus.mjs';
 import { ConfirmationTarget } from '../enums/ConfirmationTarget.mjs';
 import { CreationError } from '../enums/CreationError.mjs';
 import { Currency } from '../enums/Currency.mjs';
@@ -109,7 +109,6 @@ import { GossipTimestampFilter } from '../structs/GossipTimestampFilter.mjs';
 import { MessageSendEvent } from '../structs/MessageSendEvent.mjs';
 import { Result_TxOutAccessErrorZ } from '../structs/Result_TxOutAccessErrorZ.mjs';
 import { TwoTuple_usizeTransactionZ } from '../structs/TwoTuple_usizeTransactionZ.mjs';
-import { Result_NoneChannelMonitorUpdateErrZ } from '../structs/Result_NoneChannelMonitorUpdateErrZ.mjs';
 import { HTLCUpdate } from '../structs/HTLCUpdate.mjs';
 import { MonitorEvent } from '../structs/MonitorEvent.mjs';
 import { ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ } from '../structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mjs';
@@ -165,6 +164,7 @@ import { Result_SignatureNoneZ } from '../structs/Result_SignatureNoneZ.mjs';
 import { TwoTuple_SignatureSignatureZ } from '../structs/TwoTuple_SignatureSignatureZ.mjs';
 import { Result_C2Tuple_SignatureSignatureZNoneZ } from '../structs/Result_C2Tuple_SignatureSignatureZNoneZ.mjs';
 import { Result_SecretKeyNoneZ } from '../structs/Result_SecretKeyNoneZ.mjs';
+import { Result_PublicKeyNoneZ } from '../structs/Result_PublicKeyNoneZ.mjs';
 import { Option_ScalarZ } from '../structs/Option_ScalarZ.mjs';
 import { Result_SharedSecretNoneZ } from '../structs/Result_SharedSecretNoneZ.mjs';
 import { ClosingTransaction } from '../structs/ClosingTransaction.mjs';
@@ -252,6 +252,9 @@ import { Balance } from '../structs/Balance.mjs';
 import { TwoTuple_BlockHashChannelMonitorZ } from '../structs/TwoTuple_BlockHashChannelMonitorZ.mjs';
 import { Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ } from '../structs/Result_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ.mjs';
 import { TwoTuple_PublicKeyTypeZ } from '../structs/TwoTuple_PublicKeyTypeZ.mjs';
+import { CustomOnionMessageContents, CustomOnionMessageContentsInterface } from '../structs/CustomOnionMessageContents.mjs';
+import { Option_CustomOnionMessageContentsZ } from '../structs/Option_CustomOnionMessageContentsZ.mjs';
+import { Result_COption_CustomOnionMessageContentsZDecodeErrorZ } from '../structs/Result_COption_CustomOnionMessageContentsZDecodeErrorZ.mjs';
 import { Option_NetAddressZ } from '../structs/Option_NetAddressZ.mjs';
 import { PeerHandleError } from '../structs/PeerHandleError.mjs';
 import { Result_CVec_u8ZPeerHandleErrorZ } from '../structs/Result_CVec_u8ZPeerHandleErrorZ.mjs';
@@ -351,6 +354,7 @@ import { OnionMessageHandler, OnionMessageHandlerInterface } from '../structs/On
 import { CustomMessageReader, CustomMessageReaderInterface } from '../structs/CustomMessageReader.mjs';
 import { CustomMessageHandler, CustomMessageHandlerInterface } from '../structs/CustomMessageHandler.mjs';
 import { IgnoringMessageHandler } from '../structs/IgnoringMessageHandler.mjs';
+import { CustomOnionMessageHandler, CustomOnionMessageHandlerInterface } from '../structs/CustomOnionMessageHandler.mjs';
 import { ErroringMessageHandler } from '../structs/ErroringMessageHandler.mjs';
 import { MessageHandler } from '../structs/MessageHandler.mjs';
 import { SocketDescriptor, SocketDescriptorInterface } from '../structs/SocketDescriptor.mjs';
@@ -414,8 +418,12 @@ export interface RoutingMessageHandlerInterface {
 	/**Called when a connection is established with a peer. This can be used to
 	 * perform routing table synchronization using a strategy defined by the
 	 * implementor.
+	 * 
+	 * May return an `Err(())` if the features the peer supports are not sufficient to communicate
+	 * with us. Implementors should be somewhat conservative about doing so, however, as other
+	 * message handlers may still wish to communicate with this peer.
 	 */
-	peer_connected(their_node_id: Uint8Array, init: Init): void;
+	peer_connected(their_node_id: Uint8Array, init: Init): Result_NoneNoneZ;
 	/**Handles the reply of a query we initiated to learn about channels
 	 * for a given range of blocks. We can expect to receive one or more
 	 * replies to a single query.
@@ -450,7 +458,7 @@ export interface RoutingMessageHandlerInterface {
 }
 
 class LDKRoutingMessageHandlerHolder {
-	held: RoutingMessageHandler;
+	held: RoutingMessageHandler|null = null;
 }
 
 /**
@@ -464,13 +472,13 @@ class LDKRoutingMessageHandlerHolder {
  */
 export class RoutingMessageHandler extends CommonBase {
 	/* @internal */
-	public bindings_instance?: bindings.LDKRoutingMessageHandler;
+	public bindings_instance: bindings.LDKRoutingMessageHandler|null;
 
 	/* @internal */
 	public instance_idx?: number;
 
 	/* @internal */
-	constructor(_dummy: object, ptr: bigint) {
+	constructor(_dummy: null, ptr: bigint) {
 		super(ptr, bindings.RoutingMessageHandler_free);
 		this.bindings_instance = null;
 	}
@@ -508,10 +516,12 @@ export class RoutingMessageHandler extends CommonBase {
 				const result: bigint = ret == null ? 0n : ret.clone_ptr();
 				return result;
 			},
-			peer_connected (their_node_id: number, init: bigint): void {
+			peer_connected (their_node_id: number, init: bigint): bigint {
 				const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id);
 				const init_hu_conv: Init = new Init(null, init);
-				arg.peer_connected(their_node_id_conv, init_hu_conv);
+				const ret: Result_NoneNoneZ = arg.peer_connected(their_node_id_conv, init_hu_conv);
+				const result: bigint = ret == null ? 0n : ret.clone_ptr();
+				return result;
 			},
 			handle_reply_channel_range (their_node_id: number, msg: bigint): bigint {
 				const their_node_id_conv: Uint8Array = bindings.decodeUint8Array(their_node_id);
@@ -558,13 +568,13 @@ export class RoutingMessageHandler extends CommonBase {
 			},
 		} as bindings.LDKRoutingMessageHandler;
 		const messageSendEventsProvider = MessageSendEventsProvider.new_impl(messageSendEventsProvider_impl, );
-		const ptr_idx: [bigint, number] = bindings.LDKRoutingMessageHandler_new(structImplementation, messageSendEventsProvider.instance_idx);
+		const ptr_idx: [bigint, number] = bindings.LDKRoutingMessageHandler_new(structImplementation, messageSendEventsProvider.instance_idx!);
 
 		impl_holder.held = new RoutingMessageHandler(null, ptr_idx[0]);
 		impl_holder.held.instance_idx = ptr_idx[1];
 		impl_holder.held.bindings_instance = structImplementation;
 		impl_holder.held.ptrs_to.push(messageSendEventsProvider);
-		return impl_holder.held;
+		return impl_holder.held!;
 	}
 
 	/**
@@ -621,7 +631,7 @@ export class RoutingMessageHandler extends CommonBase {
 	 * Note that starting_point (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public get_next_node_announcement(starting_point: Uint8Array): NodeAnnouncement {
+	public get_next_node_announcement(starting_point: Uint8Array|null): NodeAnnouncement {
 		const ret: bigint = bindings.RoutingMessageHandler_get_next_node_announcement(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(starting_point, 33)));
 		const ret_hu_conv: NodeAnnouncement = new NodeAnnouncement(null, ret);
 		CommonBase.add_ref_from(ret_hu_conv, this);
@@ -632,10 +642,16 @@ export class RoutingMessageHandler extends CommonBase {
 	 * Called when a connection is established with a peer. This can be used to
 	 * perform routing table synchronization using a strategy defined by the
 	 * implementor.
+	 * 
+	 * May return an `Err(())` if the features the peer supports are not sufficient to communicate
+	 * with us. Implementors should be somewhat conservative about doing so, however, as other
+	 * message handlers may still wish to communicate with this peer.
 	 */
-	public peer_connected(their_node_id: Uint8Array, init: Init): void {
-		bindings.RoutingMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), init == null ? 0n : CommonBase.get_ptr_of(init));
+	public peer_connected(their_node_id: Uint8Array, init: Init): Result_NoneNoneZ {
+		const ret: bigint = bindings.RoutingMessageHandler_peer_connected(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(their_node_id, 33)), init == null ? 0n : CommonBase.get_ptr_of(init));
+		const ret_hu_conv: Result_NoneNoneZ = Result_NoneNoneZ.constr_from_ptr(ret);
 		CommonBase.add_ref_from(this, init);
+		return ret_hu_conv;
 	}
 
 	/**