Reorg a bit and let us call trait methods from Java

diff --git a/genbindings.py b/genbindings.py
index deea360c406a12bed4b4e31e263e6c5684752739..80c8ada3ebd2553be15307658e7b7d4b11353895 100755 (executable)
--- a/genbindings.py
+++ b/genbindings.py
@@ -253,8 +253,8 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg
                 return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
                     arg_conv = None, arg_conv_name = None, ret_conv = None, ret_conv_name = None)
 
-    def map_fn(re_match, ret_arr_len):
-        out_java.write("\t/// " + line)
+    def map_fn(line, re_match, ret_arr_len, c_call_string):
+        out_java.write("\t// " + line)
         out_java.write("\tpublic static native ")
         out_c.write("JNIEXPORT ")
 
@@ -290,11 +290,16 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg
         else:
             out_c.write("\treturn ");
 
-        out_c.write(re_match.group(2) + "(")
+        if c_call_string is None:
+            out_c.write(re_match.group(2) + "(")
+        else:
+            out_c.write(c_call_string)
         for idx, info in enumerate(arg_names):
             if info.arg_conv_name is not None:
                 if idx != 0:
                     out_c.write(", ")
+                elif c_call_string is not None:
+                    continue
                 out_c.write(info.arg_conv_name)
         out_c.write(")")
         if ret_info.ret_conv is not None:
@@ -451,71 +456,122 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg
         out_c.write("\treturn ((" + struct_name + "_JCalls*)val)->o;\n")
         out_c.write("}\n")
 
+        for fn_line in trait_fn_lines:
+            # For now, just disable enabling the _call_log - we don't know how to inverse-map String
+            is_log = fn_line.group(2) == "log" and struct_name == "LDKLogger"
+            if fn_line.group(2) != "free" and fn_line.group(2) != "clone" and fn_line.group(2) != "eq" and not is_log:
+                dummy_line = fn_line.group(1) + struct_name + "_call_" + fn_line.group(2) + " " + struct_name + "* arg" + fn_line.group(4) + "\n"
+                map_fn(dummy_line, re.compile("([A-Za-z_0-9]*) *([A-Za-z_0-9]*) *(.*)").match(dummy_line), None, "(arg_conv->" + fn_line.group(2) + ")(arg_conv->this_arg")
 
     out_java.write("""package org.ldk.impl;
 
 public class bindings {
-       static native void init(java.lang.Class c);
        static {
                System.loadLibrary(\"lightningjni\");
                init(java.lang.Enum.class);
        }
-
 """)
-    out_c.write("#include \"org_ldk_impl_bindings.h\"\n")
-    out_c.write("#include <rust_types.h>\n")
-    out_c.write("#include <lightning.h>\n")
-    out_c.write("#include <assert.h>\n")
-    out_c.write("#include <string.h>\n")
-    out_c.write("#include <stdatomic.h>\n\n")
-
-    out_c.write("jmethodID ordinal_meth = NULL;\n")
-    out_c.write("JNIEXPORT void Java_org_ldk_impl_bindings_init(JNIEnv * env, jclass _b, jclass enum_class) {\n")
-    out_c.write("\tordinal_meth = (*env)->GetMethodID(env, enum_class, \"ordinal\", \"()I\");\n")
-    out_c.write("\tassert(ordinal_meth != NULL);\n")
-    out_c.write("}\n\n")
+    out_c.write("""#include \"org_ldk_impl_bindings.h\"
+#include <rust_types.h>
+#include <lightning.h>
+#include <assert.h>
+#include <string.h>
+#include <stdatomic.h>
+""")
 
     if sys.argv[4] == "false":
         out_c.write("#define MALLOC(a, _) malloc(a)\n")
-        out_c.write("#define FREE free\n\n")
+        out_c.write("#define FREE free\n")
     else:
-        out_c.write("#include <threads.h>\n")
-        out_c.write("static mtx_t allocation_mtx;\n\n")
-        out_c.write("void __attribute__((constructor)) init_mtx() {\n")
-        out_c.write("\tassert(mtx_init(&allocation_mtx, mtx_plain) == thrd_success);\n")
-        out_c.write("}\n\n")
-        out_c.write("typedef struct allocation {\n")
-        out_c.write("\tstruct allocation* next;\n")
-        out_c.write("\tvoid* ptr;\n")
-        out_c.write("\tconst char* struct_name;\n")
-        out_c.write("} allocation;\n")
-        out_c.write("static allocation* allocation_ll = NULL;\n\n")
-        out_c.write("void* MALLOC(size_t len, const char* struct_name) {\n")
-        out_c.write("\tvoid* res = malloc(len);\n")
-        out_c.write("\tallocation* new_alloc = malloc(sizeof(allocation));\n")
-        out_c.write("\tnew_alloc->ptr = res;\n")
-        out_c.write("\tnew_alloc->struct_name = struct_name;\n")
-        out_c.write("\tassert(mtx_lock(&allocation_mtx) == thrd_success);\n")
-        out_c.write("\tnew_alloc->next = allocation_ll;\n")
-        out_c.write("\tallocation_ll = new_alloc;\n")
-        out_c.write("\tassert(mtx_unlock(&allocation_mtx) == thrd_success);\n")
-        out_c.write("\treturn res;\n")
-        out_c.write("}\n\n")
-        out_c.write("void FREE(void* ptr) {\n")
-        out_c.write("\tallocation* p = NULL;\n")
-        out_c.write("\tassert(mtx_lock(&allocation_mtx) == thrd_success);\n")
-        out_c.write("\tallocation* it = allocation_ll;\n")
-        out_c.write("\twhile (it->ptr != ptr) { p = it; it = it->next; }\n")
-        out_c.write("\tif (p) { p->next = it->next; } else { allocation_ll = it->next; }\n")
-        out_c.write("\tassert(mtx_unlock(&allocation_mtx) == thrd_success);\n")
-        out_c.write("\tassert(it->ptr == ptr);\n")
-        out_c.write("\tfree(it);\n")
-        out_c.write("\tfree(ptr);\n")
-        out_c.write("}\n\n")
-        out_c.write("void __attribute__((destructor)) check_leaks() {\n")
-        out_c.write("\tfor (allocation* a = allocation_ll; a != NULL; a = a->next) { fprintf(stderr, \"%s %p remains\\n\", a->struct_name, a->ptr); }\n")
-        out_c.write("\tassert(allocation_ll == NULL);\n")
-        out_c.write("}\n\n")
+        out_c.write("""
+#include <threads.h>
+static mtx_t allocation_mtx;
+
+void __attribute__((constructor)) init_mtx() {
+       assert(mtx_init(&allocation_mtx, mtx_plain) == thrd_success);
+}
+
+typedef struct allocation {
+       struct allocation* next;
+       void* ptr;
+       const char* struct_name;
+} allocation;
+static allocation* allocation_ll = NULL;
+
+void* MALLOC(size_t len, const char* struct_name) {
+       void* res = malloc(len);
+       allocation* new_alloc = malloc(sizeof(allocation));
+       new_alloc->ptr = res;
+       new_alloc->struct_name = struct_name;
+       assert(mtx_lock(&allocation_mtx) == thrd_success);
+       new_alloc->next = allocation_ll;
+       allocation_ll = new_alloc;
+       assert(mtx_unlock(&allocation_mtx) == thrd_success);
+       return res;
+}
+
+void FREE(void* ptr) {
+       allocation* p = NULL;
+       assert(mtx_lock(&allocation_mtx) == thrd_success);
+       allocation* it = allocation_ll;
+       while (it->ptr != ptr) { p = it; it = it->next; }
+       if (p) { p->next = it->next; } else { allocation_ll = it->next; }
+       assert(mtx_unlock(&allocation_mtx) == thrd_success);
+       assert(it->ptr == ptr);
+       free(it);
+       free(ptr);
+}
+
+void __attribute__((destructor)) check_leaks() {
+       for (allocation* a = allocation_ll; a != NULL; a = a->next) { fprintf(stderr, "%s %p remains\\n", a->struct_name, a->ptr); }
+       assert(allocation_ll == NULL);
+}
+""")
+
+    out_java.write("""
+       static native void init(java.lang.Class c);
+
+       public static native boolean deref_bool(long ptr);
+       public static native long deref_long(long ptr);
+       public static native void free_heap_ptr(long ptr);
+       public static native long u8_vec_to_heap_slice(long vec);
+       public static native long u8_vec_len(long vec);
+
+""")
+    out_c.write("""
+jmethodID ordinal_meth = NULL;
+JNIEXPORT void Java_org_ldk_impl_bindings_init(JNIEnv * env, jclass _b, jclass enum_class) {
+       ordinal_meth = (*env)->GetMethodID(env, enum_class, "ordinal", "()I");
+       assert(ordinal_meth != NULL);
+}
+
+JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_deref_1bool (JNIEnv * env, jclass _a, jlong ptr) {
+       return *((bool*)ptr);
+}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_deref_1long (JNIEnv * env, jclass _a, jlong ptr) {
+       return *((long*)ptr);
+}
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_free_1heap_1ptr (JNIEnv * env, jclass _a, jlong ptr) {
+       FREE((void*)ptr);
+}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_u8_1vec_1to_1heap_1slice (JNIEnv * env, jclass _a, jlong ptr) {
+       LDKCVec_u8Z *vec = (LDKCVec_u8Z*)ptr;
+       LDKu8slice *slice = (LDKu8slice*)MALLOC(sizeof(LDKu8slice), "u8slice");
+        slice->data = vec->data;
+        slice->datalen = vec->datalen;
+       return (long)slice;
+}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_u8_1vec_1len (JNIEnv * env, jclass _a, jlong ptr) {
+       LDKCVec_u8Z *vec = (LDKCVec_u8Z*)ptr;
+       return (long)vec->datalen;
+}
+
+// We assume that CVec_u8Z and u8slice are the same size and layout (and thus pointers to the two can be mixed)
+_Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKu8slice), "Vec<u8> and [u8] need to have been mapped identically");
+_Static_assert(offsetof(LDKCVec_u8Z, data) == offsetof(LDKu8slice, data), "Vec<u8> and [u8] need to have been mapped identically");
+_Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKu8slice, datalen), "Vec<u8> and [u8] need to have been mapped identically");
+
+""")
 
     # XXX: Temporarily write out a manual SecretKey_new() for testing, we should auto-gen this kind of thing
     out_java.write("\tpublic static native long LDKSecretKey_new();\n\n") # TODO: rm me
@@ -683,11 +739,11 @@ public class bindings {
                     out_c.write("\t}\n}\n")
                 pass
             elif fn_ptr is not None:
-                map_fn(fn_ptr, None)
+                map_fn(line, fn_ptr, None, None)
             elif fn_ret_arr is not None:
-                map_fn(fn_ret_arr, fn_ret_arr.group(4))
+                map_fn(line, fn_ret_arr, fn_ret_arr.group(4), None)
             elif reg_fn is not None:
-                map_fn(reg_fn, None)
+                map_fn(line, reg_fn, None, None)
             elif const_val_regex is not None:
                 # TODO Map const variables
                 pass

diff --git a/src/main/java/org/ldk/impl/bindings.java b/src/main/java/org/ldk/impl/bindings.java
index b19a13352425509e0149e08d58bc84d219bb8374..a92b30a581ee79b50e2becc0006ae4bf46bdfcdd 100644 (file)
--- a/src/main/java/org/ldk/impl/bindings.java
+++ b/src/main/java/org/ldk/impl/bindings.java
@@ -1,12 +1,19 @@
 package org.ldk.impl;
 
 public class bindings {
-       static native void init(java.lang.Class c);
        static {
                System.loadLibrary("lightningjni");
                init(java.lang.Enum.class);
        }
 
+       static native void init(java.lang.Class c);
+
+       public static native boolean deref_bool(long ptr);
+       public static native long deref_long(long ptr);
+       public static native void free_heap_ptr(long ptr);
+       public static native long u8_vec_to_heap_slice(long vec);
+       public static native long u8_vec_len(long vec);
+
        public static native long LDKSecretKey_new();
 
        public enum LDKAccessError {
@@ -67,11 +74,15 @@ public class bindings {
        }
        public static native long LDKMessageSendEventsProvider_new(LDKMessageSendEventsProvider impl);
        public static native LDKMessageSendEventsProvider LDKMessageSendEventsProvider_get_obj_from_jcalls(long val);
+       // LDKCVec_MessageSendEventZ LDKMessageSendEventsProvider_call_get_and_clear_pending_msg_events LDKMessageSendEventsProvider* arg
+       public static native long LDKMessageSendEventsProvider_call_get_and_clear_pending_msg_events(long arg);
        public interface LDKEventsProvider {
                 long get_and_clear_pending_events();
        }
        public static native long LDKEventsProvider_new(LDKEventsProvider impl);
        public static native LDKEventsProvider LDKEventsProvider_get_obj_from_jcalls(long val);
+       // LDKCVec_EventZ LDKEventsProvider_call_get_and_clear_pending_events LDKEventsProvider* arg
+       public static native long LDKEventsProvider_call_get_and_clear_pending_events(long arg);
        public interface LDKLogger {
                 void log(String record);
        }
@@ -84,6 +95,8 @@ public class bindings {
        }
        public static native long LDKAccess_new(LDKAccess impl);
        public static native LDKAccess LDKAccess_get_obj_from_jcalls(long val);
+       // LDKCResult_TxOutAccessErrorZ LDKAccess_call_get_utxo LDKAccess* arg, const uint8_t (*genesis_hash)[32], uint64_t short_channel_id
+       public static native long LDKAccess_call_get_utxo(long arg, byte[] genesis_hash, long short_channel_id);
        public interface LDKChannelKeys {
                 long get_per_commitment_point(long idx);
                 long release_commitment_secret(long idx);
@@ -99,6 +112,28 @@ public class bindings {
        }
        public static native long LDKChannelKeys_new(LDKChannelKeys impl);
        public static native LDKChannelKeys LDKChannelKeys_get_obj_from_jcalls(long val);
+       // LDKPublicKey LDKChannelKeys_call_get_per_commitment_point LDKChannelKeys* arg, uint64_t idx
+       public static native long LDKChannelKeys_call_get_per_commitment_point(long arg, long idx);
+       // LDKThirtyTwoBytes LDKChannelKeys_call_release_commitment_secret LDKChannelKeys* arg, uint64_t idx
+       public static native long LDKChannelKeys_call_release_commitment_secret(long arg, long idx);
+       // LDKC2Tuple_u64u64Z LDKChannelKeys_call_key_derivation_params LDKChannelKeys* arg
+       public static native long LDKChannelKeys_call_key_derivation_params(long arg);
+       // LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ LDKChannelKeys_call_sign_counterparty_commitment LDKChannelKeys* arg, uint32_t feerate_per_kw, LDKTransaction commitment_tx, const LDKPreCalculatedTxCreationKeys *keys, LDKCVec_HTLCOutputInCommitmentZ htlcs
+       public static native long LDKChannelKeys_call_sign_counterparty_commitment(long arg, int feerate_per_kw, long commitment_tx, long keys, long htlcs);
+       // LDKCResult_SignatureNoneZ LDKChannelKeys_call_sign_holder_commitment LDKChannelKeys* arg, const LDKHolderCommitmentTransaction *holder_commitment_tx
+       public static native long LDKChannelKeys_call_sign_holder_commitment(long arg, long holder_commitment_tx);
+       // LDKCResult_CVec_SignatureZNoneZ LDKChannelKeys_call_sign_holder_commitment_htlc_transactions LDKChannelKeys* arg, const LDKHolderCommitmentTransaction *holder_commitment_tx
+       public static native long LDKChannelKeys_call_sign_holder_commitment_htlc_transactions(long arg, long holder_commitment_tx);
+       // LDKCResult_SignatureNoneZ LDKChannelKeys_call_sign_justice_transaction LDKChannelKeys* arg, LDKTransaction justice_tx, uintptr_t input, uint64_t amount, const uint8_t (*per_commitment_key)[32], const LDKHTLCOutputInCommitment *htlc
+       public static native long LDKChannelKeys_call_sign_justice_transaction(long arg, long justice_tx, long input, long amount, byte[] per_commitment_key, long htlc);
+       // LDKCResult_SignatureNoneZ LDKChannelKeys_call_sign_counterparty_htlc_transaction LDKChannelKeys* arg, LDKTransaction htlc_tx, uintptr_t input, uint64_t amount, LDKPublicKey per_commitment_point, const LDKHTLCOutputInCommitment *htlc
+       public static native long LDKChannelKeys_call_sign_counterparty_htlc_transaction(long arg, long htlc_tx, long input, long amount, long per_commitment_point, long htlc);
+       // LDKCResult_SignatureNoneZ LDKChannelKeys_call_sign_closing_transaction LDKChannelKeys* arg, LDKTransaction closing_tx
+       public static native long LDKChannelKeys_call_sign_closing_transaction(long arg, long closing_tx);
+       // LDKCResult_SignatureNoneZ LDKChannelKeys_call_sign_channel_announcement LDKChannelKeys* arg, const LDKUnsignedChannelAnnouncement *msg
+       public static native long LDKChannelKeys_call_sign_channel_announcement(long arg, long msg);
+       // void LDKChannelKeys_call_on_accept LDKChannelKeys* arg, const LDKChannelPublicKeys *channel_points, uint16_t counterparty_selected_contest_delay, uint16_t holder_selected_contest_delay
+       public static native void LDKChannelKeys_call_on_accept(long arg, long channel_points, short counterparty_selected_contest_delay, short holder_selected_contest_delay);
        public interface LDKWatch {
                 long watch_channel(long funding_txo, long monitor);
                 long update_channel(long funding_txo, long update);
@@ -106,22 +141,36 @@ public class bindings {
        }
        public static native long LDKWatch_new(LDKWatch impl);
        public static native LDKWatch LDKWatch_get_obj_from_jcalls(long val);
+       // LDKCResult_NoneChannelMonitorUpdateErrZ LDKWatch_call_watch_channel LDKWatch* arg, LDKOutPoint funding_txo, LDKChannelMonitor monitor
+       public static native long LDKWatch_call_watch_channel(long arg, long funding_txo, long monitor);
+       // LDKCResult_NoneChannelMonitorUpdateErrZ LDKWatch_call_update_channel LDKWatch* arg, LDKOutPoint funding_txo, LDKChannelMonitorUpdate update
+       public static native long LDKWatch_call_update_channel(long arg, long funding_txo, long update);
+       // LDKCVec_MonitorEventZ LDKWatch_call_release_pending_monitor_events LDKWatch* arg
+       public static native long LDKWatch_call_release_pending_monitor_events(long arg);
        public interface LDKFilter {
                 void register_tx(byte[] txid, long script_pubkey);
                 void register_output(long outpoint, long script_pubkey);
        }
        public static native long LDKFilter_new(LDKFilter impl);
        public static native LDKFilter LDKFilter_get_obj_from_jcalls(long val);
+       // void LDKFilter_call_register_tx LDKFilter* arg, const uint8_t (*txid)[32], LDKu8slice script_pubkey
+       public static native void LDKFilter_call_register_tx(long arg, byte[] txid, long script_pubkey);
+       // void LDKFilter_call_register_output LDKFilter* arg, const LDKOutPoint *outpoint, LDKu8slice script_pubkey
+       public static native void LDKFilter_call_register_output(long arg, long outpoint, long script_pubkey);
        public interface LDKBroadcasterInterface {
                 void broadcast_transaction(long tx);
        }
        public static native long LDKBroadcasterInterface_new(LDKBroadcasterInterface impl);
        public static native LDKBroadcasterInterface LDKBroadcasterInterface_get_obj_from_jcalls(long val);
+       // void LDKBroadcasterInterface_call_broadcast_transaction LDKBroadcasterInterface* arg, LDKTransaction tx
+       public static native void LDKBroadcasterInterface_call_broadcast_transaction(long arg, long tx);
        public interface LDKFeeEstimator {
                 int get_est_sat_per_1000_weight(LDKConfirmationTarget confirmation_target);
        }
        public static native long LDKFeeEstimator_new(LDKFeeEstimator impl);
        public static native LDKFeeEstimator LDKFeeEstimator_get_obj_from_jcalls(long val);
+       // uint32_t LDKFeeEstimator_call_get_est_sat_per_1000_weight LDKFeeEstimator* arg, LDKConfirmationTarget confirmation_target
+       public static native int LDKFeeEstimator_call_get_est_sat_per_1000_weight(long arg, LDKConfirmationTarget confirmation_target);
        public interface LDKKeysInterface {
                 long get_node_secret();
                 long get_destination_script();
@@ -131,6 +180,16 @@ public class bindings {
        }
        public static native long LDKKeysInterface_new(LDKKeysInterface impl);
        public static native LDKKeysInterface LDKKeysInterface_get_obj_from_jcalls(long val);
+       // LDKSecretKey LDKKeysInterface_call_get_node_secret LDKKeysInterface* arg
+       public static native long LDKKeysInterface_call_get_node_secret(long arg);
+       // LDKCVec_u8Z LDKKeysInterface_call_get_destination_script LDKKeysInterface* arg
+       public static native long LDKKeysInterface_call_get_destination_script(long arg);
+       // LDKPublicKey LDKKeysInterface_call_get_shutdown_pubkey LDKKeysInterface* arg
+       public static native long LDKKeysInterface_call_get_shutdown_pubkey(long arg);
+       // LDKChannelKeys LDKKeysInterface_call_get_channel_keys LDKKeysInterface* arg, bool inbound, uint64_t channel_value_satoshis
+       public static native long LDKKeysInterface_call_get_channel_keys(long arg, boolean inbound, long channel_value_satoshis);
+       // LDKThirtyTwoBytes LDKKeysInterface_call_get_secure_random_bytes LDKKeysInterface* arg
+       public static native long LDKKeysInterface_call_get_secure_random_bytes(long arg);
        public interface LDKChannelMessageHandler {
                 void handle_open_channel(long their_node_id, long their_features, long msg);
                 void handle_accept_channel(long their_node_id, long their_features, long msg);
@@ -154,6 +213,44 @@ public class bindings {
        }
        public static native long LDKChannelMessageHandler_new(LDKChannelMessageHandler impl, LDKMessageSendEventsProvider MessageSendEventsProvider);
        public static native LDKChannelMessageHandler LDKChannelMessageHandler_get_obj_from_jcalls(long val);
+       // void LDKChannelMessageHandler_call_handle_open_channel LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKOpenChannel *msg
+       public static native void LDKChannelMessageHandler_call_handle_open_channel(long arg, long their_node_id, long their_features, long msg);
+       // void LDKChannelMessageHandler_call_handle_accept_channel LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKAcceptChannel *msg
+       public static native void LDKChannelMessageHandler_call_handle_accept_channel(long arg, long their_node_id, long their_features, long msg);
+       // void LDKChannelMessageHandler_call_handle_funding_created LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKFundingCreated *msg
+       public static native void LDKChannelMessageHandler_call_handle_funding_created(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_funding_signed LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKFundingSigned *msg
+       public static native void LDKChannelMessageHandler_call_handle_funding_signed(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_funding_locked LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKFundingLocked *msg
+       public static native void LDKChannelMessageHandler_call_handle_funding_locked(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_shutdown LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKShutdown *msg
+       public static native void LDKChannelMessageHandler_call_handle_shutdown(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_closing_signed LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKClosingSigned *msg
+       public static native void LDKChannelMessageHandler_call_handle_closing_signed(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_update_add_htlc LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKUpdateAddHTLC *msg
+       public static native void LDKChannelMessageHandler_call_handle_update_add_htlc(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_update_fulfill_htlc LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKUpdateFulfillHTLC *msg
+       public static native void LDKChannelMessageHandler_call_handle_update_fulfill_htlc(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_update_fail_htlc LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKUpdateFailHTLC *msg
+       public static native void LDKChannelMessageHandler_call_handle_update_fail_htlc(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_update_fail_malformed_htlc LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKUpdateFailMalformedHTLC *msg
+       public static native void LDKChannelMessageHandler_call_handle_update_fail_malformed_htlc(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_commitment_signed LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKCommitmentSigned *msg
+       public static native void LDKChannelMessageHandler_call_handle_commitment_signed(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_revoke_and_ack LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKRevokeAndACK *msg
+       public static native void LDKChannelMessageHandler_call_handle_revoke_and_ack(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_update_fee LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKUpdateFee *msg
+       public static native void LDKChannelMessageHandler_call_handle_update_fee(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_announcement_signatures LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKAnnouncementSignatures *msg
+       public static native void LDKChannelMessageHandler_call_handle_announcement_signatures(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_peer_disconnected LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, bool no_connection_possible
+       public static native void LDKChannelMessageHandler_call_peer_disconnected(long arg, long their_node_id, boolean no_connection_possible);
+       // void LDKChannelMessageHandler_call_peer_connected LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKInit *msg
+       public static native void LDKChannelMessageHandler_call_peer_connected(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_channel_reestablish LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKChannelReestablish *msg
+       public static native void LDKChannelMessageHandler_call_handle_channel_reestablish(long arg, long their_node_id, long msg);
+       // void LDKChannelMessageHandler_call_handle_error LDKChannelMessageHandler* arg, LDKPublicKey their_node_id, const LDKErrorMessage *msg
+       public static native void LDKChannelMessageHandler_call_handle_error(long arg, long their_node_id, long msg);
        public static native boolean LDKCResult_boolLightningErrorZ_result_ok(long arg);
        public static native long LDKCResult_boolLightningErrorZ_get_inner(long arg);
        public interface LDKRoutingMessageHandler {
@@ -167,6 +264,20 @@ public class bindings {
        }
        public static native long LDKRoutingMessageHandler_new(LDKRoutingMessageHandler impl);
        public static native LDKRoutingMessageHandler LDKRoutingMessageHandler_get_obj_from_jcalls(long val);
+       // LDKCResult_boolLightningErrorZ LDKRoutingMessageHandler_call_handle_node_announcement LDKRoutingMessageHandler* arg, const LDKNodeAnnouncement *msg
+       public static native long LDKRoutingMessageHandler_call_handle_node_announcement(long arg, long msg);
+       // LDKCResult_boolLightningErrorZ LDKRoutingMessageHandler_call_handle_channel_announcement LDKRoutingMessageHandler* arg, const LDKChannelAnnouncement *msg
+       public static native long LDKRoutingMessageHandler_call_handle_channel_announcement(long arg, long msg);
+       // LDKCResult_boolLightningErrorZ LDKRoutingMessageHandler_call_handle_channel_update LDKRoutingMessageHandler* arg, const LDKChannelUpdate *msg
+       public static native long LDKRoutingMessageHandler_call_handle_channel_update(long arg, long msg);
+       // void LDKRoutingMessageHandler_call_handle_htlc_fail_channel_update LDKRoutingMessageHandler* arg, const LDKHTLCFailChannelUpdate *update
+       public static native void LDKRoutingMessageHandler_call_handle_htlc_fail_channel_update(long arg, long update);
+       // LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ LDKRoutingMessageHandler_call_get_next_channel_announcements LDKRoutingMessageHandler* arg, uint64_t starting_point, uint8_t batch_amount
+       public static native long LDKRoutingMessageHandler_call_get_next_channel_announcements(long arg, long starting_point, byte batch_amount);
+       // LDKCVec_NodeAnnouncementZ LDKRoutingMessageHandler_call_get_next_node_announcements LDKRoutingMessageHandler* arg, LDKPublicKey starting_point, uint8_t batch_amount
+       public static native long LDKRoutingMessageHandler_call_get_next_node_announcements(long arg, long starting_point, byte batch_amount);
+       // bool LDKRoutingMessageHandler_call_should_request_full_sync LDKRoutingMessageHandler* arg, LDKPublicKey node_id
+       public static native boolean LDKRoutingMessageHandler_call_should_request_full_sync(long arg, long node_id);
        public interface LDKSocketDescriptor {
                 long send_data(long data, boolean resume_read);
                 void disconnect_socket();
@@ -175,6 +286,12 @@ public class bindings {
        }
        public static native long LDKSocketDescriptor_new(LDKSocketDescriptor impl);
        public static native LDKSocketDescriptor LDKSocketDescriptor_get_obj_from_jcalls(long val);
+       // uintptr_t LDKSocketDescriptor_call_send_data LDKSocketDescriptor* arg, LDKu8slice data, bool resume_read
+       public static native long LDKSocketDescriptor_call_send_data(long arg, long data, boolean resume_read);
+       // void LDKSocketDescriptor_call_disconnect_socket LDKSocketDescriptor* arg
+       public static native void LDKSocketDescriptor_call_disconnect_socket(long arg);
+       // uint64_t LDKSocketDescriptor_call_hash LDKSocketDescriptor* arg
+       public static native long LDKSocketDescriptor_call_hash(long arg);
        public static native boolean LDKCResult_CVec_u8ZPeerHandleErrorZ_result_ok(long arg);
        public static native long LDKCResult_CVec_u8ZPeerHandleErrorZ_get_inner(long arg);
        public static native boolean LDKCResult_boolPeerHandleErrorZ_result_ok(long arg);
@@ -187,1702 +304,1702 @@ public class bindings {
        public static native long LDKCResult_TxCreationKeysSecpErrorZ_get_inner(long arg);
        public static native boolean LDKCResult_RouteLightningErrorZ_result_ok(long arg);
        public static native long LDKCResult_RouteLightningErrorZ_get_inner(long arg);
-       /// extern const void (*C2Tuple_HTLCOutputInCommitmentSignatureZ_free)(LDKC2Tuple_HTLCOutputInCommitmentSignatureZ);
+       // extern const void (*C2Tuple_HTLCOutputInCommitmentSignatureZ_free)(LDKC2Tuple_HTLCOutputInCommitmentSignatureZ);
        public static native void C2Tuple_HTLCOutputInCommitmentSignatureZ_free(long arg);
-       /// extern const void (*C2Tuple_OutPointScriptZ_free)(LDKC2Tuple_OutPointScriptZ);
+       // extern const void (*C2Tuple_OutPointScriptZ_free)(LDKC2Tuple_OutPointScriptZ);
        public static native void C2Tuple_OutPointScriptZ_free(long arg);
-       /// extern const void (*C2Tuple_SignatureCVec_SignatureZZ_free)(LDKC2Tuple_SignatureCVec_SignatureZZ);
+       // extern const void (*C2Tuple_SignatureCVec_SignatureZZ_free)(LDKC2Tuple_SignatureCVec_SignatureZZ);
        public static native void C2Tuple_SignatureCVec_SignatureZZ_free(long arg);
-       /// extern const void (*C2Tuple_TxidCVec_TxOutZZ_free)(LDKC2Tuple_TxidCVec_TxOutZZ);
+       // extern const void (*C2Tuple_TxidCVec_TxOutZZ_free)(LDKC2Tuple_TxidCVec_TxOutZZ);
        public static native void C2Tuple_TxidCVec_TxOutZZ_free(long arg);
-       /// extern const void (*C2Tuple_u64u64Z_free)(LDKC2Tuple_u64u64Z);
+       // extern const void (*C2Tuple_u64u64Z_free)(LDKC2Tuple_u64u64Z);
        public static native void C2Tuple_u64u64Z_free(long arg);
-       /// extern const void (*C2Tuple_usizeTransactionZ_free)(LDKC2Tuple_usizeTransactionZ);
+       // extern const void (*C2Tuple_usizeTransactionZ_free)(LDKC2Tuple_usizeTransactionZ);
        public static native void C2Tuple_usizeTransactionZ_free(long arg);
-       /// extern const void (*C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free)(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ);
+       // extern const void (*C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free)(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ);
        public static native void C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(long arg);
-       /// extern const void (*CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free)(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ);
+       // extern const void (*CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free)(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ);
        public static native void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(long arg);
-       /// extern const LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ (*CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok)(LDKC2Tuple_SignatureCVec_SignatureZZ);
+       // extern const LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ (*CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok)(LDKC2Tuple_SignatureCVec_SignatureZZ);
        public static native long CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(long arg);
-       /// extern const void (*CResult_CVec_SignatureZNoneZ_free)(LDKCResult_CVec_SignatureZNoneZ);
+       // extern const void (*CResult_CVec_SignatureZNoneZ_free)(LDKCResult_CVec_SignatureZNoneZ);
        public static native void CResult_CVec_SignatureZNoneZ_free(long arg);
-       /// extern const LDKCResult_CVec_SignatureZNoneZ (*CResult_CVec_SignatureZNoneZ_ok)(LDKCVec_SignatureZ);
+       // extern const LDKCResult_CVec_SignatureZNoneZ (*CResult_CVec_SignatureZNoneZ_ok)(LDKCVec_SignatureZ);
        public static native long CResult_CVec_SignatureZNoneZ_ok(long arg);
-       /// extern const LDKCResult_CVec_u8ZPeerHandleErrorZ (*CResult_CVec_u8ZPeerHandleErrorZ_err)(LDKPeerHandleError);
+       // extern const LDKCResult_CVec_u8ZPeerHandleErrorZ (*CResult_CVec_u8ZPeerHandleErrorZ_err)(LDKPeerHandleError);
        public static native long CResult_CVec_u8ZPeerHandleErrorZ_err(long arg);
-       /// extern const void (*CResult_CVec_u8ZPeerHandleErrorZ_free)(LDKCResult_CVec_u8ZPeerHandleErrorZ);
+       // extern const void (*CResult_CVec_u8ZPeerHandleErrorZ_free)(LDKCResult_CVec_u8ZPeerHandleErrorZ);
        public static native void CResult_CVec_u8ZPeerHandleErrorZ_free(long arg);
-       /// extern const LDKCResult_CVec_u8ZPeerHandleErrorZ (*CResult_CVec_u8ZPeerHandleErrorZ_ok)(LDKCVec_u8Z);
+       // extern const LDKCResult_CVec_u8ZPeerHandleErrorZ (*CResult_CVec_u8ZPeerHandleErrorZ_ok)(LDKCVec_u8Z);
        public static native long CResult_CVec_u8ZPeerHandleErrorZ_ok(long arg);
-       /// extern const LDKCResult_NoneAPIErrorZ (*CResult_NoneAPIErrorZ_err)(LDKAPIError);
+       // extern const LDKCResult_NoneAPIErrorZ (*CResult_NoneAPIErrorZ_err)(LDKAPIError);
        public static native long CResult_NoneAPIErrorZ_err(long arg);
-       /// extern const void (*CResult_NoneAPIErrorZ_free)(LDKCResult_NoneAPIErrorZ);
+       // extern const void (*CResult_NoneAPIErrorZ_free)(LDKCResult_NoneAPIErrorZ);
        public static native void CResult_NoneAPIErrorZ_free(long arg);
-       /// extern const LDKCResult_NoneChannelMonitorUpdateErrZ (*CResult_NoneChannelMonitorUpdateErrZ_err)(LDKChannelMonitorUpdateErr);
+       // extern const LDKCResult_NoneChannelMonitorUpdateErrZ (*CResult_NoneChannelMonitorUpdateErrZ_err)(LDKChannelMonitorUpdateErr);
        public static native long CResult_NoneChannelMonitorUpdateErrZ_err(LDKChannelMonitorUpdateErr arg);
-       /// extern const void (*CResult_NoneChannelMonitorUpdateErrZ_free)(LDKCResult_NoneChannelMonitorUpdateErrZ);
+       // extern const void (*CResult_NoneChannelMonitorUpdateErrZ_free)(LDKCResult_NoneChannelMonitorUpdateErrZ);
        public static native void CResult_NoneChannelMonitorUpdateErrZ_free(long arg);
-       /// extern const LDKCResult_NoneMonitorUpdateErrorZ (*CResult_NoneMonitorUpdateErrorZ_err)(LDKMonitorUpdateError);
+       // extern const LDKCResult_NoneMonitorUpdateErrorZ (*CResult_NoneMonitorUpdateErrorZ_err)(LDKMonitorUpdateError);
        public static native long CResult_NoneMonitorUpdateErrorZ_err(long arg);
-       /// extern const void (*CResult_NoneMonitorUpdateErrorZ_free)(LDKCResult_NoneMonitorUpdateErrorZ);
+       // extern const void (*CResult_NoneMonitorUpdateErrorZ_free)(LDKCResult_NoneMonitorUpdateErrorZ);
        public static native void CResult_NoneMonitorUpdateErrorZ_free(long arg);
-       /// extern const LDKCResult_NonePaymentSendFailureZ (*CResult_NonePaymentSendFailureZ_err)(LDKPaymentSendFailure);
+       // extern const LDKCResult_NonePaymentSendFailureZ (*CResult_NonePaymentSendFailureZ_err)(LDKPaymentSendFailure);
        public static native long CResult_NonePaymentSendFailureZ_err(long arg);
-       /// extern const void (*CResult_NonePaymentSendFailureZ_free)(LDKCResult_NonePaymentSendFailureZ);
+       // extern const void (*CResult_NonePaymentSendFailureZ_free)(LDKCResult_NonePaymentSendFailureZ);
        public static native void CResult_NonePaymentSendFailureZ_free(long arg);
-       /// extern const LDKCResult_NonePeerHandleErrorZ (*CResult_NonePeerHandleErrorZ_err)(LDKPeerHandleError);
+       // extern const LDKCResult_NonePeerHandleErrorZ (*CResult_NonePeerHandleErrorZ_err)(LDKPeerHandleError);
        public static native long CResult_NonePeerHandleErrorZ_err(long arg);
-       /// extern const void (*CResult_NonePeerHandleErrorZ_free)(LDKCResult_NonePeerHandleErrorZ);
+       // extern const void (*CResult_NonePeerHandleErrorZ_free)(LDKCResult_NonePeerHandleErrorZ);
        public static native void CResult_NonePeerHandleErrorZ_free(long arg);
-       /// extern const LDKCResult_PublicKeySecpErrorZ (*CResult_PublicKeySecpErrorZ_err)(LDKSecp256k1Error);
+       // extern const LDKCResult_PublicKeySecpErrorZ (*CResult_PublicKeySecpErrorZ_err)(LDKSecp256k1Error);
        public static native long CResult_PublicKeySecpErrorZ_err(LDKSecp256k1Error arg);
-       /// extern const void (*CResult_PublicKeySecpErrorZ_free)(LDKCResult_PublicKeySecpErrorZ);
+       // extern const void (*CResult_PublicKeySecpErrorZ_free)(LDKCResult_PublicKeySecpErrorZ);
        public static native void CResult_PublicKeySecpErrorZ_free(long arg);
-       /// extern const LDKCResult_PublicKeySecpErrorZ (*CResult_PublicKeySecpErrorZ_ok)(LDKPublicKey);
+       // extern const LDKCResult_PublicKeySecpErrorZ (*CResult_PublicKeySecpErrorZ_ok)(LDKPublicKey);
        public static native long CResult_PublicKeySecpErrorZ_ok(long arg);
-       /// extern const LDKCResult_RouteLightningErrorZ (*CResult_RouteLightningErrorZ_err)(LDKLightningError);
+       // extern const LDKCResult_RouteLightningErrorZ (*CResult_RouteLightningErrorZ_err)(LDKLightningError);
        public static native long CResult_RouteLightningErrorZ_err(long arg);
-       /// extern const void (*CResult_RouteLightningErrorZ_free)(LDKCResult_RouteLightningErrorZ);
+       // extern const void (*CResult_RouteLightningErrorZ_free)(LDKCResult_RouteLightningErrorZ);
        public static native void CResult_RouteLightningErrorZ_free(long arg);
-       /// extern const LDKCResult_RouteLightningErrorZ (*CResult_RouteLightningErrorZ_ok)(LDKRoute);
+       // extern const LDKCResult_RouteLightningErrorZ (*CResult_RouteLightningErrorZ_ok)(LDKRoute);
        public static native long CResult_RouteLightningErrorZ_ok(long arg);
-       /// extern const LDKCResult_SecretKeySecpErrorZ (*CResult_SecretKeySecpErrorZ_err)(LDKSecp256k1Error);
+       // extern const LDKCResult_SecretKeySecpErrorZ (*CResult_SecretKeySecpErrorZ_err)(LDKSecp256k1Error);
        public static native long CResult_SecretKeySecpErrorZ_err(LDKSecp256k1Error arg);
-       /// extern const void (*CResult_SecretKeySecpErrorZ_free)(LDKCResult_SecretKeySecpErrorZ);
+       // extern const void (*CResult_SecretKeySecpErrorZ_free)(LDKCResult_SecretKeySecpErrorZ);
        public static native void CResult_SecretKeySecpErrorZ_free(long arg);
-       /// extern const LDKCResult_SecretKeySecpErrorZ (*CResult_SecretKeySecpErrorZ_ok)(LDKSecretKey);
+       // extern const LDKCResult_SecretKeySecpErrorZ (*CResult_SecretKeySecpErrorZ_ok)(LDKSecretKey);
        public static native long CResult_SecretKeySecpErrorZ_ok(long arg);
-       /// extern const void (*CResult_SignatureNoneZ_free)(LDKCResult_SignatureNoneZ);
+       // extern const void (*CResult_SignatureNoneZ_free)(LDKCResult_SignatureNoneZ);
        public static native void CResult_SignatureNoneZ_free(long arg);
-       /// extern const LDKCResult_SignatureNoneZ (*CResult_SignatureNoneZ_ok)(LDKSignature);
+       // extern const LDKCResult_SignatureNoneZ (*CResult_SignatureNoneZ_ok)(LDKSignature);
        public static native long CResult_SignatureNoneZ_ok(long arg);
-       /// extern const LDKCResult_TxCreationKeysSecpErrorZ (*CResult_TxCreationKeysSecpErrorZ_err)(LDKSecp256k1Error);
+       // extern const LDKCResult_TxCreationKeysSecpErrorZ (*CResult_TxCreationKeysSecpErrorZ_err)(LDKSecp256k1Error);
        public static native long CResult_TxCreationKeysSecpErrorZ_err(LDKSecp256k1Error arg);
-       /// extern const void (*CResult_TxCreationKeysSecpErrorZ_free)(LDKCResult_TxCreationKeysSecpErrorZ);
+       // extern const void (*CResult_TxCreationKeysSecpErrorZ_free)(LDKCResult_TxCreationKeysSecpErrorZ);
        public static native void CResult_TxCreationKeysSecpErrorZ_free(long arg);
-       /// extern const LDKCResult_TxCreationKeysSecpErrorZ (*CResult_TxCreationKeysSecpErrorZ_ok)(LDKTxCreationKeys);
+       // extern const LDKCResult_TxCreationKeysSecpErrorZ (*CResult_TxCreationKeysSecpErrorZ_ok)(LDKTxCreationKeys);
        public static native long CResult_TxCreationKeysSecpErrorZ_ok(long arg);
-       /// extern const LDKCResult_TxOutAccessErrorZ (*CResult_TxOutAccessErrorZ_err)(LDKAccessError);
+       // extern const LDKCResult_TxOutAccessErrorZ (*CResult_TxOutAccessErrorZ_err)(LDKAccessError);
        public static native long CResult_TxOutAccessErrorZ_err(LDKAccessError arg);
-       /// extern const void (*CResult_TxOutAccessErrorZ_free)(LDKCResult_TxOutAccessErrorZ);
+       // extern const void (*CResult_TxOutAccessErrorZ_free)(LDKCResult_TxOutAccessErrorZ);
        public static native void CResult_TxOutAccessErrorZ_free(long arg);
-       /// extern const LDKCResult_TxOutAccessErrorZ (*CResult_TxOutAccessErrorZ_ok)(LDKTxOut);
+       // extern const LDKCResult_TxOutAccessErrorZ (*CResult_TxOutAccessErrorZ_ok)(LDKTxOut);
        public static native long CResult_TxOutAccessErrorZ_ok(long arg);
-       /// extern const LDKCResult_boolLightningErrorZ (*CResult_boolLightningErrorZ_err)(LDKLightningError);
+       // extern const LDKCResult_boolLightningErrorZ (*CResult_boolLightningErrorZ_err)(LDKLightningError);
        public static native long CResult_boolLightningErrorZ_err(long arg);
-       /// extern const void (*CResult_boolLightningErrorZ_free)(LDKCResult_boolLightningErrorZ);
+       // extern const void (*CResult_boolLightningErrorZ_free)(LDKCResult_boolLightningErrorZ);
        public static native void CResult_boolLightningErrorZ_free(long arg);
-       /// extern const LDKCResult_boolLightningErrorZ (*CResult_boolLightningErrorZ_ok)(bool);
+       // extern const LDKCResult_boolLightningErrorZ (*CResult_boolLightningErrorZ_ok)(bool);
        public static native long CResult_boolLightningErrorZ_ok(boolean arg);
-       /// extern const LDKCResult_boolPeerHandleErrorZ (*CResult_boolPeerHandleErrorZ_err)(LDKPeerHandleError);
+       // extern const LDKCResult_boolPeerHandleErrorZ (*CResult_boolPeerHandleErrorZ_err)(LDKPeerHandleError);
        public static native long CResult_boolPeerHandleErrorZ_err(long arg);
-       /// extern const void (*CResult_boolPeerHandleErrorZ_free)(LDKCResult_boolPeerHandleErrorZ);
+       // extern const void (*CResult_boolPeerHandleErrorZ_free)(LDKCResult_boolPeerHandleErrorZ);
        public static native void CResult_boolPeerHandleErrorZ_free(long arg);
-       /// extern const LDKCResult_boolPeerHandleErrorZ (*CResult_boolPeerHandleErrorZ_ok)(bool);
+       // extern const LDKCResult_boolPeerHandleErrorZ (*CResult_boolPeerHandleErrorZ_ok)(bool);
        public static native long CResult_boolPeerHandleErrorZ_ok(boolean arg);
-       /// extern const void (*CVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ_free)(LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ);
+       // extern const void (*CVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ_free)(LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ);
        public static native void CVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ_free(long arg);
-       /// extern const void (*CVec_C2Tuple_TxidCVec_TxOutZZZ_free)(LDKCVec_C2Tuple_TxidCVec_TxOutZZZ);
+       // extern const void (*CVec_C2Tuple_TxidCVec_TxOutZZZ_free)(LDKCVec_C2Tuple_TxidCVec_TxOutZZZ);
        public static native void CVec_C2Tuple_TxidCVec_TxOutZZZ_free(long arg);
-       /// extern const void (*CVec_C2Tuple_usizeTransactionZZ_free)(LDKCVec_C2Tuple_usizeTransactionZZ);
+       // extern const void (*CVec_C2Tuple_usizeTransactionZZ_free)(LDKCVec_C2Tuple_usizeTransactionZZ);
        public static native void CVec_C2Tuple_usizeTransactionZZ_free(long arg);
-       /// extern const void (*CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free)(LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ);
+       // extern const void (*CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free)(LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ);
        public static native void CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(long arg);
-       /// extern const void (*CVec_CVec_RouteHopZZ_free)(LDKCVec_CVec_RouteHopZZ);
+       // extern const void (*CVec_CVec_RouteHopZZ_free)(LDKCVec_CVec_RouteHopZZ);
        public static native void CVec_CVec_RouteHopZZ_free(long arg);
-       /// extern const void (*CVec_ChannelDetailsZ_free)(LDKCVec_ChannelDetailsZ);
+       // extern const void (*CVec_ChannelDetailsZ_free)(LDKCVec_ChannelDetailsZ);
        public static native void CVec_ChannelDetailsZ_free(long arg);
-       /// extern const void (*CVec_ChannelMonitorZ_free)(LDKCVec_ChannelMonitorZ);
+       // extern const void (*CVec_ChannelMonitorZ_free)(LDKCVec_ChannelMonitorZ);
        public static native void CVec_ChannelMonitorZ_free(long arg);
-       /// extern const void (*CVec_EventZ_free)(LDKCVec_EventZ);
+       // extern const void (*CVec_EventZ_free)(LDKCVec_EventZ);
        public static native void CVec_EventZ_free(long arg);
-       /// extern const void (*CVec_HTLCOutputInCommitmentZ_free)(LDKCVec_HTLCOutputInCommitmentZ);
+       // extern const void (*CVec_HTLCOutputInCommitmentZ_free)(LDKCVec_HTLCOutputInCommitmentZ);
        public static native void CVec_HTLCOutputInCommitmentZ_free(long arg);
-       /// extern const void (*CVec_MessageSendEventZ_free)(LDKCVec_MessageSendEventZ);
+       // extern const void (*CVec_MessageSendEventZ_free)(LDKCVec_MessageSendEventZ);
        public static native void CVec_MessageSendEventZ_free(long arg);
-       /// extern const void (*CVec_MonitorEventZ_free)(LDKCVec_MonitorEventZ);
+       // extern const void (*CVec_MonitorEventZ_free)(LDKCVec_MonitorEventZ);
        public static native void CVec_MonitorEventZ_free(long arg);
-       /// extern const void (*CVec_NetAddressZ_free)(LDKCVec_NetAddressZ);
+       // extern const void (*CVec_NetAddressZ_free)(LDKCVec_NetAddressZ);
        public static native void CVec_NetAddressZ_free(long arg);
-       /// extern const void (*CVec_NodeAnnouncementZ_free)(LDKCVec_NodeAnnouncementZ);
+       // extern const void (*CVec_NodeAnnouncementZ_free)(LDKCVec_NodeAnnouncementZ);
        public static native void CVec_NodeAnnouncementZ_free(long arg);
-       /// extern const void (*CVec_PublicKeyZ_free)(LDKCVec_PublicKeyZ);
+       // extern const void (*CVec_PublicKeyZ_free)(LDKCVec_PublicKeyZ);
        public static native void CVec_PublicKeyZ_free(long arg);
-       /// extern const void (*CVec_RouteHintZ_free)(LDKCVec_RouteHintZ);
+       // extern const void (*CVec_RouteHintZ_free)(LDKCVec_RouteHintZ);
        public static native void CVec_RouteHintZ_free(long arg);
-       /// extern const void (*CVec_RouteHopZ_free)(LDKCVec_RouteHopZ);
+       // extern const void (*CVec_RouteHopZ_free)(LDKCVec_RouteHopZ);
        public static native void CVec_RouteHopZ_free(long arg);
-       /// extern const void (*CVec_SignatureZ_free)(LDKCVec_SignatureZ);
+       // extern const void (*CVec_SignatureZ_free)(LDKCVec_SignatureZ);
        public static native void CVec_SignatureZ_free(long arg);
-       /// extern const void (*CVec_SpendableOutputDescriptorZ_free)(LDKCVec_SpendableOutputDescriptorZ);
+       // extern const void (*CVec_SpendableOutputDescriptorZ_free)(LDKCVec_SpendableOutputDescriptorZ);
        public static native void CVec_SpendableOutputDescriptorZ_free(long arg);
-       /// extern const void (*CVec_TransactionZ_free)(LDKCVec_TransactionZ);
+       // extern const void (*CVec_TransactionZ_free)(LDKCVec_TransactionZ);
        public static native void CVec_TransactionZ_free(long arg);
-       /// extern const void (*CVec_TxOutZ_free)(LDKCVec_TxOutZ);
+       // extern const void (*CVec_TxOutZ_free)(LDKCVec_TxOutZ);
        public static native void CVec_TxOutZ_free(long arg);
-       /// extern const void (*CVec_UpdateAddHTLCZ_free)(LDKCVec_UpdateAddHTLCZ);
+       // extern const void (*CVec_UpdateAddHTLCZ_free)(LDKCVec_UpdateAddHTLCZ);
        public static native void CVec_UpdateAddHTLCZ_free(long arg);
-       /// extern const void (*CVec_UpdateFailHTLCZ_free)(LDKCVec_UpdateFailHTLCZ);
+       // extern const void (*CVec_UpdateFailHTLCZ_free)(LDKCVec_UpdateFailHTLCZ);
        public static native void CVec_UpdateFailHTLCZ_free(long arg);
-       /// extern const void (*CVec_UpdateFailMalformedHTLCZ_free)(LDKCVec_UpdateFailMalformedHTLCZ);
+       // extern const void (*CVec_UpdateFailMalformedHTLCZ_free)(LDKCVec_UpdateFailMalformedHTLCZ);
        public static native void CVec_UpdateFailMalformedHTLCZ_free(long arg);
-       /// extern const void (*CVec_UpdateFulfillHTLCZ_free)(LDKCVec_UpdateFulfillHTLCZ);
+       // extern const void (*CVec_UpdateFulfillHTLCZ_free)(LDKCVec_UpdateFulfillHTLCZ);
        public static native void CVec_UpdateFulfillHTLCZ_free(long arg);
-       /// extern const void (*CVec_u64Z_free)(LDKCVec_u64Z);
+       // extern const void (*CVec_u64Z_free)(LDKCVec_u64Z);
        public static native void CVec_u64Z_free(long arg);
-       /// extern const void (*CVec_u8Z_free)(LDKCVec_u8Z);
+       // extern const void (*CVec_u8Z_free)(LDKCVec_u8Z);
        public static native void CVec_u8Z_free(long arg);
-       /// void Transaction_free(LDKTransaction _res);
+       // void Transaction_free(LDKTransaction _res);
        public static native void Transaction_free(long _res);
-       /// void TxOut_free(LDKTxOut _res);
+       // void TxOut_free(LDKTxOut _res);
        public static native void TxOut_free(long _res);
-       /// LDKC2Tuple_usizeTransactionZ C2Tuple_usizeTransactionZ_new(uintptr_t a, LDKTransaction b);
+       // LDKC2Tuple_usizeTransactionZ C2Tuple_usizeTransactionZ_new(uintptr_t a, LDKTransaction b);
        public static native long C2Tuple_usizeTransactionZ_new(long a, long b);
-       /// LDKCResult_NoneChannelMonitorUpdateErrZ CResult_NoneChannelMonitorUpdateErrZ_ok(void);
+       // LDKCResult_NoneChannelMonitorUpdateErrZ CResult_NoneChannelMonitorUpdateErrZ_ok(void);
        public static native long CResult_NoneChannelMonitorUpdateErrZ_ok();
-       /// LDKCResult_NoneMonitorUpdateErrorZ CResult_NoneMonitorUpdateErrorZ_ok(void);
+       // LDKCResult_NoneMonitorUpdateErrorZ CResult_NoneMonitorUpdateErrorZ_ok(void);
        public static native long CResult_NoneMonitorUpdateErrorZ_ok();
-       /// LDKC2Tuple_OutPointScriptZ C2Tuple_OutPointScriptZ_new(LDKOutPoint a, LDKCVec_u8Z b);
+       // LDKC2Tuple_OutPointScriptZ C2Tuple_OutPointScriptZ_new(LDKOutPoint a, LDKCVec_u8Z b);
        public static native long C2Tuple_OutPointScriptZ_new(long a, long b);
-       /// LDKC2Tuple_TxidCVec_TxOutZZ C2Tuple_TxidCVec_TxOutZZ_new(LDKThirtyTwoBytes a, LDKCVec_TxOutZ b);
+       // LDKC2Tuple_TxidCVec_TxOutZZ C2Tuple_TxidCVec_TxOutZZ_new(LDKThirtyTwoBytes a, LDKCVec_TxOutZ b);
        public static native long C2Tuple_TxidCVec_TxOutZZ_new(long a, long b);
-       /// LDKC2Tuple_u64u64Z C2Tuple_u64u64Z_new(uint64_t a, uint64_t b);
+       // LDKC2Tuple_u64u64Z C2Tuple_u64u64Z_new(uint64_t a, uint64_t b);
        public static native long C2Tuple_u64u64Z_new(long a, long b);
-       /// LDKC2Tuple_SignatureCVec_SignatureZZ C2Tuple_SignatureCVec_SignatureZZ_new(LDKSignature a, LDKCVec_SignatureZ b);
+       // LDKC2Tuple_SignatureCVec_SignatureZZ C2Tuple_SignatureCVec_SignatureZZ_new(LDKSignature a, LDKCVec_SignatureZ b);
        public static native long C2Tuple_SignatureCVec_SignatureZZ_new(long a, long b);
-       /// LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(void);
+       // LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(void);
        public static native long CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err();
-       /// LDKCResult_SignatureNoneZ CResult_SignatureNoneZ_err(void);
+       // LDKCResult_SignatureNoneZ CResult_SignatureNoneZ_err(void);
        public static native long CResult_SignatureNoneZ_err();
-       /// LDKCResult_CVec_SignatureZNoneZ CResult_CVec_SignatureZNoneZ_err(void);
+       // LDKCResult_CVec_SignatureZNoneZ CResult_CVec_SignatureZNoneZ_err(void);
        public static native long CResult_CVec_SignatureZNoneZ_err();
-       /// LDKCResult_NoneAPIErrorZ CResult_NoneAPIErrorZ_ok(void);
+       // LDKCResult_NoneAPIErrorZ CResult_NoneAPIErrorZ_ok(void);
        public static native long CResult_NoneAPIErrorZ_ok();
-       /// LDKCResult_NonePaymentSendFailureZ CResult_NonePaymentSendFailureZ_ok(void);
+       // LDKCResult_NonePaymentSendFailureZ CResult_NonePaymentSendFailureZ_ok(void);
        public static native long CResult_NonePaymentSendFailureZ_ok();
-       /// LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(LDKChannelAnnouncement a, LDKChannelUpdate b, LDKChannelUpdate c);
+       // LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(LDKChannelAnnouncement a, LDKChannelUpdate b, LDKChannelUpdate c);
        public static native long C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(long a, long b, long c);
-       /// LDKCResult_NonePeerHandleErrorZ CResult_NonePeerHandleErrorZ_ok(void);
+       // LDKCResult_NonePeerHandleErrorZ CResult_NonePeerHandleErrorZ_ok(void);
        public static native long CResult_NonePeerHandleErrorZ_ok();
-       /// LDKC2Tuple_HTLCOutputInCommitmentSignatureZ C2Tuple_HTLCOutputInCommitmentSignatureZ_new(LDKHTLCOutputInCommitment a, LDKSignature b);
+       // LDKC2Tuple_HTLCOutputInCommitmentSignatureZ C2Tuple_HTLCOutputInCommitmentSignatureZ_new(LDKHTLCOutputInCommitment a, LDKSignature b);
        public static native long C2Tuple_HTLCOutputInCommitmentSignatureZ_new(long a, long b);
-       /// void Event_free(LDKEvent this_ptr);
+       // void Event_free(LDKEvent this_ptr);
        public static native void Event_free(long this_ptr);
-       /// void MessageSendEvent_free(LDKMessageSendEvent this_ptr);
+       // void MessageSendEvent_free(LDKMessageSendEvent this_ptr);
        public static native void MessageSendEvent_free(long this_ptr);
-       /// void MessageSendEventsProvider_free(LDKMessageSendEventsProvider this_ptr);
+       // void MessageSendEventsProvider_free(LDKMessageSendEventsProvider this_ptr);
        public static native void MessageSendEventsProvider_free(long this_ptr);
-       /// void EventsProvider_free(LDKEventsProvider this_ptr);
+       // void EventsProvider_free(LDKEventsProvider this_ptr);
        public static native void EventsProvider_free(long this_ptr);
-       /// void APIError_free(LDKAPIError this_ptr);
+       // void APIError_free(LDKAPIError this_ptr);
        public static native void APIError_free(long this_ptr);
-       /// MUST_USE_RES LDKLevel Level_max(void);
+       // MUST_USE_RES LDKLevel Level_max(void);
        public static native LDKLevel Level_max();
-       /// void Logger_free(LDKLogger this_ptr);
+       // void Logger_free(LDKLogger this_ptr);
        public static native void Logger_free(long this_ptr);
-       /// void ChannelHandshakeConfig_free(LDKChannelHandshakeConfig this_ptr);
+       // void ChannelHandshakeConfig_free(LDKChannelHandshakeConfig this_ptr);
        public static native void ChannelHandshakeConfig_free(long this_ptr);
-       /// uint32_t ChannelHandshakeConfig_get_minimum_depth(const LDKChannelHandshakeConfig *this_ptr);
+       // uint32_t ChannelHandshakeConfig_get_minimum_depth(const LDKChannelHandshakeConfig *this_ptr);
        public static native int ChannelHandshakeConfig_get_minimum_depth(long this_ptr);
-       /// void ChannelHandshakeConfig_set_minimum_depth(LDKChannelHandshakeConfig *this_ptr, uint32_t val);
+       // void ChannelHandshakeConfig_set_minimum_depth(LDKChannelHandshakeConfig *this_ptr, uint32_t val);
        public static native void ChannelHandshakeConfig_set_minimum_depth(long this_ptr, int val);
-       /// uint16_t ChannelHandshakeConfig_get_our_to_self_delay(const LDKChannelHandshakeConfig *this_ptr);
+       // uint16_t ChannelHandshakeConfig_get_our_to_self_delay(const LDKChannelHandshakeConfig *this_ptr);
        public static native short ChannelHandshakeConfig_get_our_to_self_delay(long this_ptr);
-       /// void ChannelHandshakeConfig_set_our_to_self_delay(LDKChannelHandshakeConfig *this_ptr, uint16_t val);
+       // void ChannelHandshakeConfig_set_our_to_self_delay(LDKChannelHandshakeConfig *this_ptr, uint16_t val);
        public static native void ChannelHandshakeConfig_set_our_to_self_delay(long this_ptr, short val);
-       /// uint64_t ChannelHandshakeConfig_get_our_htlc_minimum_msat(const LDKChannelHandshakeConfig *this_ptr);
+       // uint64_t ChannelHandshakeConfig_get_our_htlc_minimum_msat(const LDKChannelHandshakeConfig *this_ptr);
        public static native long ChannelHandshakeConfig_get_our_htlc_minimum_msat(long this_ptr);
-       /// void ChannelHandshakeConfig_set_our_htlc_minimum_msat(LDKChannelHandshakeConfig *this_ptr, uint64_t val);
+       // void ChannelHandshakeConfig_set_our_htlc_minimum_msat(LDKChannelHandshakeConfig *this_ptr, uint64_t val);
        public static native void ChannelHandshakeConfig_set_our_htlc_minimum_msat(long this_ptr, long val);
-       /// MUST_USE_RES LDKChannelHandshakeConfig ChannelHandshakeConfig_new(uint32_t minimum_depth_arg, uint16_t our_to_self_delay_arg, uint64_t our_htlc_minimum_msat_arg);
+       // MUST_USE_RES LDKChannelHandshakeConfig ChannelHandshakeConfig_new(uint32_t minimum_depth_arg, uint16_t our_to_self_delay_arg, uint64_t our_htlc_minimum_msat_arg);
        public static native long ChannelHandshakeConfig_new(int minimum_depth_arg, short our_to_self_delay_arg, long our_htlc_minimum_msat_arg);
-       /// MUST_USE_RES LDKChannelHandshakeConfig ChannelHandshakeConfig_default(void);
+       // MUST_USE_RES LDKChannelHandshakeConfig ChannelHandshakeConfig_default(void);
        public static native long ChannelHandshakeConfig_default();
-       /// void ChannelHandshakeLimits_free(LDKChannelHandshakeLimits this_ptr);
+       // void ChannelHandshakeLimits_free(LDKChannelHandshakeLimits this_ptr);
        public static native void ChannelHandshakeLimits_free(long this_ptr);
-       /// uint64_t ChannelHandshakeLimits_get_min_funding_satoshis(const LDKChannelHandshakeLimits *this_ptr);
+       // uint64_t ChannelHandshakeLimits_get_min_funding_satoshis(const LDKChannelHandshakeLimits *this_ptr);
        public static native long ChannelHandshakeLimits_get_min_funding_satoshis(long this_ptr);
-       /// void ChannelHandshakeLimits_set_min_funding_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
+       // void ChannelHandshakeLimits_set_min_funding_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
        public static native void ChannelHandshakeLimits_set_min_funding_satoshis(long this_ptr, long val);
-       /// uint64_t ChannelHandshakeLimits_get_max_htlc_minimum_msat(const LDKChannelHandshakeLimits *this_ptr);
+       // uint64_t ChannelHandshakeLimits_get_max_htlc_minimum_msat(const LDKChannelHandshakeLimits *this_ptr);
        public static native long ChannelHandshakeLimits_get_max_htlc_minimum_msat(long this_ptr);
-       /// void ChannelHandshakeLimits_set_max_htlc_minimum_msat(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
+       // void ChannelHandshakeLimits_set_max_htlc_minimum_msat(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
        public static native void ChannelHandshakeLimits_set_max_htlc_minimum_msat(long this_ptr, long val);
-       /// uint64_t ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(const LDKChannelHandshakeLimits *this_ptr);
+       // uint64_t ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(const LDKChannelHandshakeLimits *this_ptr);
        public static native long ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(long this_ptr);
-       /// void ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
+       // void ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
        public static native void ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(long this_ptr, long val);
-       /// uint64_t ChannelHandshakeLimits_get_max_channel_reserve_satoshis(const LDKChannelHandshakeLimits *this_ptr);
+       // uint64_t ChannelHandshakeLimits_get_max_channel_reserve_satoshis(const LDKChannelHandshakeLimits *this_ptr);
        public static native long ChannelHandshakeLimits_get_max_channel_reserve_satoshis(long this_ptr);
-       /// void ChannelHandshakeLimits_set_max_channel_reserve_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
+       // void ChannelHandshakeLimits_set_max_channel_reserve_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
        public static native void ChannelHandshakeLimits_set_max_channel_reserve_satoshis(long this_ptr, long val);
-       /// uint16_t ChannelHandshakeLimits_get_min_max_accepted_htlcs(const LDKChannelHandshakeLimits *this_ptr);
+       // uint16_t ChannelHandshakeLimits_get_min_max_accepted_htlcs(const LDKChannelHandshakeLimits *this_ptr);
        public static native short ChannelHandshakeLimits_get_min_max_accepted_htlcs(long this_ptr);
-       /// void ChannelHandshakeLimits_set_min_max_accepted_htlcs(LDKChannelHandshakeLimits *this_ptr, uint16_t val);
+       // void ChannelHandshakeLimits_set_min_max_accepted_htlcs(LDKChannelHandshakeLimits *this_ptr, uint16_t val);
        public static native void ChannelHandshakeLimits_set_min_max_accepted_htlcs(long this_ptr, short val);
-       /// uint64_t ChannelHandshakeLimits_get_min_dust_limit_satoshis(const LDKChannelHandshakeLimits *this_ptr);
+       // uint64_t ChannelHandshakeLimits_get_min_dust_limit_satoshis(const LDKChannelHandshakeLimits *this_ptr);
        public static native long ChannelHandshakeLimits_get_min_dust_limit_satoshis(long this_ptr);
-       /// void ChannelHandshakeLimits_set_min_dust_limit_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
+       // void ChannelHandshakeLimits_set_min_dust_limit_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
        public static native void ChannelHandshakeLimits_set_min_dust_limit_satoshis(long this_ptr, long val);
-       /// uint64_t ChannelHandshakeLimits_get_max_dust_limit_satoshis(const LDKChannelHandshakeLimits *this_ptr);
+       // uint64_t ChannelHandshakeLimits_get_max_dust_limit_satoshis(const LDKChannelHandshakeLimits *this_ptr);
        public static native long ChannelHandshakeLimits_get_max_dust_limit_satoshis(long this_ptr);
-       /// void ChannelHandshakeLimits_set_max_dust_limit_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
+       // void ChannelHandshakeLimits_set_max_dust_limit_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val);
        public static native void ChannelHandshakeLimits_set_max_dust_limit_satoshis(long this_ptr, long val);
-       /// uint32_t ChannelHandshakeLimits_get_max_minimum_depth(const LDKChannelHandshakeLimits *this_ptr);
+       // uint32_t ChannelHandshakeLimits_get_max_minimum_depth(const LDKChannelHandshakeLimits *this_ptr);
        public static native int ChannelHandshakeLimits_get_max_minimum_depth(long this_ptr);
-       /// void ChannelHandshakeLimits_set_max_minimum_depth(LDKChannelHandshakeLimits *this_ptr, uint32_t val);
+       // void ChannelHandshakeLimits_set_max_minimum_depth(LDKChannelHandshakeLimits *this_ptr, uint32_t val);
        public static native void ChannelHandshakeLimits_set_max_minimum_depth(long this_ptr, int val);
-       /// bool ChannelHandshakeLimits_get_force_announced_channel_preference(const LDKChannelHandshakeLimits *this_ptr);
+       // bool ChannelHandshakeLimits_get_force_announced_channel_preference(const LDKChannelHandshakeLimits *this_ptr);
        public static native boolean ChannelHandshakeLimits_get_force_announced_channel_preference(long this_ptr);
-       /// void ChannelHandshakeLimits_set_force_announced_channel_preference(LDKChannelHandshakeLimits *this_ptr, bool val);
+       // void ChannelHandshakeLimits_set_force_announced_channel_preference(LDKChannelHandshakeLimits *this_ptr, bool val);
        public static native void ChannelHandshakeLimits_set_force_announced_channel_preference(long this_ptr, boolean val);
-       /// uint16_t ChannelHandshakeLimits_get_their_to_self_delay(const LDKChannelHandshakeLimits *this_ptr);
+       // uint16_t ChannelHandshakeLimits_get_their_to_self_delay(const LDKChannelHandshakeLimits *this_ptr);
        public static native short ChannelHandshakeLimits_get_their_to_self_delay(long this_ptr);
-       /// void ChannelHandshakeLimits_set_their_to_self_delay(LDKChannelHandshakeLimits *this_ptr, uint16_t val);
+       // void ChannelHandshakeLimits_set_their_to_self_delay(LDKChannelHandshakeLimits *this_ptr, uint16_t val);
        public static native void ChannelHandshakeLimits_set_their_to_self_delay(long this_ptr, short val);
-       /// MUST_USE_RES LDKChannelHandshakeLimits ChannelHandshakeLimits_new(uint64_t min_funding_satoshis_arg, uint64_t max_htlc_minimum_msat_arg, uint64_t min_max_htlc_value_in_flight_msat_arg, uint64_t max_channel_reserve_satoshis_arg, uint16_t min_max_accepted_htlcs_arg, uint64_t min_dust_limit_satoshis_arg, uint64_t max_dust_limit_satoshis_arg, uint32_t max_minimum_depth_arg, bool force_announced_channel_preference_arg, uint16_t their_to_self_delay_arg);
+       // MUST_USE_RES LDKChannelHandshakeLimits ChannelHandshakeLimits_new(uint64_t min_funding_satoshis_arg, uint64_t max_htlc_minimum_msat_arg, uint64_t min_max_htlc_value_in_flight_msat_arg, uint64_t max_channel_reserve_satoshis_arg, uint16_t min_max_accepted_htlcs_arg, uint64_t min_dust_limit_satoshis_arg, uint64_t max_dust_limit_satoshis_arg, uint32_t max_minimum_depth_arg, bool force_announced_channel_preference_arg, uint16_t their_to_self_delay_arg);
        public static native long ChannelHandshakeLimits_new(long min_funding_satoshis_arg, long max_htlc_minimum_msat_arg, long min_max_htlc_value_in_flight_msat_arg, long max_channel_reserve_satoshis_arg, short min_max_accepted_htlcs_arg, long min_dust_limit_satoshis_arg, long max_dust_limit_satoshis_arg, int max_minimum_depth_arg, boolean force_announced_channel_preference_arg, short their_to_self_delay_arg);
-       /// MUST_USE_RES LDKChannelHandshakeLimits ChannelHandshakeLimits_default(void);
+       // MUST_USE_RES LDKChannelHandshakeLimits ChannelHandshakeLimits_default(void);
        public static native long ChannelHandshakeLimits_default();
-       /// void ChannelConfig_free(LDKChannelConfig this_ptr);
+       // void ChannelConfig_free(LDKChannelConfig this_ptr);
        public static native void ChannelConfig_free(long this_ptr);
-       /// uint32_t ChannelConfig_get_fee_proportional_millionths(const LDKChannelConfig *this_ptr);
+       // uint32_t ChannelConfig_get_fee_proportional_millionths(const LDKChannelConfig *this_ptr);
        public static native int ChannelConfig_get_fee_proportional_millionths(long this_ptr);
-       /// void ChannelConfig_set_fee_proportional_millionths(LDKChannelConfig *this_ptr, uint32_t val);
+       // void ChannelConfig_set_fee_proportional_millionths(LDKChannelConfig *this_ptr, uint32_t val);
        public static native void ChannelConfig_set_fee_proportional_millionths(long this_ptr, int val);
-       /// bool ChannelConfig_get_announced_channel(const LDKChannelConfig *this_ptr);
+       // bool ChannelConfig_get_announced_channel(const LDKChannelConfig *this_ptr);
        public static native boolean ChannelConfig_get_announced_channel(long this_ptr);
-       /// void ChannelConfig_set_announced_channel(LDKChannelConfig *this_ptr, bool val);
+       // void ChannelConfig_set_announced_channel(LDKChannelConfig *this_ptr, bool val);
        public static native void ChannelConfig_set_announced_channel(long this_ptr, boolean val);
-       /// bool ChannelConfig_get_commit_upfront_shutdown_pubkey(const LDKChannelConfig *this_ptr);
+       // bool ChannelConfig_get_commit_upfront_shutdown_pubkey(const LDKChannelConfig *this_ptr);
        public static native boolean ChannelConfig_get_commit_upfront_shutdown_pubkey(long this_ptr);
-       /// void ChannelConfig_set_commit_upfront_shutdown_pubkey(LDKChannelConfig *this_ptr, bool val);
+       // void ChannelConfig_set_commit_upfront_shutdown_pubkey(LDKChannelConfig *this_ptr, bool val);
        public static native void ChannelConfig_set_commit_upfront_shutdown_pubkey(long this_ptr, boolean val);
-       /// MUST_USE_RES LDKChannelConfig ChannelConfig_new(uint32_t fee_proportional_millionths_arg, bool announced_channel_arg, bool commit_upfront_shutdown_pubkey_arg);
+       // MUST_USE_RES LDKChannelConfig ChannelConfig_new(uint32_t fee_proportional_millionths_arg, bool announced_channel_arg, bool commit_upfront_shutdown_pubkey_arg);
        public static native long ChannelConfig_new(int fee_proportional_millionths_arg, boolean announced_channel_arg, boolean commit_upfront_shutdown_pubkey_arg);
-       /// MUST_USE_RES LDKChannelConfig ChannelConfig_default(void);
+       // MUST_USE_RES LDKChannelConfig ChannelConfig_default(void);
        public static native long ChannelConfig_default();
-       /// LDKCVec_u8Z ChannelConfig_write(const LDKChannelConfig *obj);
+       // LDKCVec_u8Z ChannelConfig_write(const LDKChannelConfig *obj);
        public static native long ChannelConfig_write(long obj);
-       /// LDKChannelConfig ChannelConfig_read(LDKu8slice ser);
+       // LDKChannelConfig ChannelConfig_read(LDKu8slice ser);
        public static native long ChannelConfig_read(long ser);
-       /// void UserConfig_free(LDKUserConfig this_ptr);
+       // void UserConfig_free(LDKUserConfig this_ptr);
        public static native void UserConfig_free(long this_ptr);
-       /// LDKChannelHandshakeConfig UserConfig_get_own_channel_config(const LDKUserConfig *this_ptr);
+       // LDKChannelHandshakeConfig UserConfig_get_own_channel_config(const LDKUserConfig *this_ptr);
        public static native long UserConfig_get_own_channel_config(long this_ptr);
-       /// void UserConfig_set_own_channel_config(LDKUserConfig *this_ptr, LDKChannelHandshakeConfig val);
+       // void UserConfig_set_own_channel_config(LDKUserConfig *this_ptr, LDKChannelHandshakeConfig val);
        public static native void UserConfig_set_own_channel_config(long this_ptr, long val);
-       /// LDKChannelHandshakeLimits UserConfig_get_peer_channel_config_limits(const LDKUserConfig *this_ptr);
+       // LDKChannelHandshakeLimits UserConfig_get_peer_channel_config_limits(const LDKUserConfig *this_ptr);
        public static native long UserConfig_get_peer_channel_config_limits(long this_ptr);
-       /// void UserConfig_set_peer_channel_config_limits(LDKUserConfig *this_ptr, LDKChannelHandshakeLimits val);
+       // void UserConfig_set_peer_channel_config_limits(LDKUserConfig *this_ptr, LDKChannelHandshakeLimits val);
        public static native void UserConfig_set_peer_channel_config_limits(long this_ptr, long val);
-       /// LDKChannelConfig UserConfig_get_channel_options(const LDKUserConfig *this_ptr);
+       // LDKChannelConfig UserConfig_get_channel_options(const LDKUserConfig *this_ptr);
        public static native long UserConfig_get_channel_options(long this_ptr);
-       /// void UserConfig_set_channel_options(LDKUserConfig *this_ptr, LDKChannelConfig val);
+       // void UserConfig_set_channel_options(LDKUserConfig *this_ptr, LDKChannelConfig val);
        public static native void UserConfig_set_channel_options(long this_ptr, long val);
-       /// MUST_USE_RES LDKUserConfig UserConfig_new(LDKChannelHandshakeConfig own_channel_config_arg, LDKChannelHandshakeLimits peer_channel_config_limits_arg, LDKChannelConfig channel_options_arg);
+       // MUST_USE_RES LDKUserConfig UserConfig_new(LDKChannelHandshakeConfig own_channel_config_arg, LDKChannelHandshakeLimits peer_channel_config_limits_arg, LDKChannelConfig channel_options_arg);
        public static native long UserConfig_new(long own_channel_config_arg, long peer_channel_config_limits_arg, long channel_options_arg);
-       /// MUST_USE_RES LDKUserConfig UserConfig_default(void);
+       // MUST_USE_RES LDKUserConfig UserConfig_default(void);
        public static native long UserConfig_default();
-       /// void Access_free(LDKAccess this_ptr);
+       // void Access_free(LDKAccess this_ptr);
        public static native void Access_free(long this_ptr);
-       /// void Watch_free(LDKWatch this_ptr);
+       // void Watch_free(LDKWatch this_ptr);
        public static native void Watch_free(long this_ptr);
-       /// void Filter_free(LDKFilter this_ptr);
+       // void Filter_free(LDKFilter this_ptr);
        public static native void Filter_free(long this_ptr);
-       /// void BroadcasterInterface_free(LDKBroadcasterInterface this_ptr);
+       // void BroadcasterInterface_free(LDKBroadcasterInterface this_ptr);
        public static native void BroadcasterInterface_free(long this_ptr);
-       /// void FeeEstimator_free(LDKFeeEstimator this_ptr);
+       // void FeeEstimator_free(LDKFeeEstimator this_ptr);
        public static native void FeeEstimator_free(long this_ptr);
-       /// void ChainMonitor_free(LDKChainMonitor this_ptr);
+       // void ChainMonitor_free(LDKChainMonitor this_ptr);
        public static native void ChainMonitor_free(long this_ptr);
-       /// void ChainMonitor_block_connected(const LDKChainMonitor *this_arg, const uint8_t (*header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height);
+       // void ChainMonitor_block_connected(const LDKChainMonitor *this_arg, const uint8_t (*header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height);
        public static native void ChainMonitor_block_connected(long this_arg, byte[] header, long txdata, int height);
-       /// void ChainMonitor_block_disconnected(const LDKChainMonitor *this_arg, const uint8_t (*header)[80], uint32_t disconnected_height);
+       // void ChainMonitor_block_disconnected(const LDKChainMonitor *this_arg, const uint8_t (*header)[80], uint32_t disconnected_height);
        public static native void ChainMonitor_block_disconnected(long this_arg, byte[] header, int disconnected_height);
-       /// MUST_USE_RES LDKChainMonitor ChainMonitor_new(LDKFilter *chain_source, LDKBroadcasterInterface broadcaster, LDKLogger logger, LDKFeeEstimator feeest);
+       // MUST_USE_RES LDKChainMonitor ChainMonitor_new(LDKFilter *chain_source, LDKBroadcasterInterface broadcaster, LDKLogger logger, LDKFeeEstimator feeest);
        public static native long ChainMonitor_new(long chain_source, long broadcaster, long logger, long feeest);
-       /// LDKWatch ChainMonitor_as_Watch(const LDKChainMonitor *this_arg);
+       // LDKWatch ChainMonitor_as_Watch(const LDKChainMonitor *this_arg);
        public static native long ChainMonitor_as_Watch(long this_arg);
-       /// LDKEventsProvider ChainMonitor_as_EventsProvider(const LDKChainMonitor *this_arg);
+       // LDKEventsProvider ChainMonitor_as_EventsProvider(const LDKChainMonitor *this_arg);
        public static native long ChainMonitor_as_EventsProvider(long this_arg);
-       /// void ChannelMonitorUpdate_free(LDKChannelMonitorUpdate this_ptr);
+       // void ChannelMonitorUpdate_free(LDKChannelMonitorUpdate this_ptr);
        public static native void ChannelMonitorUpdate_free(long this_ptr);
-       /// uint64_t ChannelMonitorUpdate_get_update_id(const LDKChannelMonitorUpdate *this_ptr);
+       // uint64_t ChannelMonitorUpdate_get_update_id(const LDKChannelMonitorUpdate *this_ptr);
        public static native long ChannelMonitorUpdate_get_update_id(long this_ptr);
-       /// void ChannelMonitorUpdate_set_update_id(LDKChannelMonitorUpdate *this_ptr, uint64_t val);
+       // void ChannelMonitorUpdate_set_update_id(LDKChannelMonitorUpdate *this_ptr, uint64_t val);
        public static native void ChannelMonitorUpdate_set_update_id(long this_ptr, long val);
-       /// LDKCVec_u8Z ChannelMonitorUpdate_write(const LDKChannelMonitorUpdate *obj);
+       // LDKCVec_u8Z ChannelMonitorUpdate_write(const LDKChannelMonitorUpdate *obj);
        public static native long ChannelMonitorUpdate_write(long obj);
-       /// LDKChannelMonitorUpdate ChannelMonitorUpdate_read(LDKu8slice ser);
+       // LDKChannelMonitorUpdate ChannelMonitorUpdate_read(LDKu8slice ser);
        public static native long ChannelMonitorUpdate_read(long ser);
-       /// void MonitorUpdateError_free(LDKMonitorUpdateError this_ptr);
+       // void MonitorUpdateError_free(LDKMonitorUpdateError this_ptr);
        public static native void MonitorUpdateError_free(long this_ptr);
-       /// void MonitorEvent_free(LDKMonitorEvent this_ptr);
+       // void MonitorEvent_free(LDKMonitorEvent this_ptr);
        public static native void MonitorEvent_free(long this_ptr);
-       /// void HTLCUpdate_free(LDKHTLCUpdate this_ptr);
+       // void HTLCUpdate_free(LDKHTLCUpdate this_ptr);
        public static native void HTLCUpdate_free(long this_ptr);
-       /// LDKCVec_u8Z HTLCUpdate_write(const LDKHTLCUpdate *obj);
+       // LDKCVec_u8Z HTLCUpdate_write(const LDKHTLCUpdate *obj);
        public static native long HTLCUpdate_write(long obj);
-       /// LDKHTLCUpdate HTLCUpdate_read(LDKu8slice ser);
+       // LDKHTLCUpdate HTLCUpdate_read(LDKu8slice ser);
        public static native long HTLCUpdate_read(long ser);
-       /// void ChannelMonitor_free(LDKChannelMonitor this_ptr);
+       // void ChannelMonitor_free(LDKChannelMonitor this_ptr);
        public static native void ChannelMonitor_free(long this_ptr);
-       /// MUST_USE_RES LDKCResult_NoneMonitorUpdateErrorZ ChannelMonitor_update_monitor(LDKChannelMonitor *this_arg, LDKChannelMonitorUpdate updates, const LDKBroadcasterInterface *broadcaster, const LDKLogger *logger);
+       // MUST_USE_RES LDKCResult_NoneMonitorUpdateErrorZ ChannelMonitor_update_monitor(LDKChannelMonitor *this_arg, LDKChannelMonitorUpdate updates, const LDKBroadcasterInterface *broadcaster, const LDKLogger *logger);
        public static native long ChannelMonitor_update_monitor(long this_arg, long updates, long broadcaster, long logger);
-       /// MUST_USE_RES uint64_t ChannelMonitor_get_latest_update_id(const LDKChannelMonitor *this_arg);
+       // MUST_USE_RES uint64_t ChannelMonitor_get_latest_update_id(const LDKChannelMonitor *this_arg);
        public static native long ChannelMonitor_get_latest_update_id(long this_arg);
-       /// MUST_USE_RES LDKC2Tuple_OutPointScriptZ ChannelMonitor_get_funding_txo(const LDKChannelMonitor *this_arg);
+       // MUST_USE_RES LDKC2Tuple_OutPointScriptZ ChannelMonitor_get_funding_txo(const LDKChannelMonitor *this_arg);
        public static native long ChannelMonitor_get_funding_txo(long this_arg);
-       /// MUST_USE_RES LDKCVec_MonitorEventZ ChannelMonitor_get_and_clear_pending_monitor_events(LDKChannelMonitor *this_arg);
+       // MUST_USE_RES LDKCVec_MonitorEventZ ChannelMonitor_get_and_clear_pending_monitor_events(LDKChannelMonitor *this_arg);
        public static native long ChannelMonitor_get_and_clear_pending_monitor_events(long this_arg);
-       /// MUST_USE_RES LDKCVec_EventZ ChannelMonitor_get_and_clear_pending_events(LDKChannelMonitor *this_arg);
+       // MUST_USE_RES LDKCVec_EventZ ChannelMonitor_get_and_clear_pending_events(LDKChannelMonitor *this_arg);
        public static native long ChannelMonitor_get_and_clear_pending_events(long this_arg);
-       /// MUST_USE_RES LDKCVec_TransactionZ ChannelMonitor_get_latest_holder_commitment_txn(LDKChannelMonitor *this_arg, const LDKLogger *logger);
+       // MUST_USE_RES LDKCVec_TransactionZ ChannelMonitor_get_latest_holder_commitment_txn(LDKChannelMonitor *this_arg, const LDKLogger *logger);
        public static native long ChannelMonitor_get_latest_holder_commitment_txn(long this_arg, long logger);
-       /// MUST_USE_RES LDKCVec_C2Tuple_TxidCVec_TxOutZZZ ChannelMonitor_block_connected(LDKChannelMonitor *this_arg, const uint8_t (*header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height, LDKBroadcasterInterface broadcaster, LDKFeeEstimator fee_estimator, LDKLogger logger);
+       // MUST_USE_RES LDKCVec_C2Tuple_TxidCVec_TxOutZZZ ChannelMonitor_block_connected(LDKChannelMonitor *this_arg, const uint8_t (*header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height, LDKBroadcasterInterface broadcaster, LDKFeeEstimator fee_estimator, LDKLogger logger);
        public static native long ChannelMonitor_block_connected(long this_arg, byte[] header, long txdata, int height, long broadcaster, long fee_estimator, long logger);
-       /// void ChannelMonitor_block_disconnected(LDKChannelMonitor *this_arg, const uint8_t (*header)[80], uint32_t height, LDKBroadcasterInterface broadcaster, LDKFeeEstimator fee_estimator, LDKLogger logger);
+       // void ChannelMonitor_block_disconnected(LDKChannelMonitor *this_arg, const uint8_t (*header)[80], uint32_t height, LDKBroadcasterInterface broadcaster, LDKFeeEstimator fee_estimator, LDKLogger logger);
        public static native void ChannelMonitor_block_disconnected(long this_arg, byte[] header, int height, long broadcaster, long fee_estimator, long logger);
-       /// void OutPoint_free(LDKOutPoint this_ptr);
+       // void OutPoint_free(LDKOutPoint this_ptr);
        public static native void OutPoint_free(long this_ptr);
-       /// const uint8_t (*OutPoint_get_txid(const LDKOutPoint *this_ptr))[32];
+       // const uint8_t (*OutPoint_get_txid(const LDKOutPoint *this_ptr))[32];
        public static native byte[] OutPoint_get_txid(long this_ptr);
-       /// void OutPoint_set_txid(LDKOutPoint *this_ptr, LDKThirtyTwoBytes val);
+       // void OutPoint_set_txid(LDKOutPoint *this_ptr, LDKThirtyTwoBytes val);
        public static native void OutPoint_set_txid(long this_ptr, long val);
-       /// uint16_t OutPoint_get_index(const LDKOutPoint *this_ptr);
+       // uint16_t OutPoint_get_index(const LDKOutPoint *this_ptr);
        public static native short OutPoint_get_index(long this_ptr);
-       /// void OutPoint_set_index(LDKOutPoint *this_ptr, uint16_t val);
+       // void OutPoint_set_index(LDKOutPoint *this_ptr, uint16_t val);
        public static native void OutPoint_set_index(long this_ptr, short val);
-       /// MUST_USE_RES LDKOutPoint OutPoint_new(LDKThirtyTwoBytes txid_arg, uint16_t index_arg);
+       // MUST_USE_RES LDKOutPoint OutPoint_new(LDKThirtyTwoBytes txid_arg, uint16_t index_arg);
        public static native long OutPoint_new(long txid_arg, short index_arg);
-       /// MUST_USE_RES LDKThirtyTwoBytes OutPoint_to_channel_id(const LDKOutPoint *this_arg);
+       // MUST_USE_RES LDKThirtyTwoBytes OutPoint_to_channel_id(const LDKOutPoint *this_arg);
        public static native long OutPoint_to_channel_id(long this_arg);
-       /// LDKCVec_u8Z OutPoint_write(const LDKOutPoint *obj);
+       // LDKCVec_u8Z OutPoint_write(const LDKOutPoint *obj);
        public static native long OutPoint_write(long obj);
-       /// LDKOutPoint OutPoint_read(LDKu8slice ser);
+       // LDKOutPoint OutPoint_read(LDKu8slice ser);
        public static native long OutPoint_read(long ser);
-       /// void SpendableOutputDescriptor_free(LDKSpendableOutputDescriptor this_ptr);
+       // void SpendableOutputDescriptor_free(LDKSpendableOutputDescriptor this_ptr);
        public static native void SpendableOutputDescriptor_free(long this_ptr);
-       /// void ChannelKeys_free(LDKChannelKeys this_ptr);
+       // void ChannelKeys_free(LDKChannelKeys this_ptr);
        public static native void ChannelKeys_free(long this_ptr);
-       /// void KeysInterface_free(LDKKeysInterface this_ptr);
+       // void KeysInterface_free(LDKKeysInterface this_ptr);
        public static native void KeysInterface_free(long this_ptr);
-       /// void InMemoryChannelKeys_free(LDKInMemoryChannelKeys this_ptr);
+       // void InMemoryChannelKeys_free(LDKInMemoryChannelKeys this_ptr);
        public static native void InMemoryChannelKeys_free(long this_ptr);
-       /// const uint8_t (*InMemoryChannelKeys_get_funding_key(const LDKInMemoryChannelKeys *this_ptr))[32];
+       // const uint8_t (*InMemoryChannelKeys_get_funding_key(const LDKInMemoryChannelKeys *this_ptr))[32];
        public static native byte[] InMemoryChannelKeys_get_funding_key(long this_ptr);
-       /// void InMemoryChannelKeys_set_funding_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
+       // void InMemoryChannelKeys_set_funding_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
        public static native void InMemoryChannelKeys_set_funding_key(long this_ptr, long val);
-       /// const uint8_t (*InMemoryChannelKeys_get_revocation_base_key(const LDKInMemoryChannelKeys *this_ptr))[32];
+       // const uint8_t (*InMemoryChannelKeys_get_revocation_base_key(const LDKInMemoryChannelKeys *this_ptr))[32];
        public static native byte[] InMemoryChannelKeys_get_revocation_base_key(long this_ptr);
-       /// void InMemoryChannelKeys_set_revocation_base_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
+       // void InMemoryChannelKeys_set_revocation_base_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
        public static native void InMemoryChannelKeys_set_revocation_base_key(long this_ptr, long val);
-       /// const uint8_t (*InMemoryChannelKeys_get_payment_key(const LDKInMemoryChannelKeys *this_ptr))[32];
+       // const uint8_t (*InMemoryChannelKeys_get_payment_key(const LDKInMemoryChannelKeys *this_ptr))[32];
        public static native byte[] InMemoryChannelKeys_get_payment_key(long this_ptr);
-       /// void InMemoryChannelKeys_set_payment_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
+       // void InMemoryChannelKeys_set_payment_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
        public static native void InMemoryChannelKeys_set_payment_key(long this_ptr, long val);
-       /// const uint8_t (*InMemoryChannelKeys_get_delayed_payment_base_key(const LDKInMemoryChannelKeys *this_ptr))[32];
+       // const uint8_t (*InMemoryChannelKeys_get_delayed_payment_base_key(const LDKInMemoryChannelKeys *this_ptr))[32];
        public static native byte[] InMemoryChannelKeys_get_delayed_payment_base_key(long this_ptr);
-       /// void InMemoryChannelKeys_set_delayed_payment_base_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
+       // void InMemoryChannelKeys_set_delayed_payment_base_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
        public static native void InMemoryChannelKeys_set_delayed_payment_base_key(long this_ptr, long val);
-       /// const uint8_t (*InMemoryChannelKeys_get_htlc_base_key(const LDKInMemoryChannelKeys *this_ptr))[32];
+       // const uint8_t (*InMemoryChannelKeys_get_htlc_base_key(const LDKInMemoryChannelKeys *this_ptr))[32];
        public static native byte[] InMemoryChannelKeys_get_htlc_base_key(long this_ptr);
-       /// void InMemoryChannelKeys_set_htlc_base_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
+       // void InMemoryChannelKeys_set_htlc_base_key(LDKInMemoryChannelKeys *this_ptr, LDKSecretKey val);
        public static native void InMemoryChannelKeys_set_htlc_base_key(long this_ptr, long val);
-       /// const uint8_t (*InMemoryChannelKeys_get_commitment_seed(const LDKInMemoryChannelKeys *this_ptr))[32];
+       // const uint8_t (*InMemoryChannelKeys_get_commitment_seed(const LDKInMemoryChannelKeys *this_ptr))[32];
        public static native byte[] InMemoryChannelKeys_get_commitment_seed(long this_ptr);
-       /// void InMemoryChannelKeys_set_commitment_seed(LDKInMemoryChannelKeys *this_ptr, LDKThirtyTwoBytes val);
+       // void InMemoryChannelKeys_set_commitment_seed(LDKInMemoryChannelKeys *this_ptr, LDKThirtyTwoBytes val);
        public static native void InMemoryChannelKeys_set_commitment_seed(long this_ptr, long val);
-       /// MUST_USE_RES LDKInMemoryChannelKeys InMemoryChannelKeys_new(LDKSecretKey funding_key, LDKSecretKey revocation_base_key, LDKSecretKey payment_key, LDKSecretKey delayed_payment_base_key, LDKSecretKey htlc_base_key, LDKThirtyTwoBytes commitment_seed, uint64_t channel_value_satoshis, LDKC2Tuple_u64u64Z key_derivation_params);
+       // MUST_USE_RES LDKInMemoryChannelKeys InMemoryChannelKeys_new(LDKSecretKey funding_key, LDKSecretKey revocation_base_key, LDKSecretKey payment_key, LDKSecretKey delayed_payment_base_key, LDKSecretKey htlc_base_key, LDKThirtyTwoBytes commitment_seed, uint64_t channel_value_satoshis, LDKC2Tuple_u64u64Z key_derivation_params);
        public static native long InMemoryChannelKeys_new(long funding_key, long revocation_base_key, long payment_key, long delayed_payment_base_key, long htlc_base_key, long commitment_seed, long channel_value_satoshis, long key_derivation_params);
-       /// MUST_USE_RES LDKChannelPublicKeys InMemoryChannelKeys_counterparty_pubkeys(const LDKInMemoryChannelKeys *this_arg);
+       // MUST_USE_RES LDKChannelPublicKeys InMemoryChannelKeys_counterparty_pubkeys(const LDKInMemoryChannelKeys *this_arg);
        public static native long InMemoryChannelKeys_counterparty_pubkeys(long this_arg);
-       /// MUST_USE_RES uint16_t InMemoryChannelKeys_counterparty_selected_contest_delay(const LDKInMemoryChannelKeys *this_arg);
+       // MUST_USE_RES uint16_t InMemoryChannelKeys_counterparty_selected_contest_delay(const LDKInMemoryChannelKeys *this_arg);
        public static native short InMemoryChannelKeys_counterparty_selected_contest_delay(long this_arg);
-       /// MUST_USE_RES uint16_t InMemoryChannelKeys_holder_selected_contest_delay(const LDKInMemoryChannelKeys *this_arg);
+       // MUST_USE_RES uint16_t InMemoryChannelKeys_holder_selected_contest_delay(const LDKInMemoryChannelKeys *this_arg);
        public static native short InMemoryChannelKeys_holder_selected_contest_delay(long this_arg);
-       /// LDKChannelKeys InMemoryChannelKeys_as_ChannelKeys(const LDKInMemoryChannelKeys *this_arg);
+       // LDKChannelKeys InMemoryChannelKeys_as_ChannelKeys(const LDKInMemoryChannelKeys *this_arg);
        public static native long InMemoryChannelKeys_as_ChannelKeys(long this_arg);
-       /// LDKCVec_u8Z InMemoryChannelKeys_write(const LDKInMemoryChannelKeys *obj);
+       // LDKCVec_u8Z InMemoryChannelKeys_write(const LDKInMemoryChannelKeys *obj);
        public static native long InMemoryChannelKeys_write(long obj);
-       /// LDKInMemoryChannelKeys InMemoryChannelKeys_read(LDKu8slice ser);
+       // LDKInMemoryChannelKeys InMemoryChannelKeys_read(LDKu8slice ser);
        public static native long InMemoryChannelKeys_read(long ser);
-       /// void KeysManager_free(LDKKeysManager this_ptr);
+       // void KeysManager_free(LDKKeysManager this_ptr);
        public static native void KeysManager_free(long this_ptr);
-       /// MUST_USE_RES LDKKeysManager KeysManager_new(const uint8_t (*seed)[32], LDKNetwork network, uint64_t starting_time_secs, uint32_t starting_time_nanos);
+       // MUST_USE_RES LDKKeysManager KeysManager_new(const uint8_t (*seed)[32], LDKNetwork network, uint64_t starting_time_secs, uint32_t starting_time_nanos);
        public static native long KeysManager_new(byte[] seed, LDKNetwork network, long starting_time_secs, int starting_time_nanos);
-       /// MUST_USE_RES LDKInMemoryChannelKeys KeysManager_derive_channel_keys(const LDKKeysManager *this_arg, uint64_t channel_value_satoshis, uint64_t params_1, uint64_t params_2);
+       // MUST_USE_RES LDKInMemoryChannelKeys KeysManager_derive_channel_keys(const LDKKeysManager *this_arg, uint64_t channel_value_satoshis, uint64_t params_1, uint64_t params_2);
        public static native long KeysManager_derive_channel_keys(long this_arg, long channel_value_satoshis, long params_1, long params_2);
-       /// LDKKeysInterface KeysManager_as_KeysInterface(const LDKKeysManager *this_arg);
+       // LDKKeysInterface KeysManager_as_KeysInterface(const LDKKeysManager *this_arg);
        public static native long KeysManager_as_KeysInterface(long this_arg);
-       /// void ChannelManager_free(LDKChannelManager this_ptr);
+       // void ChannelManager_free(LDKChannelManager this_ptr);
        public static native void ChannelManager_free(long this_ptr);
-       /// void ChannelDetails_free(LDKChannelDetails this_ptr);
+       // void ChannelDetails_free(LDKChannelDetails this_ptr);
        public static native void ChannelDetails_free(long this_ptr);
-       /// const uint8_t (*ChannelDetails_get_channel_id(const LDKChannelDetails *this_ptr))[32];
+       // const uint8_t (*ChannelDetails_get_channel_id(const LDKChannelDetails *this_ptr))[32];
        public static native byte[] ChannelDetails_get_channel_id(long this_ptr);
-       /// void ChannelDetails_set_channel_id(LDKChannelDetails *this_ptr, LDKThirtyTwoBytes val);
+       // void ChannelDetails_set_channel_id(LDKChannelDetails *this_ptr, LDKThirtyTwoBytes val);
        public static native void ChannelDetails_set_channel_id(long this_ptr, long val);
-       /// LDKPublicKey ChannelDetails_get_remote_network_id(const LDKChannelDetails *this_ptr);
+       // LDKPublicKey ChannelDetails_get_remote_network_id(const LDKChannelDetails *this_ptr);
        public static native long ChannelDetails_get_remote_network_id(long this_ptr);
-       /// void ChannelDetails_set_remote_network_id(LDKChannelDetails *this_ptr, LDKPublicKey val);
+       // void ChannelDetails_set_remote_network_id(LDKChannelDetails *this_ptr, LDKPublicKey val);
        public static native void ChannelDetails_set_remote_network_id(long this_ptr, long val);
-       /// LDKInitFeatures ChannelDetails_get_counterparty_features(const LDKChannelDetails *this_ptr);
+       // LDKInitFeatures ChannelDetails_get_counterparty_features(const LDKChannelDetails *this_ptr);
        public static native long ChannelDetails_get_counterparty_features(long this_ptr);
-       /// void ChannelDetails_set_counterparty_features(LDKChannelDetails *this_ptr, LDKInitFeatures val);
+       // void ChannelDetails_set_counterparty_features(LDKChannelDetails *this_ptr, LDKInitFeatures val);
        public static native void ChannelDetails_set_counterparty_features(long this_ptr, long val);
-       /// uint64_t ChannelDetails_get_channel_value_satoshis(const LDKChannelDetails *this_ptr);
+       // uint64_t ChannelDetails_get_channel_value_satoshis(const LDKChannelDetails *this_ptr);
        public static native long ChannelDetails_get_channel_value_satoshis(long this_ptr);
-       /// void ChannelDetails_set_channel_value_satoshis(LDKChannelDetails *this_ptr, uint64_t val);
+       // void ChannelDetails_set_channel_value_satoshis(LDKChannelDetails *this_ptr, uint64_t val);
        public static native void ChannelDetails_set_channel_value_satoshis(long this_ptr, long val);
-       /// uint64_t ChannelDetails_get_user_id(const LDKChannelDetails *this_ptr);
+       // uint64_t ChannelDetails_get_user_id(const LDKChannelDetails *this_ptr);
        public static native long ChannelDetails_get_user_id(long this_ptr);
-       /// void ChannelDetails_set_user_id(LDKChannelDetails *this_ptr, uint64_t val);
+       // void ChannelDetails_set_user_id(LDKChannelDetails *this_ptr, uint64_t val);
        public static native void ChannelDetails_set_user_id(long this_ptr, long val);
-       /// uint64_t ChannelDetails_get_outbound_capacity_msat(const LDKChannelDetails *this_ptr);
+       // uint64_t ChannelDetails_get_outbound_capacity_msat(const LDKChannelDetails *this_ptr);
        public static native long ChannelDetails_get_outbound_capacity_msat(long this_ptr);
-       /// void ChannelDetails_set_outbound_capacity_msat(LDKChannelDetails *this_ptr, uint64_t val);
+       // void ChannelDetails_set_outbound_capacity_msat(LDKChannelDetails *this_ptr, uint64_t val);
        public static native void ChannelDetails_set_outbound_capacity_msat(long this_ptr, long val);
-       /// uint64_t ChannelDetails_get_inbound_capacity_msat(const LDKChannelDetails *this_ptr);
+       // uint64_t ChannelDetails_get_inbound_capacity_msat(const LDKChannelDetails *this_ptr);
        public static native long ChannelDetails_get_inbound_capacity_msat(long this_ptr);
-       /// void ChannelDetails_set_inbound_capacity_msat(LDKChannelDetails *this_ptr, uint64_t val);
+       // void ChannelDetails_set_inbound_capacity_msat(LDKChannelDetails *this_ptr, uint64_t val);
        public static native void ChannelDetails_set_inbound_capacity_msat(long this_ptr, long val);
-       /// bool ChannelDetails_get_is_live(const LDKChannelDetails *this_ptr);
+       // bool ChannelDetails_get_is_live(const LDKChannelDetails *this_ptr);
        public static native boolean ChannelDetails_get_is_live(long this_ptr);
-       /// void ChannelDetails_set_is_live(LDKChannelDetails *this_ptr, bool val);
+       // void ChannelDetails_set_is_live(LDKChannelDetails *this_ptr, bool val);
        public static native void ChannelDetails_set_is_live(long this_ptr, boolean val);
-       /// void PaymentSendFailure_free(LDKPaymentSendFailure this_ptr);
+       // void PaymentSendFailure_free(LDKPaymentSendFailure this_ptr);
        public static native void PaymentSendFailure_free(long this_ptr);
-       /// MUST_USE_RES LDKChannelManager ChannelManager_new(LDKNetwork network, LDKFeeEstimator fee_est, LDKWatch chain_monitor, LDKBroadcasterInterface tx_broadcaster, LDKLogger logger, LDKKeysInterface keys_manager, LDKUserConfig config, uintptr_t current_blockchain_height);
+       // MUST_USE_RES LDKChannelManager ChannelManager_new(LDKNetwork network, LDKFeeEstimator fee_est, LDKWatch chain_monitor, LDKBroadcasterInterface tx_broadcaster, LDKLogger logger, LDKKeysInterface keys_manager, LDKUserConfig config, uintptr_t current_blockchain_height);
        public static native long ChannelManager_new(LDKNetwork network, long fee_est, long chain_monitor, long tx_broadcaster, long logger, long keys_manager, long config, long current_blockchain_height);
-       /// MUST_USE_RES LDKCResult_NoneAPIErrorZ ChannelManager_create_channel(const LDKChannelManager *this_arg, LDKPublicKey their_network_key, uint64_t channel_value_satoshis, uint64_t push_msat, uint64_t user_id, LDKUserConfig override_config);
+       // MUST_USE_RES LDKCResult_NoneAPIErrorZ ChannelManager_create_channel(const LDKChannelManager *this_arg, LDKPublicKey their_network_key, uint64_t channel_value_satoshis, uint64_t push_msat, uint64_t user_id, LDKUserConfig override_config);
        public static native long ChannelManager_create_channel(long this_arg, long their_network_key, long channel_value_satoshis, long push_msat, long user_id, long override_config);
-       /// MUST_USE_RES LDKCVec_ChannelDetailsZ ChannelManager_list_channels(const LDKChannelManager *this_arg);
+       // MUST_USE_RES LDKCVec_ChannelDetailsZ ChannelManager_list_channels(const LDKChannelManager *this_arg);
        public static native long ChannelManager_list_channels(long this_arg);
-       /// MUST_USE_RES LDKCVec_ChannelDetailsZ ChannelManager_list_usable_channels(const LDKChannelManager *this_arg);
+       // MUST_USE_RES LDKCVec_ChannelDetailsZ ChannelManager_list_usable_channels(const LDKChannelManager *this_arg);
        public static native long ChannelManager_list_usable_channels(long this_arg);
-       /// MUST_USE_RES LDKCResult_NoneAPIErrorZ ChannelManager_close_channel(const LDKChannelManager *this_arg, const uint8_t (*channel_id)[32]);
+       // MUST_USE_RES LDKCResult_NoneAPIErrorZ ChannelManager_close_channel(const LDKChannelManager *this_arg, const uint8_t (*channel_id)[32]);
        public static native long ChannelManager_close_channel(long this_arg, byte[] channel_id);
-       /// void ChannelManager_force_close_channel(const LDKChannelManager *this_arg, const uint8_t (*channel_id)[32]);
+       // void ChannelManager_force_close_channel(const LDKChannelManager *this_arg, const uint8_t (*channel_id)[32]);
        public static native void ChannelManager_force_close_channel(long this_arg, byte[] channel_id);
-       /// void ChannelManager_force_close_all_channels(const LDKChannelManager *this_arg);
+       // void ChannelManager_force_close_all_channels(const LDKChannelManager *this_arg);
        public static native void ChannelManager_force_close_all_channels(long this_arg);
-       /// MUST_USE_RES LDKCResult_NonePaymentSendFailureZ ChannelManager_send_payment(const LDKChannelManager *this_arg, const LDKRoute *route, LDKThirtyTwoBytes payment_hash, LDKThirtyTwoBytes payment_secret);
+       // MUST_USE_RES LDKCResult_NonePaymentSendFailureZ ChannelManager_send_payment(const LDKChannelManager *this_arg, const LDKRoute *route, LDKThirtyTwoBytes payment_hash, LDKThirtyTwoBytes payment_secret);
        public static native long ChannelManager_send_payment(long this_arg, long route, long payment_hash, long payment_secret);
-       /// void ChannelManager_funding_transaction_generated(const LDKChannelManager *this_arg, const uint8_t (*temporary_channel_id)[32], LDKOutPoint funding_txo);
+       // void ChannelManager_funding_transaction_generated(const LDKChannelManager *this_arg, const uint8_t (*temporary_channel_id)[32], LDKOutPoint funding_txo);
        public static native void ChannelManager_funding_transaction_generated(long this_arg, byte[] temporary_channel_id, long funding_txo);
-       /// void ChannelManager_broadcast_node_announcement(const LDKChannelManager *this_arg, LDKThreeBytes rgb, LDKThirtyTwoBytes alias, LDKCVec_NetAddressZ addresses);
+       // void ChannelManager_broadcast_node_announcement(const LDKChannelManager *this_arg, LDKThreeBytes rgb, LDKThirtyTwoBytes alias, LDKCVec_NetAddressZ addresses);
        public static native void ChannelManager_broadcast_node_announcement(long this_arg, long rgb, long alias, long addresses);
-       /// void ChannelManager_process_pending_htlc_forwards(const LDKChannelManager *this_arg);
+       // void ChannelManager_process_pending_htlc_forwards(const LDKChannelManager *this_arg);
        public static native void ChannelManager_process_pending_htlc_forwards(long this_arg);
-       /// void ChannelManager_timer_chan_freshness_every_min(const LDKChannelManager *this_arg);
+       // void ChannelManager_timer_chan_freshness_every_min(const LDKChannelManager *this_arg);
        public static native void ChannelManager_timer_chan_freshness_every_min(long this_arg);
-       /// MUST_USE_RES bool ChannelManager_fail_htlc_backwards(const LDKChannelManager *this_arg, const uint8_t (*payment_hash)[32], LDKThirtyTwoBytes payment_secret);
+       // MUST_USE_RES bool ChannelManager_fail_htlc_backwards(const LDKChannelManager *this_arg, const uint8_t (*payment_hash)[32], LDKThirtyTwoBytes payment_secret);
        public static native boolean ChannelManager_fail_htlc_backwards(long this_arg, byte[] payment_hash, long payment_secret);
-       /// MUST_USE_RES bool ChannelManager_claim_funds(const LDKChannelManager *this_arg, LDKThirtyTwoBytes payment_preimage, LDKThirtyTwoBytes payment_secret, uint64_t expected_amount);
+       // MUST_USE_RES bool ChannelManager_claim_funds(const LDKChannelManager *this_arg, LDKThirtyTwoBytes payment_preimage, LDKThirtyTwoBytes payment_secret, uint64_t expected_amount);
        public static native boolean ChannelManager_claim_funds(long this_arg, long payment_preimage, long payment_secret, long expected_amount);
-       /// MUST_USE_RES LDKPublicKey ChannelManager_get_our_node_id(const LDKChannelManager *this_arg);
+       // MUST_USE_RES LDKPublicKey ChannelManager_get_our_node_id(const LDKChannelManager *this_arg);
        public static native long ChannelManager_get_our_node_id(long this_arg);
-       /// void ChannelManager_channel_monitor_updated(const LDKChannelManager *this_arg, const LDKOutPoint *funding_txo, uint64_t highest_applied_update_id);
+       // void ChannelManager_channel_monitor_updated(const LDKChannelManager *this_arg, const LDKOutPoint *funding_txo, uint64_t highest_applied_update_id);
        public static native void ChannelManager_channel_monitor_updated(long this_arg, long funding_txo, long highest_applied_update_id);
-       /// LDKMessageSendEventsProvider ChannelManager_as_MessageSendEventsProvider(const LDKChannelManager *this_arg);
+       // LDKMessageSendEventsProvider ChannelManager_as_MessageSendEventsProvider(const LDKChannelManager *this_arg);
        public static native long ChannelManager_as_MessageSendEventsProvider(long this_arg);
-       /// LDKEventsProvider ChannelManager_as_EventsProvider(const LDKChannelManager *this_arg);
+       // LDKEventsProvider ChannelManager_as_EventsProvider(const LDKChannelManager *this_arg);
        public static native long ChannelManager_as_EventsProvider(long this_arg);
-       /// void ChannelManager_block_connected(const LDKChannelManager *this_arg, const uint8_t (*header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height);
+       // void ChannelManager_block_connected(const LDKChannelManager *this_arg, const uint8_t (*header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height);
        public static native void ChannelManager_block_connected(long this_arg, byte[] header, long txdata, int height);
-       /// void ChannelManager_block_disconnected(const LDKChannelManager *this_arg, const uint8_t (*header)[80]);
+       // void ChannelManager_block_disconnected(const LDKChannelManager *this_arg, const uint8_t (*header)[80]);
        public static native void ChannelManager_block_disconnected(long this_arg, byte[] header);
-       /// LDKChannelMessageHandler ChannelManager_as_ChannelMessageHandler(const LDKChannelManager *this_arg);
+       // LDKChannelMessageHandler ChannelManager_as_ChannelMessageHandler(const LDKChannelManager *this_arg);
        public static native long ChannelManager_as_ChannelMessageHandler(long this_arg);
-       /// void ChannelManagerReadArgs_free(LDKChannelManagerReadArgs this_ptr);
+       // void ChannelManagerReadArgs_free(LDKChannelManagerReadArgs this_ptr);
        public static native void ChannelManagerReadArgs_free(long this_ptr);
-       /// const LDKKeysInterface *ChannelManagerReadArgs_get_keys_manager(const LDKChannelManagerReadArgs *this_ptr);
+       // const LDKKeysInterface *ChannelManagerReadArgs_get_keys_manager(const LDKChannelManagerReadArgs *this_ptr);
        public static native long ChannelManagerReadArgs_get_keys_manager(long this_ptr);
-       /// void ChannelManagerReadArgs_set_keys_manager(LDKChannelManagerReadArgs *this_ptr, LDKKeysInterface val);
+       // void ChannelManagerReadArgs_set_keys_manager(LDKChannelManagerReadArgs *this_ptr, LDKKeysInterface val);
        public static native void ChannelManagerReadArgs_set_keys_manager(long this_ptr, long val);
-       /// const LDKFeeEstimator *ChannelManagerReadArgs_get_fee_estimator(const LDKChannelManagerReadArgs *this_ptr);
+       // const LDKFeeEstimator *ChannelManagerReadArgs_get_fee_estimator(const LDKChannelManagerReadArgs *this_ptr);
        public static native long ChannelManagerReadArgs_get_fee_estimator(long this_ptr);
-       /// void ChannelManagerReadArgs_set_fee_estimator(LDKChannelManagerReadArgs *this_ptr, LDKFeeEstimator val);
+       // void ChannelManagerReadArgs_set_fee_estimator(LDKChannelManagerReadArgs *this_ptr, LDKFeeEstimator val);
        public static native void ChannelManagerReadArgs_set_fee_estimator(long this_ptr, long val);
-       /// const LDKWatch *ChannelManagerReadArgs_get_chain_monitor(const LDKChannelManagerReadArgs *this_ptr);
+       // const LDKWatch *ChannelManagerReadArgs_get_chain_monitor(const LDKChannelManagerReadArgs *this_ptr);
        public static native long ChannelManagerReadArgs_get_chain_monitor(long this_ptr);
-       /// void ChannelManagerReadArgs_set_chain_monitor(LDKChannelManagerReadArgs *this_ptr, LDKWatch val);
+       // void ChannelManagerReadArgs_set_chain_monitor(LDKChannelManagerReadArgs *this_ptr, LDKWatch val);
        public static native void ChannelManagerReadArgs_set_chain_monitor(long this_ptr, long val);
-       /// const LDKBroadcasterInterface *ChannelManagerReadArgs_get_tx_broadcaster(const LDKChannelManagerReadArgs *this_ptr);
+       // const LDKBroadcasterInterface *ChannelManagerReadArgs_get_tx_broadcaster(const LDKChannelManagerReadArgs *this_ptr);
        public static native long ChannelManagerReadArgs_get_tx_broadcaster(long this_ptr);
-       /// void ChannelManagerReadArgs_set_tx_broadcaster(LDKChannelManagerReadArgs *this_ptr, LDKBroadcasterInterface val);
+       // void ChannelManagerReadArgs_set_tx_broadcaster(LDKChannelManagerReadArgs *this_ptr, LDKBroadcasterInterface val);
        public static native void ChannelManagerReadArgs_set_tx_broadcaster(long this_ptr, long val);
-       /// const LDKLogger *ChannelManagerReadArgs_get_logger(const LDKChannelManagerReadArgs *this_ptr);
+       // const LDKLogger *ChannelManagerReadArgs_get_logger(const LDKChannelManagerReadArgs *this_ptr);
        public static native long ChannelManagerReadArgs_get_logger(long this_ptr);
-       /// void ChannelManagerReadArgs_set_logger(LDKChannelManagerReadArgs *this_ptr, LDKLogger val);
+       // void ChannelManagerReadArgs_set_logger(LDKChannelManagerReadArgs *this_ptr, LDKLogger val);
        public static native void ChannelManagerReadArgs_set_logger(long this_ptr, long val);
-       /// LDKUserConfig ChannelManagerReadArgs_get_default_config(const LDKChannelManagerReadArgs *this_ptr);
+       // LDKUserConfig ChannelManagerReadArgs_get_default_config(const LDKChannelManagerReadArgs *this_ptr);
        public static native long ChannelManagerReadArgs_get_default_config(long this_ptr);
-       /// void ChannelManagerReadArgs_set_default_config(LDKChannelManagerReadArgs *this_ptr, LDKUserConfig val);
+       // void ChannelManagerReadArgs_set_default_config(LDKChannelManagerReadArgs *this_ptr, LDKUserConfig val);
        public static native void ChannelManagerReadArgs_set_default_config(long this_ptr, long val);
-       /// MUST_USE_RES LDKChannelManagerReadArgs ChannelManagerReadArgs_new(LDKKeysInterface keys_manager, LDKFeeEstimator fee_estimator, LDKWatch chain_monitor, LDKBroadcasterInterface tx_broadcaster, LDKLogger logger, LDKUserConfig default_config, LDKCVec_ChannelMonitorZ channel_monitors);
+       // MUST_USE_RES LDKChannelManagerReadArgs ChannelManagerReadArgs_new(LDKKeysInterface keys_manager, LDKFeeEstimator fee_estimator, LDKWatch chain_monitor, LDKBroadcasterInterface tx_broadcaster, LDKLogger logger, LDKUserConfig default_config, LDKCVec_ChannelMonitorZ channel_monitors);
        public static native long ChannelManagerReadArgs_new(long keys_manager, long fee_estimator, long chain_monitor, long tx_broadcaster, long logger, long default_config, long channel_monitors);
-       /// void DecodeError_free(LDKDecodeError this_ptr);
+       // void DecodeError_free(LDKDecodeError this_ptr);
        public static native void DecodeError_free(long this_ptr);
-       /// void Init_free(LDKInit this_ptr);
+       // void Init_free(LDKInit this_ptr);
        public static native void Init_free(long this_ptr);
-       /// void ErrorMessage_free(LDKErrorMessage this_ptr);
+       // void ErrorMessage_free(LDKErrorMessage this_ptr);
        public static native void ErrorMessage_free(long this_ptr);
-       /// const uint8_t (*ErrorMessage_get_channel_id(const LDKErrorMessage *this_ptr))[32];
+       // const uint8_t (*ErrorMessage_get_channel_id(const LDKErrorMessage *this_ptr))[32];
        public static native byte[] ErrorMessage_get_channel_id(long this_ptr);
-       /// void ErrorMessage_set_channel_id(LDKErrorMessage *this_ptr, LDKThirtyTwoBytes val);
+       // void ErrorMessage_set_channel_id(LDKErrorMessage *this_ptr, LDKThirtyTwoBytes val);
        public static native void ErrorMessage_set_channel_id(long this_ptr, long val);
-       /// LDKStr ErrorMessage_get_data(const LDKErrorMessage *this_ptr);
+       // LDKStr ErrorMessage_get_data(const LDKErrorMessage *this_ptr);
        public static native long ErrorMessage_get_data(long this_ptr);
-       /// void ErrorMessage_set_data(LDKErrorMessage *this_ptr, LDKCVec_u8Z val);
+       // void ErrorMessage_set_data(LDKErrorMessage *this_ptr, LDKCVec_u8Z val);
        public static native void ErrorMessage_set_data(long this_ptr, long val);
-       /// MUST_USE_RES LDKErrorMessage ErrorMessage_new(LDKThirtyTwoBytes channel_id_arg, LDKCVec_u8Z data_arg);
+       // MUST_USE_RES LDKErrorMessage ErrorMessage_new(LDKThirtyTwoBytes channel_id_arg, LDKCVec_u8Z data_arg);
        public static native long ErrorMessage_new(long channel_id_arg, long data_arg);
-       /// void Ping_free(LDKPing this_ptr);
+       // void Ping_free(LDKPing this_ptr);
        public static native void Ping_free(long this_ptr);
-       /// uint16_t Ping_get_ponglen(const LDKPing *this_ptr);
+       // uint16_t Ping_get_ponglen(const LDKPing *this_ptr);
        public static native short Ping_get_ponglen(long this_ptr);
-       /// void Ping_set_ponglen(LDKPing *this_ptr, uint16_t val);
+       // void Ping_set_ponglen(LDKPing *this_ptr, uint16_t val);
        public static native void Ping_set_ponglen(long this_ptr, short val);
-       /// uint16_t Ping_get_byteslen(const LDKPing *this_ptr);
+       // uint16_t Ping_get_byteslen(const LDKPing *this_ptr);
        public static native short Ping_get_byteslen(long this_ptr);
-       /// void Ping_set_byteslen(LDKPing *this_ptr, uint16_t val);
+       // void Ping_set_byteslen(LDKPing *this_ptr, uint16_t val);
        public static native void Ping_set_byteslen(long this_ptr, short val);
-       /// MUST_USE_RES LDKPing Ping_new(uint16_t ponglen_arg, uint16_t byteslen_arg);
+       // MUST_USE_RES LDKPing Ping_new(uint16_t ponglen_arg, uint16_t byteslen_arg);
        public static native long Ping_new(short ponglen_arg, short byteslen_arg);
-       /// void Pong_free(LDKPong this_ptr);
+       // void Pong_free(LDKPong this_ptr);
        public static native void Pong_free(long this_ptr);
-       /// uint16_t Pong_get_byteslen(const LDKPong *this_ptr);
+       // uint16_t Pong_get_byteslen(const LDKPong *this_ptr);
        public static native short Pong_get_byteslen(long this_ptr);
-       /// void Pong_set_byteslen(LDKPong *this_ptr, uint16_t val);
+       // void Pong_set_byteslen(LDKPong *this_ptr, uint16_t val);
        public static native void Pong_set_byteslen(long this_ptr, short val);
-       /// MUST_USE_RES LDKPong Pong_new(uint16_t byteslen_arg);
+       // MUST_USE_RES LDKPong Pong_new(uint16_t byteslen_arg);
        public static native long Pong_new(short byteslen_arg);
-       /// void OpenChannel_free(LDKOpenChannel this_ptr);
+       // void OpenChannel_free(LDKOpenChannel this_ptr);
        public static native void OpenChannel_free(long this_ptr);
-       /// const uint8_t (*OpenChannel_get_chain_hash(const LDKOpenChannel *this_ptr))[32];
+       // const uint8_t (*OpenChannel_get_chain_hash(const LDKOpenChannel *this_ptr))[32];
        public static native byte[] OpenChannel_get_chain_hash(long this_ptr);
-       /// void OpenChannel_set_chain_hash(LDKOpenChannel *this_ptr, LDKThirtyTwoBytes val);
+       // void OpenChannel_set_chain_hash(LDKOpenChannel *this_ptr, LDKThirtyTwoBytes val);
        public static native void OpenChannel_set_chain_hash(long this_ptr, long val);
-       /// const uint8_t (*OpenChannel_get_temporary_channel_id(const LDKOpenChannel *this_ptr))[32];
+       // const uint8_t (*OpenChannel_get_temporary_channel_id(const LDKOpenChannel *this_ptr))[32];
        public static native byte[] OpenChannel_get_temporary_channel_id(long this_ptr);
-       /// void OpenChannel_set_temporary_channel_id(LDKOpenChannel *this_ptr, LDKThirtyTwoBytes val);
+       // void OpenChannel_set_temporary_channel_id(LDKOpenChannel *this_ptr, LDKThirtyTwoBytes val);
        public static native void OpenChannel_set_temporary_channel_id(long this_ptr, long val);
-       /// uint64_t OpenChannel_get_funding_satoshis(const LDKOpenChannel *this_ptr);
+       // uint64_t OpenChannel_get_funding_satoshis(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_funding_satoshis(long this_ptr);
-       /// void OpenChannel_set_funding_satoshis(LDKOpenChannel *this_ptr, uint64_t val);
+       // void OpenChannel_set_funding_satoshis(LDKOpenChannel *this_ptr, uint64_t val);
        public static native void OpenChannel_set_funding_satoshis(long this_ptr, long val);
-       /// uint64_t OpenChannel_get_push_msat(const LDKOpenChannel *this_ptr);
+       // uint64_t OpenChannel_get_push_msat(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_push_msat(long this_ptr);
-       /// void OpenChannel_set_push_msat(LDKOpenChannel *this_ptr, uint64_t val);
+       // void OpenChannel_set_push_msat(LDKOpenChannel *this_ptr, uint64_t val);
        public static native void OpenChannel_set_push_msat(long this_ptr, long val);
-       /// uint64_t OpenChannel_get_dust_limit_satoshis(const LDKOpenChannel *this_ptr);
+       // uint64_t OpenChannel_get_dust_limit_satoshis(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_dust_limit_satoshis(long this_ptr);
-       /// void OpenChannel_set_dust_limit_satoshis(LDKOpenChannel *this_ptr, uint64_t val);
+       // void OpenChannel_set_dust_limit_satoshis(LDKOpenChannel *this_ptr, uint64_t val);
        public static native void OpenChannel_set_dust_limit_satoshis(long this_ptr, long val);
-       /// uint64_t OpenChannel_get_max_htlc_value_in_flight_msat(const LDKOpenChannel *this_ptr);
+       // uint64_t OpenChannel_get_max_htlc_value_in_flight_msat(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_max_htlc_value_in_flight_msat(long this_ptr);
-       /// void OpenChannel_set_max_htlc_value_in_flight_msat(LDKOpenChannel *this_ptr, uint64_t val);
+       // void OpenChannel_set_max_htlc_value_in_flight_msat(LDKOpenChannel *this_ptr, uint64_t val);
        public static native void OpenChannel_set_max_htlc_value_in_flight_msat(long this_ptr, long val);
-       /// uint64_t OpenChannel_get_channel_reserve_satoshis(const LDKOpenChannel *this_ptr);
+       // uint64_t OpenChannel_get_channel_reserve_satoshis(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_channel_reserve_satoshis(long this_ptr);
-       /// void OpenChannel_set_channel_reserve_satoshis(LDKOpenChannel *this_ptr, uint64_t val);
+       // void OpenChannel_set_channel_reserve_satoshis(LDKOpenChannel *this_ptr, uint64_t val);
        public static native void OpenChannel_set_channel_reserve_satoshis(long this_ptr, long val);
-       /// uint64_t OpenChannel_get_htlc_minimum_msat(const LDKOpenChannel *this_ptr);
+       // uint64_t OpenChannel_get_htlc_minimum_msat(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_htlc_minimum_msat(long this_ptr);
-       /// void OpenChannel_set_htlc_minimum_msat(LDKOpenChannel *this_ptr, uint64_t val);
+       // void OpenChannel_set_htlc_minimum_msat(LDKOpenChannel *this_ptr, uint64_t val);
        public static native void OpenChannel_set_htlc_minimum_msat(long this_ptr, long val);
-       /// uint32_t OpenChannel_get_feerate_per_kw(const LDKOpenChannel *this_ptr);
+       // uint32_t OpenChannel_get_feerate_per_kw(const LDKOpenChannel *this_ptr);
        public static native int OpenChannel_get_feerate_per_kw(long this_ptr);
-       /// void OpenChannel_set_feerate_per_kw(LDKOpenChannel *this_ptr, uint32_t val);
+       // void OpenChannel_set_feerate_per_kw(LDKOpenChannel *this_ptr, uint32_t val);
        public static native void OpenChannel_set_feerate_per_kw(long this_ptr, int val);
-       /// uint16_t OpenChannel_get_to_self_delay(const LDKOpenChannel *this_ptr);
+       // uint16_t OpenChannel_get_to_self_delay(const LDKOpenChannel *this_ptr);
        public static native short OpenChannel_get_to_self_delay(long this_ptr);
-       /// void OpenChannel_set_to_self_delay(LDKOpenChannel *this_ptr, uint16_t val);
+       // void OpenChannel_set_to_self_delay(LDKOpenChannel *this_ptr, uint16_t val);
        public static native void OpenChannel_set_to_self_delay(long this_ptr, short val);
-       /// uint16_t OpenChannel_get_max_accepted_htlcs(const LDKOpenChannel *this_ptr);
+       // uint16_t OpenChannel_get_max_accepted_htlcs(const LDKOpenChannel *this_ptr);
        public static native short OpenChannel_get_max_accepted_htlcs(long this_ptr);
-       /// void OpenChannel_set_max_accepted_htlcs(LDKOpenChannel *this_ptr, uint16_t val);
+       // void OpenChannel_set_max_accepted_htlcs(LDKOpenChannel *this_ptr, uint16_t val);
        public static native void OpenChannel_set_max_accepted_htlcs(long this_ptr, short val);
-       /// LDKPublicKey OpenChannel_get_funding_pubkey(const LDKOpenChannel *this_ptr);
+       // LDKPublicKey OpenChannel_get_funding_pubkey(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_funding_pubkey(long this_ptr);
-       /// void OpenChannel_set_funding_pubkey(LDKOpenChannel *this_ptr, LDKPublicKey val);
+       // void OpenChannel_set_funding_pubkey(LDKOpenChannel *this_ptr, LDKPublicKey val);
        public static native void OpenChannel_set_funding_pubkey(long this_ptr, long val);
-       /// LDKPublicKey OpenChannel_get_revocation_basepoint(const LDKOpenChannel *this_ptr);
+       // LDKPublicKey OpenChannel_get_revocation_basepoint(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_revocation_basepoint(long this_ptr);
-       /// void OpenChannel_set_revocation_basepoint(LDKOpenChannel *this_ptr, LDKPublicKey val);
+       // void OpenChannel_set_revocation_basepoint(LDKOpenChannel *this_ptr, LDKPublicKey val);
        public static native void OpenChannel_set_revocation_basepoint(long this_ptr, long val);
-       /// LDKPublicKey OpenChannel_get_payment_point(const LDKOpenChannel *this_ptr);
+       // LDKPublicKey OpenChannel_get_payment_point(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_payment_point(long this_ptr);
-       /// void OpenChannel_set_payment_point(LDKOpenChannel *this_ptr, LDKPublicKey val);
+       // void OpenChannel_set_payment_point(LDKOpenChannel *this_ptr, LDKPublicKey val);
        public static native void OpenChannel_set_payment_point(long this_ptr, long val);
-       /// LDKPublicKey OpenChannel_get_delayed_payment_basepoint(const LDKOpenChannel *this_ptr);
+       // LDKPublicKey OpenChannel_get_delayed_payment_basepoint(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_delayed_payment_basepoint(long this_ptr);
-       /// void OpenChannel_set_delayed_payment_basepoint(LDKOpenChannel *this_ptr, LDKPublicKey val);
+       // void OpenChannel_set_delayed_payment_basepoint(LDKOpenChannel *this_ptr, LDKPublicKey val);
        public static native void OpenChannel_set_delayed_payment_basepoint(long this_ptr, long val);
-       /// LDKPublicKey OpenChannel_get_htlc_basepoint(const LDKOpenChannel *this_ptr);
+       // LDKPublicKey OpenChannel_get_htlc_basepoint(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_htlc_basepoint(long this_ptr);
-       /// void OpenChannel_set_htlc_basepoint(LDKOpenChannel *this_ptr, LDKPublicKey val);
+       // void OpenChannel_set_htlc_basepoint(LDKOpenChannel *this_ptr, LDKPublicKey val);
        public static native void OpenChannel_set_htlc_basepoint(long this_ptr, long val);
-       /// LDKPublicKey OpenChannel_get_first_per_commitment_point(const LDKOpenChannel *this_ptr);
+       // LDKPublicKey OpenChannel_get_first_per_commitment_point(const LDKOpenChannel *this_ptr);
        public static native long OpenChannel_get_first_per_commitment_point(long this_ptr);
-       /// void OpenChannel_set_first_per_commitment_point(LDKOpenChannel *this_ptr, LDKPublicKey val);
+       // void OpenChannel_set_first_per_commitment_point(LDKOpenChannel *this_ptr, LDKPublicKey val);
        public static native void OpenChannel_set_first_per_commitment_point(long this_ptr, long val);
-       /// uint8_t OpenChannel_get_channel_flags(const LDKOpenChannel *this_ptr);
+       // uint8_t OpenChannel_get_channel_flags(const LDKOpenChannel *this_ptr);
        public static native byte OpenChannel_get_channel_flags(long this_ptr);
-       /// void OpenChannel_set_channel_flags(LDKOpenChannel *this_ptr, uint8_t val);
+       // void OpenChannel_set_channel_flags(LDKOpenChannel *this_ptr, uint8_t val);
        public static native void OpenChannel_set_channel_flags(long this_ptr, byte val);
-       /// void AcceptChannel_free(LDKAcceptChannel this_ptr);
+       // void AcceptChannel_free(LDKAcceptChannel this_ptr);
        public static native void AcceptChannel_free(long this_ptr);
-       /// const uint8_t (*AcceptChannel_get_temporary_channel_id(const LDKAcceptChannel *this_ptr))[32];
+       // const uint8_t (*AcceptChannel_get_temporary_channel_id(const LDKAcceptChannel *this_ptr))[32];
        public static native byte[] AcceptChannel_get_temporary_channel_id(long this_ptr);
-       /// void AcceptChannel_set_temporary_channel_id(LDKAcceptChannel *this_ptr, LDKThirtyTwoBytes val);
+       // void AcceptChannel_set_temporary_channel_id(LDKAcceptChannel *this_ptr, LDKThirtyTwoBytes val);
        public static native void AcceptChannel_set_temporary_channel_id(long this_ptr, long val);
-       /// uint64_t AcceptChannel_get_dust_limit_satoshis(const LDKAcceptChannel *this_ptr);
+       // uint64_t AcceptChannel_get_dust_limit_satoshis(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_dust_limit_satoshis(long this_ptr);
-       /// void AcceptChannel_set_dust_limit_satoshis(LDKAcceptChannel *this_ptr, uint64_t val);
+       // void AcceptChannel_set_dust_limit_satoshis(LDKAcceptChannel *this_ptr, uint64_t val);
        public static native void AcceptChannel_set_dust_limit_satoshis(long this_ptr, long val);
-       /// uint64_t AcceptChannel_get_max_htlc_value_in_flight_msat(const LDKAcceptChannel *this_ptr);
+       // uint64_t AcceptChannel_get_max_htlc_value_in_flight_msat(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_max_htlc_value_in_flight_msat(long this_ptr);
-       /// void AcceptChannel_set_max_htlc_value_in_flight_msat(LDKAcceptChannel *this_ptr, uint64_t val);
+       // void AcceptChannel_set_max_htlc_value_in_flight_msat(LDKAcceptChannel *this_ptr, uint64_t val);
        public static native void AcceptChannel_set_max_htlc_value_in_flight_msat(long this_ptr, long val);
-       /// uint64_t AcceptChannel_get_channel_reserve_satoshis(const LDKAcceptChannel *this_ptr);
+       // uint64_t AcceptChannel_get_channel_reserve_satoshis(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_channel_reserve_satoshis(long this_ptr);
-       /// void AcceptChannel_set_channel_reserve_satoshis(LDKAcceptChannel *this_ptr, uint64_t val);
+       // void AcceptChannel_set_channel_reserve_satoshis(LDKAcceptChannel *this_ptr, uint64_t val);
        public static native void AcceptChannel_set_channel_reserve_satoshis(long this_ptr, long val);
-       /// uint64_t AcceptChannel_get_htlc_minimum_msat(const LDKAcceptChannel *this_ptr);
+       // uint64_t AcceptChannel_get_htlc_minimum_msat(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_htlc_minimum_msat(long this_ptr);
-       /// void AcceptChannel_set_htlc_minimum_msat(LDKAcceptChannel *this_ptr, uint64_t val);
+       // void AcceptChannel_set_htlc_minimum_msat(LDKAcceptChannel *this_ptr, uint64_t val);
        public static native void AcceptChannel_set_htlc_minimum_msat(long this_ptr, long val);
-       /// uint32_t AcceptChannel_get_minimum_depth(const LDKAcceptChannel *this_ptr);
+       // uint32_t AcceptChannel_get_minimum_depth(const LDKAcceptChannel *this_ptr);
        public static native int AcceptChannel_get_minimum_depth(long this_ptr);
-       /// void AcceptChannel_set_minimum_depth(LDKAcceptChannel *this_ptr, uint32_t val);
+       // void AcceptChannel_set_minimum_depth(LDKAcceptChannel *this_ptr, uint32_t val);
        public static native void AcceptChannel_set_minimum_depth(long this_ptr, int val);
-       /// uint16_t AcceptChannel_get_to_self_delay(const LDKAcceptChannel *this_ptr);
+       // uint16_t AcceptChannel_get_to_self_delay(const LDKAcceptChannel *this_ptr);
        public static native short AcceptChannel_get_to_self_delay(long this_ptr);
-       /// void AcceptChannel_set_to_self_delay(LDKAcceptChannel *this_ptr, uint16_t val);
+       // void AcceptChannel_set_to_self_delay(LDKAcceptChannel *this_ptr, uint16_t val);
        public static native void AcceptChannel_set_to_self_delay(long this_ptr, short val);
-       /// uint16_t AcceptChannel_get_max_accepted_htlcs(const LDKAcceptChannel *this_ptr);
+       // uint16_t AcceptChannel_get_max_accepted_htlcs(const LDKAcceptChannel *this_ptr);
        public static native short AcceptChannel_get_max_accepted_htlcs(long this_ptr);
-       /// void AcceptChannel_set_max_accepted_htlcs(LDKAcceptChannel *this_ptr, uint16_t val);
+       // void AcceptChannel_set_max_accepted_htlcs(LDKAcceptChannel *this_ptr, uint16_t val);
        public static native void AcceptChannel_set_max_accepted_htlcs(long this_ptr, short val);
-       /// LDKPublicKey AcceptChannel_get_funding_pubkey(const LDKAcceptChannel *this_ptr);
+       // LDKPublicKey AcceptChannel_get_funding_pubkey(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_funding_pubkey(long this_ptr);
-       /// void AcceptChannel_set_funding_pubkey(LDKAcceptChannel *this_ptr, LDKPublicKey val);
+       // void AcceptChannel_set_funding_pubkey(LDKAcceptChannel *this_ptr, LDKPublicKey val);
        public static native void AcceptChannel_set_funding_pubkey(long this_ptr, long val);
-       /// LDKPublicKey AcceptChannel_get_revocation_basepoint(const LDKAcceptChannel *this_ptr);
+       // LDKPublicKey AcceptChannel_get_revocation_basepoint(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_revocation_basepoint(long this_ptr);
-       /// void AcceptChannel_set_revocation_basepoint(LDKAcceptChannel *this_ptr, LDKPublicKey val);
+       // void AcceptChannel_set_revocation_basepoint(LDKAcceptChannel *this_ptr, LDKPublicKey val);
        public static native void AcceptChannel_set_revocation_basepoint(long this_ptr, long val);
-       /// LDKPublicKey AcceptChannel_get_payment_point(const LDKAcceptChannel *this_ptr);
+       // LDKPublicKey AcceptChannel_get_payment_point(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_payment_point(long this_ptr);
-       /// void AcceptChannel_set_payment_point(LDKAcceptChannel *this_ptr, LDKPublicKey val);
+       // void AcceptChannel_set_payment_point(LDKAcceptChannel *this_ptr, LDKPublicKey val);
        public static native void AcceptChannel_set_payment_point(long this_ptr, long val);
-       /// LDKPublicKey AcceptChannel_get_delayed_payment_basepoint(const LDKAcceptChannel *this_ptr);
+       // LDKPublicKey AcceptChannel_get_delayed_payment_basepoint(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_delayed_payment_basepoint(long this_ptr);
-       /// void AcceptChannel_set_delayed_payment_basepoint(LDKAcceptChannel *this_ptr, LDKPublicKey val);
+       // void AcceptChannel_set_delayed_payment_basepoint(LDKAcceptChannel *this_ptr, LDKPublicKey val);
        public static native void AcceptChannel_set_delayed_payment_basepoint(long this_ptr, long val);
-       /// LDKPublicKey AcceptChannel_get_htlc_basepoint(const LDKAcceptChannel *this_ptr);
+       // LDKPublicKey AcceptChannel_get_htlc_basepoint(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_htlc_basepoint(long this_ptr);
-       /// void AcceptChannel_set_htlc_basepoint(LDKAcceptChannel *this_ptr, LDKPublicKey val);
+       // void AcceptChannel_set_htlc_basepoint(LDKAcceptChannel *this_ptr, LDKPublicKey val);
        public static native void AcceptChannel_set_htlc_basepoint(long this_ptr, long val);
-       /// LDKPublicKey AcceptChannel_get_first_per_commitment_point(const LDKAcceptChannel *this_ptr);
+       // LDKPublicKey AcceptChannel_get_first_per_commitment_point(const LDKAcceptChannel *this_ptr);
        public static native long AcceptChannel_get_first_per_commitment_point(long this_ptr);
-       /// void AcceptChannel_set_first_per_commitment_point(LDKAcceptChannel *this_ptr, LDKPublicKey val);
+       // void AcceptChannel_set_first_per_commitment_point(LDKAcceptChannel *this_ptr, LDKPublicKey val);
        public static native void AcceptChannel_set_first_per_commitment_point(long this_ptr, long val);
-       /// void FundingCreated_free(LDKFundingCreated this_ptr);
+       // void FundingCreated_free(LDKFundingCreated this_ptr);
        public static native void FundingCreated_free(long this_ptr);
-       /// const uint8_t (*FundingCreated_get_temporary_channel_id(const LDKFundingCreated *this_ptr))[32];
+       // const uint8_t (*FundingCreated_get_temporary_channel_id(const LDKFundingCreated *this_ptr))[32];
        public static native byte[] FundingCreated_get_temporary_channel_id(long this_ptr);
-       /// void FundingCreated_set_temporary_channel_id(LDKFundingCreated *this_ptr, LDKThirtyTwoBytes val);
+       // void FundingCreated_set_temporary_channel_id(LDKFundingCreated *this_ptr, LDKThirtyTwoBytes val);
        public static native void FundingCreated_set_temporary_channel_id(long this_ptr, long val);
-       /// const uint8_t (*FundingCreated_get_funding_txid(const LDKFundingCreated *this_ptr))[32];
+       // const uint8_t (*FundingCreated_get_funding_txid(const LDKFundingCreated *this_ptr))[32];
        public static native byte[] FundingCreated_get_funding_txid(long this_ptr);
-       /// void FundingCreated_set_funding_txid(LDKFundingCreated *this_ptr, LDKThirtyTwoBytes val);
+       // void FundingCreated_set_funding_txid(LDKFundingCreated *this_ptr, LDKThirtyTwoBytes val);
        public static native void FundingCreated_set_funding_txid(long this_ptr, long val);
-       /// uint16_t FundingCreated_get_funding_output_index(const LDKFundingCreated *this_ptr);
+       // uint16_t FundingCreated_get_funding_output_index(const LDKFundingCreated *this_ptr);
        public static native short FundingCreated_get_funding_output_index(long this_ptr);
-       /// void FundingCreated_set_funding_output_index(LDKFundingCreated *this_ptr, uint16_t val);
+       // void FundingCreated_set_funding_output_index(LDKFundingCreated *this_ptr, uint16_t val);
        public static native void FundingCreated_set_funding_output_index(long this_ptr, short val);
-       /// LDKSignature FundingCreated_get_signature(const LDKFundingCreated *this_ptr);
+       // LDKSignature FundingCreated_get_signature(const LDKFundingCreated *this_ptr);
        public static native long FundingCreated_get_signature(long this_ptr);
-       /// void FundingCreated_set_signature(LDKFundingCreated *this_ptr, LDKSignature val);
+       // void FundingCreated_set_signature(LDKFundingCreated *this_ptr, LDKSignature val);
        public static native void FundingCreated_set_signature(long this_ptr, long val);
-       /// MUST_USE_RES LDKFundingCreated FundingCreated_new(LDKThirtyTwoBytes temporary_channel_id_arg, LDKThirtyTwoBytes funding_txid_arg, uint16_t funding_output_index_arg, LDKSignature signature_arg);
+       // MUST_USE_RES LDKFundingCreated FundingCreated_new(LDKThirtyTwoBytes temporary_channel_id_arg, LDKThirtyTwoBytes funding_txid_arg, uint16_t funding_output_index_arg, LDKSignature signature_arg);
        public static native long FundingCreated_new(long temporary_channel_id_arg, long funding_txid_arg, short funding_output_index_arg, long signature_arg);
-       /// void FundingSigned_free(LDKFundingSigned this_ptr);
+       // void FundingSigned_free(LDKFundingSigned this_ptr);
        public static native void FundingSigned_free(long this_ptr);
-       /// const uint8_t (*FundingSigned_get_channel_id(const LDKFundingSigned *this_ptr))[32];
+       // const uint8_t (*FundingSigned_get_channel_id(const LDKFundingSigned *this_ptr))[32];
        public static native byte[] FundingSigned_get_channel_id(long this_ptr);
-       /// void FundingSigned_set_channel_id(LDKFundingSigned *this_ptr, LDKThirtyTwoBytes val);
+       // void FundingSigned_set_channel_id(LDKFundingSigned *this_ptr, LDKThirtyTwoBytes val);
        public static native void FundingSigned_set_channel_id(long this_ptr, long val);
-       /// LDKSignature FundingSigned_get_signature(const LDKFundingSigned *this_ptr);
+       // LDKSignature FundingSigned_get_signature(const LDKFundingSigned *this_ptr);
        public static native long FundingSigned_get_signature(long this_ptr);
-       /// void FundingSigned_set_signature(LDKFundingSigned *this_ptr, LDKSignature val);
+       // void FundingSigned_set_signature(LDKFundingSigned *this_ptr, LDKSignature val);
        public static native void FundingSigned_set_signature(long this_ptr, long val);
-       /// MUST_USE_RES LDKFundingSigned FundingSigned_new(LDKThirtyTwoBytes channel_id_arg, LDKSignature signature_arg);
+       // MUST_USE_RES LDKFundingSigned FundingSigned_new(LDKThirtyTwoBytes channel_id_arg, LDKSignature signature_arg);
        public static native long FundingSigned_new(long channel_id_arg, long signature_arg);
-       /// void FundingLocked_free(LDKFundingLocked this_ptr);
+       // void FundingLocked_free(LDKFundingLocked this_ptr);
        public static native void FundingLocked_free(long this_ptr);
-       /// const uint8_t (*FundingLocked_get_channel_id(const LDKFundingLocked *this_ptr))[32];
+       // const uint8_t (*FundingLocked_get_channel_id(const LDKFundingLocked *this_ptr))[32];
        public static native byte[] FundingLocked_get_channel_id(long this_ptr);
-       /// void FundingLocked_set_channel_id(LDKFundingLocked *this_ptr, LDKThirtyTwoBytes val);
+       // void FundingLocked_set_channel_id(LDKFundingLocked *this_ptr, LDKThirtyTwoBytes val);
        public static native void FundingLocked_set_channel_id(long this_ptr, long val);
-       /// LDKPublicKey FundingLocked_get_next_per_commitment_point(const LDKFundingLocked *this_ptr);
+       // LDKPublicKey FundingLocked_get_next_per_commitment_point(const LDKFundingLocked *this_ptr);
        public static native long FundingLocked_get_next_per_commitment_point(long this_ptr);
-       /// void FundingLocked_set_next_per_commitment_point(LDKFundingLocked *this_ptr, LDKPublicKey val);
+       // void FundingLocked_set_next_per_commitment_point(LDKFundingLocked *this_ptr, LDKPublicKey val);
        public static native void FundingLocked_set_next_per_commitment_point(long this_ptr, long val);
-       /// MUST_USE_RES LDKFundingLocked FundingLocked_new(LDKThirtyTwoBytes channel_id_arg, LDKPublicKey next_per_commitment_point_arg);
+       // MUST_USE_RES LDKFundingLocked FundingLocked_new(LDKThirtyTwoBytes channel_id_arg, LDKPublicKey next_per_commitment_point_arg);
        public static native long FundingLocked_new(long channel_id_arg, long next_per_commitment_point_arg);
-       /// void Shutdown_free(LDKShutdown this_ptr);
+       // void Shutdown_free(LDKShutdown this_ptr);
        public static native void Shutdown_free(long this_ptr);
-       /// const uint8_t (*Shutdown_get_channel_id(const LDKShutdown *this_ptr))[32];
+       // const uint8_t (*Shutdown_get_channel_id(const LDKShutdown *this_ptr))[32];
        public static native byte[] Shutdown_get_channel_id(long this_ptr);
-       /// void Shutdown_set_channel_id(LDKShutdown *this_ptr, LDKThirtyTwoBytes val);
+       // void Shutdown_set_channel_id(LDKShutdown *this_ptr, LDKThirtyTwoBytes val);
        public static native void Shutdown_set_channel_id(long this_ptr, long val);
-       /// LDKu8slice Shutdown_get_scriptpubkey(const LDKShutdown *this_ptr);
+       // LDKu8slice Shutdown_get_scriptpubkey(const LDKShutdown *this_ptr);
        public static native long Shutdown_get_scriptpubkey(long this_ptr);
-       /// void Shutdown_set_scriptpubkey(LDKShutdown *this_ptr, LDKCVec_u8Z val);
+       // void Shutdown_set_scriptpubkey(LDKShutdown *this_ptr, LDKCVec_u8Z val);
        public static native void Shutdown_set_scriptpubkey(long this_ptr, long val);
-       /// MUST_USE_RES LDKShutdown Shutdown_new(LDKThirtyTwoBytes channel_id_arg, LDKCVec_u8Z scriptpubkey_arg);
+       // MUST_USE_RES LDKShutdown Shutdown_new(LDKThirtyTwoBytes channel_id_arg, LDKCVec_u8Z scriptpubkey_arg);
        public static native long Shutdown_new(long channel_id_arg, long scriptpubkey_arg);
-       /// void ClosingSigned_free(LDKClosingSigned this_ptr);
+       // void ClosingSigned_free(LDKClosingSigned this_ptr);
        public static native void ClosingSigned_free(long this_ptr);
-       /// const uint8_t (*ClosingSigned_get_channel_id(const LDKClosingSigned *this_ptr))[32];
+       // const uint8_t (*ClosingSigned_get_channel_id(const LDKClosingSigned *this_ptr))[32];
        public static native byte[] ClosingSigned_get_channel_id(long this_ptr);
-       /// void ClosingSigned_set_channel_id(LDKClosingSigned *this_ptr, LDKThirtyTwoBytes val);
+       // void ClosingSigned_set_channel_id(LDKClosingSigned *this_ptr, LDKThirtyTwoBytes val);
        public static native void ClosingSigned_set_channel_id(long this_ptr, long val);
-       /// uint64_t ClosingSigned_get_fee_satoshis(const LDKClosingSigned *this_ptr);
+       // uint64_t ClosingSigned_get_fee_satoshis(const LDKClosingSigned *this_ptr);
        public static native long ClosingSigned_get_fee_satoshis(long this_ptr);
-       /// void ClosingSigned_set_fee_satoshis(LDKClosingSigned *this_ptr, uint64_t val);
+       // void ClosingSigned_set_fee_satoshis(LDKClosingSigned *this_ptr, uint64_t val);
        public static native void ClosingSigned_set_fee_satoshis(long this_ptr, long val);
-       /// LDKSignature ClosingSigned_get_signature(const LDKClosingSigned *this_ptr);
+       // LDKSignature ClosingSigned_get_signature(const LDKClosingSigned *this_ptr);
        public static native long ClosingSigned_get_signature(long this_ptr);
-       /// void ClosingSigned_set_signature(LDKClosingSigned *this_ptr, LDKSignature val);
+       // void ClosingSigned_set_signature(LDKClosingSigned *this_ptr, LDKSignature val);
        public static native void ClosingSigned_set_signature(long this_ptr, long val);
-       /// MUST_USE_RES LDKClosingSigned ClosingSigned_new(LDKThirtyTwoBytes channel_id_arg, uint64_t fee_satoshis_arg, LDKSignature signature_arg);
+       // MUST_USE_RES LDKClosingSigned ClosingSigned_new(LDKThirtyTwoBytes channel_id_arg, uint64_t fee_satoshis_arg, LDKSignature signature_arg);
        public static native long ClosingSigned_new(long channel_id_arg, long fee_satoshis_arg, long signature_arg);
-       /// void UpdateAddHTLC_free(LDKUpdateAddHTLC this_ptr);
+       // void UpdateAddHTLC_free(LDKUpdateAddHTLC this_ptr);
        public static native void UpdateAddHTLC_free(long this_ptr);
-       /// const uint8_t (*UpdateAddHTLC_get_channel_id(const LDKUpdateAddHTLC *this_ptr))[32];
+       // const uint8_t (*UpdateAddHTLC_get_channel_id(const LDKUpdateAddHTLC *this_ptr))[32];
        public static native byte[] UpdateAddHTLC_get_channel_id(long this_ptr);
-       /// void UpdateAddHTLC_set_channel_id(LDKUpdateAddHTLC *this_ptr, LDKThirtyTwoBytes val);
+       // void UpdateAddHTLC_set_channel_id(LDKUpdateAddHTLC *this_ptr, LDKThirtyTwoBytes val);
        public static native void UpdateAddHTLC_set_channel_id(long this_ptr, long val);
-       /// uint64_t UpdateAddHTLC_get_htlc_id(const LDKUpdateAddHTLC *this_ptr);
+       // uint64_t UpdateAddHTLC_get_htlc_id(const LDKUpdateAddHTLC *this_ptr);
        public static native long UpdateAddHTLC_get_htlc_id(long this_ptr);
-       /// void UpdateAddHTLC_set_htlc_id(LDKUpdateAddHTLC *this_ptr, uint64_t val);
+       // void UpdateAddHTLC_set_htlc_id(LDKUpdateAddHTLC *this_ptr, uint64_t val);
        public static native void UpdateAddHTLC_set_htlc_id(long this_ptr, long val);
-       /// uint64_t UpdateAddHTLC_get_amount_msat(const LDKUpdateAddHTLC *this_ptr);
+       // uint64_t UpdateAddHTLC_get_amount_msat(const LDKUpdateAddHTLC *this_ptr);
        public static native long UpdateAddHTLC_get_amount_msat(long this_ptr);
-       /// void UpdateAddHTLC_set_amount_msat(LDKUpdateAddHTLC *this_ptr, uint64_t val);
+       // void UpdateAddHTLC_set_amount_msat(LDKUpdateAddHTLC *this_ptr, uint64_t val);
        public static native void UpdateAddHTLC_set_amount_msat(long this_ptr, long val);
-       /// const uint8_t (*UpdateAddHTLC_get_payment_hash(const LDKUpdateAddHTLC *this_ptr))[32];
+       // const uint8_t (*UpdateAddHTLC_get_payment_hash(const LDKUpdateAddHTLC *this_ptr))[32];
        public static native byte[] UpdateAddHTLC_get_payment_hash(long this_ptr);
-       /// void UpdateAddHTLC_set_payment_hash(LDKUpdateAddHTLC *this_ptr, LDKThirtyTwoBytes val);
+       // void UpdateAddHTLC_set_payment_hash(LDKUpdateAddHTLC *this_ptr, LDKThirtyTwoBytes val);
        public static native void UpdateAddHTLC_set_payment_hash(long this_ptr, long val);
-       /// uint32_t UpdateAddHTLC_get_cltv_expiry(const LDKUpdateAddHTLC *this_ptr);
+       // uint32_t UpdateAddHTLC_get_cltv_expiry(const LDKUpdateAddHTLC *this_ptr);
        public static native int UpdateAddHTLC_get_cltv_expiry(long this_ptr);
-       /// void UpdateAddHTLC_set_cltv_expiry(LDKUpdateAddHTLC *this_ptr, uint32_t val);
+       // void UpdateAddHTLC_set_cltv_expiry(LDKUpdateAddHTLC *this_ptr, uint32_t val);
        public static native void UpdateAddHTLC_set_cltv_expiry(long this_ptr, int val);
-       /// void UpdateFulfillHTLC_free(LDKUpdateFulfillHTLC this_ptr);
+       // void UpdateFulfillHTLC_free(LDKUpdateFulfillHTLC this_ptr);
        public static native void UpdateFulfillHTLC_free(long this_ptr);
-       /// const uint8_t (*UpdateFulfillHTLC_get_channel_id(const LDKUpdateFulfillHTLC *this_ptr))[32];
+       // const uint8_t (*UpdateFulfillHTLC_get_channel_id(const LDKUpdateFulfillHTLC *this_ptr))[32];
        public static native byte[] UpdateFulfillHTLC_get_channel_id(long this_ptr);
-       /// void UpdateFulfillHTLC_set_channel_id(LDKUpdateFulfillHTLC *this_ptr, LDKThirtyTwoBytes val);
+       // void UpdateFulfillHTLC_set_channel_id(LDKUpdateFulfillHTLC *this_ptr, LDKThirtyTwoBytes val);
        public static native void UpdateFulfillHTLC_set_channel_id(long this_ptr, long val);
-       /// uint64_t UpdateFulfillHTLC_get_htlc_id(const LDKUpdateFulfillHTLC *this_ptr);
+       // uint64_t UpdateFulfillHTLC_get_htlc_id(const LDKUpdateFulfillHTLC *this_ptr);
        public static native long UpdateFulfillHTLC_get_htlc_id(long this_ptr);
-       /// void UpdateFulfillHTLC_set_htlc_id(LDKUpdateFulfillHTLC *this_ptr, uint64_t val);
+       // void UpdateFulfillHTLC_set_htlc_id(LDKUpdateFulfillHTLC *this_ptr, uint64_t val);
        public static native void UpdateFulfillHTLC_set_htlc_id(long this_ptr, long val);
-       /// const uint8_t (*UpdateFulfillHTLC_get_payment_preimage(const LDKUpdateFulfillHTLC *this_ptr))[32];
+       // const uint8_t (*UpdateFulfillHTLC_get_payment_preimage(const LDKUpdateFulfillHTLC *this_ptr))[32];
        public static native byte[] UpdateFulfillHTLC_get_payment_preimage(long this_ptr);
-       /// void UpdateFulfillHTLC_set_payment_preimage(LDKUpdateFulfillHTLC *this_ptr, LDKThirtyTwoBytes val);
+       // void UpdateFulfillHTLC_set_payment_preimage(LDKUpdateFulfillHTLC *this_ptr, LDKThirtyTwoBytes val);
        public static native void UpdateFulfillHTLC_set_payment_preimage(long this_ptr, long val);
-       /// MUST_USE_RES LDKUpdateFulfillHTLC UpdateFulfillHTLC_new(LDKThirtyTwoBytes channel_id_arg, uint64_t htlc_id_arg, LDKThirtyTwoBytes payment_preimage_arg);
+       // MUST_USE_RES LDKUpdateFulfillHTLC UpdateFulfillHTLC_new(LDKThirtyTwoBytes channel_id_arg, uint64_t htlc_id_arg, LDKThirtyTwoBytes payment_preimage_arg);
        public static native long UpdateFulfillHTLC_new(long channel_id_arg, long htlc_id_arg, long payment_preimage_arg);
-       /// void UpdateFailHTLC_free(LDKUpdateFailHTLC this_ptr);
+       // void UpdateFailHTLC_free(LDKUpdateFailHTLC this_ptr);
        public static native void UpdateFailHTLC_free(long this_ptr);
-       /// const uint8_t (*UpdateFailHTLC_get_channel_id(const LDKUpdateFailHTLC *this_ptr))[32];
+       // const uint8_t (*UpdateFailHTLC_get_channel_id(const LDKUpdateFailHTLC *this_ptr))[32];
        public static native byte[] UpdateFailHTLC_get_channel_id(long this_ptr);
-       /// void UpdateFailHTLC_set_channel_id(LDKUpdateFailHTLC *this_ptr, LDKThirtyTwoBytes val);
+       // void UpdateFailHTLC_set_channel_id(LDKUpdateFailHTLC *this_ptr, LDKThirtyTwoBytes val);
        public static native void UpdateFailHTLC_set_channel_id(long this_ptr, long val);
-       /// uint64_t UpdateFailHTLC_get_htlc_id(const LDKUpdateFailHTLC *this_ptr);
+       // uint64_t UpdateFailHTLC_get_htlc_id(const LDKUpdateFailHTLC *this_ptr);
        public static native long UpdateFailHTLC_get_htlc_id(long this_ptr);
-       /// void UpdateFailHTLC_set_htlc_id(LDKUpdateFailHTLC *this_ptr, uint64_t val);
+       // void UpdateFailHTLC_set_htlc_id(LDKUpdateFailHTLC *this_ptr, uint64_t val);
        public static native void UpdateFailHTLC_set_htlc_id(long this_ptr, long val);
-       /// void UpdateFailMalformedHTLC_free(LDKUpdateFailMalformedHTLC this_ptr);
+       // void UpdateFailMalformedHTLC_free(LDKUpdateFailMalformedHTLC this_ptr);
        public static native void UpdateFailMalformedHTLC_free(long this_ptr);
-       /// const uint8_t (*UpdateFailMalformedHTLC_get_channel_id(const LDKUpdateFailMalformedHTLC *this_ptr))[32];
+       // const uint8_t (*UpdateFailMalformedHTLC_get_channel_id(const LDKUpdateFailMalformedHTLC *this_ptr))[32];
        public static native byte[] UpdateFailMalformedHTLC_get_channel_id(long this_ptr);
-       /// void UpdateFailMalformedHTLC_set_channel_id(LDKUpdateFailMalformedHTLC *this_ptr, LDKThirtyTwoBytes val);
+       // void UpdateFailMalformedHTLC_set_channel_id(LDKUpdateFailMalformedHTLC *this_ptr, LDKThirtyTwoBytes val);
        public static native void UpdateFailMalformedHTLC_set_channel_id(long this_ptr, long val);
-       /// uint64_t UpdateFailMalformedHTLC_get_htlc_id(const LDKUpdateFailMalformedHTLC *this_ptr);
+       // uint64_t UpdateFailMalformedHTLC_get_htlc_id(const LDKUpdateFailMalformedHTLC *this_ptr);
        public static native long UpdateFailMalformedHTLC_get_htlc_id(long this_ptr);
-       /// void UpdateFailMalformedHTLC_set_htlc_id(LDKUpdateFailMalformedHTLC *this_ptr, uint64_t val);
+       // void UpdateFailMalformedHTLC_set_htlc_id(LDKUpdateFailMalformedHTLC *this_ptr, uint64_t val);
        public static native void UpdateFailMalformedHTLC_set_htlc_id(long this_ptr, long val);
-       /// uint16_t UpdateFailMalformedHTLC_get_failure_code(const LDKUpdateFailMalformedHTLC *this_ptr);
+       // uint16_t UpdateFailMalformedHTLC_get_failure_code(const LDKUpdateFailMalformedHTLC *this_ptr);
        public static native short UpdateFailMalformedHTLC_get_failure_code(long this_ptr);
-       /// void UpdateFailMalformedHTLC_set_failure_code(LDKUpdateFailMalformedHTLC *this_ptr, uint16_t val);
+       // void UpdateFailMalformedHTLC_set_failure_code(LDKUpdateFailMalformedHTLC *this_ptr, uint16_t val);
        public static native void UpdateFailMalformedHTLC_set_failure_code(long this_ptr, short val);
-       /// void CommitmentSigned_free(LDKCommitmentSigned this_ptr);
+       // void CommitmentSigned_free(LDKCommitmentSigned this_ptr);
        public static native void CommitmentSigned_free(long this_ptr);
-       /// const uint8_t (*CommitmentSigned_get_channel_id(const LDKCommitmentSigned *this_ptr))[32];
+       // const uint8_t (*CommitmentSigned_get_channel_id(const LDKCommitmentSigned *this_ptr))[32];
        public static native byte[] CommitmentSigned_get_channel_id(long this_ptr);
-       /// void CommitmentSigned_set_channel_id(LDKCommitmentSigned *this_ptr, LDKThirtyTwoBytes val);
+       // void CommitmentSigned_set_channel_id(LDKCommitmentSigned *this_ptr, LDKThirtyTwoBytes val);
        public static native void CommitmentSigned_set_channel_id(long this_ptr, long val);
-       /// LDKSignature CommitmentSigned_get_signature(const LDKCommitmentSigned *this_ptr);
+       // LDKSignature CommitmentSigned_get_signature(const LDKCommitmentSigned *this_ptr);
        public static native long CommitmentSigned_get_signature(long this_ptr);
-       /// void CommitmentSigned_set_signature(LDKCommitmentSigned *this_ptr, LDKSignature val);
+       // void CommitmentSigned_set_signature(LDKCommitmentSigned *this_ptr, LDKSignature val);
        public static native void CommitmentSigned_set_signature(long this_ptr, long val);
-       /// void CommitmentSigned_set_htlc_signatures(LDKCommitmentSigned *this_ptr, LDKCVec_SignatureZ val);
+       // void CommitmentSigned_set_htlc_signatures(LDKCommitmentSigned *this_ptr, LDKCVec_SignatureZ val);
        public static native void CommitmentSigned_set_htlc_signatures(long this_ptr, long val);
-       /// MUST_USE_RES LDKCommitmentSigned CommitmentSigned_new(LDKThirtyTwoBytes channel_id_arg, LDKSignature signature_arg, LDKCVec_SignatureZ htlc_signatures_arg);
+       // MUST_USE_RES LDKCommitmentSigned CommitmentSigned_new(LDKThirtyTwoBytes channel_id_arg, LDKSignature signature_arg, LDKCVec_SignatureZ htlc_signatures_arg);
        public static native long CommitmentSigned_new(long channel_id_arg, long signature_arg, long htlc_signatures_arg);
-       /// void RevokeAndACK_free(LDKRevokeAndACK this_ptr);
+       // void RevokeAndACK_free(LDKRevokeAndACK this_ptr);
        public static native void RevokeAndACK_free(long this_ptr);
-       /// const uint8_t (*RevokeAndACK_get_channel_id(const LDKRevokeAndACK *this_ptr))[32];
+       // const uint8_t (*RevokeAndACK_get_channel_id(const LDKRevokeAndACK *this_ptr))[32];
        public static native byte[] RevokeAndACK_get_channel_id(long this_ptr);
-       /// void RevokeAndACK_set_channel_id(LDKRevokeAndACK *this_ptr, LDKThirtyTwoBytes val);
+       // void RevokeAndACK_set_channel_id(LDKRevokeAndACK *this_ptr, LDKThirtyTwoBytes val);
        public static native void RevokeAndACK_set_channel_id(long this_ptr, long val);
-       /// const uint8_t (*RevokeAndACK_get_per_commitment_secret(const LDKRevokeAndACK *this_ptr))[32];
+       // const uint8_t (*RevokeAndACK_get_per_commitment_secret(const LDKRevokeAndACK *this_ptr))[32];
        public static native byte[] RevokeAndACK_get_per_commitment_secret(long this_ptr);
-       /// void RevokeAndACK_set_per_commitment_secret(LDKRevokeAndACK *this_ptr, LDKThirtyTwoBytes val);
+       // void RevokeAndACK_set_per_commitment_secret(LDKRevokeAndACK *this_ptr, LDKThirtyTwoBytes val);
        public static native void RevokeAndACK_set_per_commitment_secret(long this_ptr, long val);
-       /// LDKPublicKey RevokeAndACK_get_next_per_commitment_point(const LDKRevokeAndACK *this_ptr);
+       // LDKPublicKey RevokeAndACK_get_next_per_commitment_point(const LDKRevokeAndACK *this_ptr);
        public static native long RevokeAndACK_get_next_per_commitment_point(long this_ptr);
-       /// void RevokeAndACK_set_next_per_commitment_point(LDKRevokeAndACK *this_ptr, LDKPublicKey val);
+       // void RevokeAndACK_set_next_per_commitment_point(LDKRevokeAndACK *this_ptr, LDKPublicKey val);
        public static native void RevokeAndACK_set_next_per_commitment_point(long this_ptr, long val);
-       /// MUST_USE_RES LDKRevokeAndACK RevokeAndACK_new(LDKThirtyTwoBytes channel_id_arg, LDKThirtyTwoBytes per_commitment_secret_arg, LDKPublicKey next_per_commitment_point_arg);
+       // MUST_USE_RES LDKRevokeAndACK RevokeAndACK_new(LDKThirtyTwoBytes channel_id_arg, LDKThirtyTwoBytes per_commitment_secret_arg, LDKPublicKey next_per_commitment_point_arg);
        public static native long RevokeAndACK_new(long channel_id_arg, long per_commitment_secret_arg, long next_per_commitment_point_arg);
-       /// void UpdateFee_free(LDKUpdateFee this_ptr);
+       // void UpdateFee_free(LDKUpdateFee this_ptr);
        public static native void UpdateFee_free(long this_ptr);
-       /// const uint8_t (*UpdateFee_get_channel_id(const LDKUpdateFee *this_ptr))[32];
+       // const uint8_t (*UpdateFee_get_channel_id(const LDKUpdateFee *this_ptr))[32];
        public static native byte[] UpdateFee_get_channel_id(long this_ptr);
-       /// void UpdateFee_set_channel_id(LDKUpdateFee *this_ptr, LDKThirtyTwoBytes val);
+       // void UpdateFee_set_channel_id(LDKUpdateFee *this_ptr, LDKThirtyTwoBytes val);
        public static native void UpdateFee_set_channel_id(long this_ptr, long val);
-       /// uint32_t UpdateFee_get_feerate_per_kw(const LDKUpdateFee *this_ptr);
+       // uint32_t UpdateFee_get_feerate_per_kw(const LDKUpdateFee *this_ptr);
        public static native int UpdateFee_get_feerate_per_kw(long this_ptr);
-       /// void UpdateFee_set_feerate_per_kw(LDKUpdateFee *this_ptr, uint32_t val);
+       // void UpdateFee_set_feerate_per_kw(LDKUpdateFee *this_ptr, uint32_t val);
        public static native void UpdateFee_set_feerate_per_kw(long this_ptr, int val);
-       /// MUST_USE_RES LDKUpdateFee UpdateFee_new(LDKThirtyTwoBytes channel_id_arg, uint32_t feerate_per_kw_arg);
+       // MUST_USE_RES LDKUpdateFee UpdateFee_new(LDKThirtyTwoBytes channel_id_arg, uint32_t feerate_per_kw_arg);
        public static native long UpdateFee_new(long channel_id_arg, int feerate_per_kw_arg);
-       /// void DataLossProtect_free(LDKDataLossProtect this_ptr);
+       // void DataLossProtect_free(LDKDataLossProtect this_ptr);
        public static native void DataLossProtect_free(long this_ptr);
-       /// const uint8_t (*DataLossProtect_get_your_last_per_commitment_secret(const LDKDataLossProtect *this_ptr))[32];
+       // const uint8_t (*DataLossProtect_get_your_last_per_commitment_secret(const LDKDataLossProtect *this_ptr))[32];
        public static native byte[] DataLossProtect_get_your_last_per_commitment_secret(long this_ptr);
-       /// void DataLossProtect_set_your_last_per_commitment_secret(LDKDataLossProtect *this_ptr, LDKThirtyTwoBytes val);
+       // void DataLossProtect_set_your_last_per_commitment_secret(LDKDataLossProtect *this_ptr, LDKThirtyTwoBytes val);
        public static native void DataLossProtect_set_your_last_per_commitment_secret(long this_ptr, long val);
-       /// LDKPublicKey DataLossProtect_get_my_current_per_commitment_point(const LDKDataLossProtect *this_ptr);
+       // LDKPublicKey DataLossProtect_get_my_current_per_commitment_point(const LDKDataLossProtect *this_ptr);
        public static native long DataLossProtect_get_my_current_per_commitment_point(long this_ptr);
-       /// void DataLossProtect_set_my_current_per_commitment_point(LDKDataLossProtect *this_ptr, LDKPublicKey val);
+       // void DataLossProtect_set_my_current_per_commitment_point(LDKDataLossProtect *this_ptr, LDKPublicKey val);
        public static native void DataLossProtect_set_my_current_per_commitment_point(long this_ptr, long val);
-       /// MUST_USE_RES LDKDataLossProtect DataLossProtect_new(LDKThirtyTwoBytes your_last_per_commitment_secret_arg, LDKPublicKey my_current_per_commitment_point_arg);
+       // MUST_USE_RES LDKDataLossProtect DataLossProtect_new(LDKThirtyTwoBytes your_last_per_commitment_secret_arg, LDKPublicKey my_current_per_commitment_point_arg);
        public static native long DataLossProtect_new(long your_last_per_commitment_secret_arg, long my_current_per_commitment_point_arg);
-       /// void ChannelReestablish_free(LDKChannelReestablish this_ptr);
+       // void ChannelReestablish_free(LDKChannelReestablish this_ptr);
        public static native void ChannelReestablish_free(long this_ptr);
-       /// const uint8_t (*ChannelReestablish_get_channel_id(const LDKChannelReestablish *this_ptr))[32];
+       // const uint8_t (*ChannelReestablish_get_channel_id(const LDKChannelReestablish *this_ptr))[32];
        public static native byte[] ChannelReestablish_get_channel_id(long this_ptr);
-       /// void ChannelReestablish_set_channel_id(LDKChannelReestablish *this_ptr, LDKThirtyTwoBytes val);
+       // void ChannelReestablish_set_channel_id(LDKChannelReestablish *this_ptr, LDKThirtyTwoBytes val);
        public static native void ChannelReestablish_set_channel_id(long this_ptr, long val);
-       /// uint64_t ChannelReestablish_get_next_local_commitment_number(const LDKChannelReestablish *this_ptr);
+       // uint64_t ChannelReestablish_get_next_local_commitment_number(const LDKChannelReestablish *this_ptr);
        public static native long ChannelReestablish_get_next_local_commitment_number(long this_ptr);
-       /// void ChannelReestablish_set_next_local_commitment_number(LDKChannelReestablish *this_ptr, uint64_t val);
+       // void ChannelReestablish_set_next_local_commitment_number(LDKChannelReestablish *this_ptr, uint64_t val);
        public static native void ChannelReestablish_set_next_local_commitment_number(long this_ptr, long val);
-       /// uint64_t ChannelReestablish_get_next_remote_commitment_number(const LDKChannelReestablish *this_ptr);
+       // uint64_t ChannelReestablish_get_next_remote_commitment_number(const LDKChannelReestablish *this_ptr);
        public static native long ChannelReestablish_get_next_remote_commitment_number(long this_ptr);
-       /// void ChannelReestablish_set_next_remote_commitment_number(LDKChannelReestablish *this_ptr, uint64_t val);
+       // void ChannelReestablish_set_next_remote_commitment_number(LDKChannelReestablish *this_ptr, uint64_t val);
        public static native void ChannelReestablish_set_next_remote_commitment_number(long this_ptr, long val);
-       /// void AnnouncementSignatures_free(LDKAnnouncementSignatures this_ptr);
+       // void AnnouncementSignatures_free(LDKAnnouncementSignatures this_ptr);
        public static native void AnnouncementSignatures_free(long this_ptr);
-       /// const uint8_t (*AnnouncementSignatures_get_channel_id(const LDKAnnouncementSignatures *this_ptr))[32];
+       // const uint8_t (*AnnouncementSignatures_get_channel_id(const LDKAnnouncementSignatures *this_ptr))[32];
        public static native byte[] AnnouncementSignatures_get_channel_id(long this_ptr);
-       /// void AnnouncementSignatures_set_channel_id(LDKAnnouncementSignatures *this_ptr, LDKThirtyTwoBytes val);
+       // void AnnouncementSignatures_set_channel_id(LDKAnnouncementSignatures *this_ptr, LDKThirtyTwoBytes val);
        public static native void AnnouncementSignatures_set_channel_id(long this_ptr, long val);
-       /// uint64_t AnnouncementSignatures_get_short_channel_id(const LDKAnnouncementSignatures *this_ptr);
+       // uint64_t AnnouncementSignatures_get_short_channel_id(const LDKAnnouncementSignatures *this_ptr);
        public static native long AnnouncementSignatures_get_short_channel_id(long this_ptr);
-       /// void AnnouncementSignatures_set_short_channel_id(LDKAnnouncementSignatures *this_ptr, uint64_t val);
+       // void AnnouncementSignatures_set_short_channel_id(LDKAnnouncementSignatures *this_ptr, uint64_t val);
        public static native void AnnouncementSignatures_set_short_channel_id(long this_ptr, long val);
-       /// LDKSignature AnnouncementSignatures_get_node_signature(const LDKAnnouncementSignatures *this_ptr);
+       // LDKSignature AnnouncementSignatures_get_node_signature(const LDKAnnouncementSignatures *this_ptr);
        public static native long AnnouncementSignatures_get_node_signature(long this_ptr);
-       /// void AnnouncementSignatures_set_node_signature(LDKAnnouncementSignatures *this_ptr, LDKSignature val);
+       // void AnnouncementSignatures_set_node_signature(LDKAnnouncementSignatures *this_ptr, LDKSignature val);
        public static native void AnnouncementSignatures_set_node_signature(long this_ptr, long val);
-       /// LDKSignature AnnouncementSignatures_get_bitcoin_signature(const LDKAnnouncementSignatures *this_ptr);
+       // LDKSignature AnnouncementSignatures_get_bitcoin_signature(const LDKAnnouncementSignatures *this_ptr);
        public static native long AnnouncementSignatures_get_bitcoin_signature(long this_ptr);
-       /// void AnnouncementSignatures_set_bitcoin_signature(LDKAnnouncementSignatures *this_ptr, LDKSignature val);
+       // void AnnouncementSignatures_set_bitcoin_signature(LDKAnnouncementSignatures *this_ptr, LDKSignature val);
        public static native void AnnouncementSignatures_set_bitcoin_signature(long this_ptr, long val);
-       /// MUST_USE_RES LDKAnnouncementSignatures AnnouncementSignatures_new(LDKThirtyTwoBytes channel_id_arg, uint64_t short_channel_id_arg, LDKSignature node_signature_arg, LDKSignature bitcoin_signature_arg);
+       // MUST_USE_RES LDKAnnouncementSignatures AnnouncementSignatures_new(LDKThirtyTwoBytes channel_id_arg, uint64_t short_channel_id_arg, LDKSignature node_signature_arg, LDKSignature bitcoin_signature_arg);
        public static native long AnnouncementSignatures_new(long channel_id_arg, long short_channel_id_arg, long node_signature_arg, long bitcoin_signature_arg);
-       /// void NetAddress_free(LDKNetAddress this_ptr);
+       // void NetAddress_free(LDKNetAddress this_ptr);
        public static native void NetAddress_free(long this_ptr);
-       /// void UnsignedNodeAnnouncement_free(LDKUnsignedNodeAnnouncement this_ptr);
+       // void UnsignedNodeAnnouncement_free(LDKUnsignedNodeAnnouncement this_ptr);
        public static native void UnsignedNodeAnnouncement_free(long this_ptr);
-       /// LDKNodeFeatures UnsignedNodeAnnouncement_get_features(const LDKUnsignedNodeAnnouncement *this_ptr);
+       // LDKNodeFeatures UnsignedNodeAnnouncement_get_features(const LDKUnsignedNodeAnnouncement *this_ptr);
        public static native long UnsignedNodeAnnouncement_get_features(long this_ptr);
-       /// void UnsignedNodeAnnouncement_set_features(LDKUnsignedNodeAnnouncement *this_ptr, LDKNodeFeatures val);
+       // void UnsignedNodeAnnouncement_set_features(LDKUnsignedNodeAnnouncement *this_ptr, LDKNodeFeatures val);
        public static native void UnsignedNodeAnnouncement_set_features(long this_ptr, long val);
-       /// uint32_t UnsignedNodeAnnouncement_get_timestamp(const LDKUnsignedNodeAnnouncement *this_ptr);
+       // uint32_t UnsignedNodeAnnouncement_get_timestamp(const LDKUnsignedNodeAnnouncement *this_ptr);
        public static native int UnsignedNodeAnnouncement_get_timestamp(long this_ptr);
-       /// void UnsignedNodeAnnouncement_set_timestamp(LDKUnsignedNodeAnnouncement *this_ptr, uint32_t val);
+       // void UnsignedNodeAnnouncement_set_timestamp(LDKUnsignedNodeAnnouncement *this_ptr, uint32_t val);
        public static native void UnsignedNodeAnnouncement_set_timestamp(long this_ptr, int val);
-       /// LDKPublicKey UnsignedNodeAnnouncement_get_node_id(const LDKUnsignedNodeAnnouncement *this_ptr);
+       // LDKPublicKey UnsignedNodeAnnouncement_get_node_id(const LDKUnsignedNodeAnnouncement *this_ptr);
        public static native long UnsignedNodeAnnouncement_get_node_id(long this_ptr);
-       /// void UnsignedNodeAnnouncement_set_node_id(LDKUnsignedNodeAnnouncement *this_ptr, LDKPublicKey val);
+       // void UnsignedNodeAnnouncement_set_node_id(LDKUnsignedNodeAnnouncement *this_ptr, LDKPublicKey val);
        public static native void UnsignedNodeAnnouncement_set_node_id(long this_ptr, long val);
-       /// const uint8_t (*UnsignedNodeAnnouncement_get_rgb(const LDKUnsignedNodeAnnouncement *this_ptr))[3];
+       // const uint8_t (*UnsignedNodeAnnouncement_get_rgb(const LDKUnsignedNodeAnnouncement *this_ptr))[3];
        public static native byte[] UnsignedNodeAnnouncement_get_rgb(long this_ptr);
-       /// void UnsignedNodeAnnouncement_set_rgb(LDKUnsignedNodeAnnouncement *this_ptr, LDKThreeBytes val);
+       // void UnsignedNodeAnnouncement_set_rgb(LDKUnsignedNodeAnnouncement *this_ptr, LDKThreeBytes val);
        public static native void UnsignedNodeAnnouncement_set_rgb(long this_ptr, long val);
-       /// const uint8_t (*UnsignedNodeAnnouncement_get_alias(const LDKUnsignedNodeAnnouncement *this_ptr))[32];
+       // const uint8_t (*UnsignedNodeAnnouncement_get_alias(const LDKUnsignedNodeAnnouncement *this_ptr))[32];
        public static native byte[] UnsignedNodeAnnouncement_get_alias(long this_ptr);
-       /// void UnsignedNodeAnnouncement_set_alias(LDKUnsignedNodeAnnouncement *this_ptr, LDKThirtyTwoBytes val);
+       // void UnsignedNodeAnnouncement_set_alias(LDKUnsignedNodeAnnouncement *this_ptr, LDKThirtyTwoBytes val);
        public static native void UnsignedNodeAnnouncement_set_alias(long this_ptr, long val);
-       /// void UnsignedNodeAnnouncement_set_addresses(LDKUnsignedNodeAnnouncement *this_ptr, LDKCVec_NetAddressZ val);
+       // void UnsignedNodeAnnouncement_set_addresses(LDKUnsignedNodeAnnouncement *this_ptr, LDKCVec_NetAddressZ val);
        public static native void UnsignedNodeAnnouncement_set_addresses(long this_ptr, long val);
-       /// void NodeAnnouncement_free(LDKNodeAnnouncement this_ptr);
+       // void NodeAnnouncement_free(LDKNodeAnnouncement this_ptr);
        public static native void NodeAnnouncement_free(long this_ptr);
-       /// LDKSignature NodeAnnouncement_get_signature(const LDKNodeAnnouncement *this_ptr);
+       // LDKSignature NodeAnnouncement_get_signature(const LDKNodeAnnouncement *this_ptr);
        public static native long NodeAnnouncement_get_signature(long this_ptr);
-       /// void NodeAnnouncement_set_signature(LDKNodeAnnouncement *this_ptr, LDKSignature val);
+       // void NodeAnnouncement_set_signature(LDKNodeAnnouncement *this_ptr, LDKSignature val);
        public static native void NodeAnnouncement_set_signature(long this_ptr, long val);
-       /// LDKUnsignedNodeAnnouncement NodeAnnouncement_get_contents(const LDKNodeAnnouncement *this_ptr);
+       // LDKUnsignedNodeAnnouncement NodeAnnouncement_get_contents(const LDKNodeAnnouncement *this_ptr);
        public static native long NodeAnnouncement_get_contents(long this_ptr);
-       /// void NodeAnnouncement_set_contents(LDKNodeAnnouncement *this_ptr, LDKUnsignedNodeAnnouncement val);
+       // void NodeAnnouncement_set_contents(LDKNodeAnnouncement *this_ptr, LDKUnsignedNodeAnnouncement val);
        public static native void NodeAnnouncement_set_contents(long this_ptr, long val);
-       /// MUST_USE_RES LDKNodeAnnouncement NodeAnnouncement_new(LDKSignature signature_arg, LDKUnsignedNodeAnnouncement contents_arg);
+       // MUST_USE_RES LDKNodeAnnouncement NodeAnnouncement_new(LDKSignature signature_arg, LDKUnsignedNodeAnnouncement contents_arg);
        public static native long NodeAnnouncement_new(long signature_arg, long contents_arg);
-       /// void UnsignedChannelAnnouncement_free(LDKUnsignedChannelAnnouncement this_ptr);
+       // void UnsignedChannelAnnouncement_free(LDKUnsignedChannelAnnouncement this_ptr);
        public static native void UnsignedChannelAnnouncement_free(long this_ptr);
-       /// LDKChannelFeatures UnsignedChannelAnnouncement_get_features(const LDKUnsignedChannelAnnouncement *this_ptr);
+       // LDKChannelFeatures UnsignedChannelAnnouncement_get_features(const LDKUnsignedChannelAnnouncement *this_ptr);
        public static native long UnsignedChannelAnnouncement_get_features(long this_ptr);
-       /// void UnsignedChannelAnnouncement_set_features(LDKUnsignedChannelAnnouncement *this_ptr, LDKChannelFeatures val);
+       // void UnsignedChannelAnnouncement_set_features(LDKUnsignedChannelAnnouncement *this_ptr, LDKChannelFeatures val);
        public static native void UnsignedChannelAnnouncement_set_features(long this_ptr, long val);
-       /// const uint8_t (*UnsignedChannelAnnouncement_get_chain_hash(const LDKUnsignedChannelAnnouncement *this_ptr))[32];
+       // const uint8_t (*UnsignedChannelAnnouncement_get_chain_hash(const LDKUnsignedChannelAnnouncement *this_ptr))[32];
        public static native byte[] UnsignedChannelAnnouncement_get_chain_hash(long this_ptr);
-       /// void UnsignedChannelAnnouncement_set_chain_hash(LDKUnsignedChannelAnnouncement *this_ptr, LDKThirtyTwoBytes val);
+       // void UnsignedChannelAnnouncement_set_chain_hash(LDKUnsignedChannelAnnouncement *this_ptr, LDKThirtyTwoBytes val);
        public static native void UnsignedChannelAnnouncement_set_chain_hash(long this_ptr, long val);
-       /// uint64_t UnsignedChannelAnnouncement_get_short_channel_id(const LDKUnsignedChannelAnnouncement *this_ptr);
+       // uint64_t UnsignedChannelAnnouncement_get_short_channel_id(const LDKUnsignedChannelAnnouncement *this_ptr);
        public static native long UnsignedChannelAnnouncement_get_short_channel_id(long this_ptr);
-       /// void UnsignedChannelAnnouncement_set_short_channel_id(LDKUnsignedChannelAnnouncement *this_ptr, uint64_t val);
+       // void UnsignedChannelAnnouncement_set_short_channel_id(LDKUnsignedChannelAnnouncement *this_ptr, uint64_t val);
        public static native void UnsignedChannelAnnouncement_set_short_channel_id(long this_ptr, long val);
-       /// LDKPublicKey UnsignedChannelAnnouncement_get_node_id_1(const LDKUnsignedChannelAnnouncement *this_ptr);
+       // LDKPublicKey UnsignedChannelAnnouncement_get_node_id_1(const LDKUnsignedChannelAnnouncement *this_ptr);
        public static native long UnsignedChannelAnnouncement_get_node_id_1(long this_ptr);
-       /// void UnsignedChannelAnnouncement_set_node_id_1(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
+       // void UnsignedChannelAnnouncement_set_node_id_1(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
        public static native void UnsignedChannelAnnouncement_set_node_id_1(long this_ptr, long val);
-       /// LDKPublicKey UnsignedChannelAnnouncement_get_node_id_2(const LDKUnsignedChannelAnnouncement *this_ptr);
+       // LDKPublicKey UnsignedChannelAnnouncement_get_node_id_2(const LDKUnsignedChannelAnnouncement *this_ptr);
        public static native long UnsignedChannelAnnouncement_get_node_id_2(long this_ptr);
-       /// void UnsignedChannelAnnouncement_set_node_id_2(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
+       // void UnsignedChannelAnnouncement_set_node_id_2(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
        public static native void UnsignedChannelAnnouncement_set_node_id_2(long this_ptr, long val);
-       /// LDKPublicKey UnsignedChannelAnnouncement_get_bitcoin_key_1(const LDKUnsignedChannelAnnouncement *this_ptr);
+       // LDKPublicKey UnsignedChannelAnnouncement_get_bitcoin_key_1(const LDKUnsignedChannelAnnouncement *this_ptr);
        public static native long UnsignedChannelAnnouncement_get_bitcoin_key_1(long this_ptr);
-       /// void UnsignedChannelAnnouncement_set_bitcoin_key_1(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
+       // void UnsignedChannelAnnouncement_set_bitcoin_key_1(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
        public static native void UnsignedChannelAnnouncement_set_bitcoin_key_1(long this_ptr, long val);
-       /// LDKPublicKey UnsignedChannelAnnouncement_get_bitcoin_key_2(const LDKUnsignedChannelAnnouncement *this_ptr);
+       // LDKPublicKey UnsignedChannelAnnouncement_get_bitcoin_key_2(const LDKUnsignedChannelAnnouncement *this_ptr);
        public static native long UnsignedChannelAnnouncement_get_bitcoin_key_2(long this_ptr);
-       /// void UnsignedChannelAnnouncement_set_bitcoin_key_2(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
+       // void UnsignedChannelAnnouncement_set_bitcoin_key_2(LDKUnsignedChannelAnnouncement *this_ptr, LDKPublicKey val);
        public static native void UnsignedChannelAnnouncement_set_bitcoin_key_2(long this_ptr, long val);
-       /// void ChannelAnnouncement_free(LDKChannelAnnouncement this_ptr);
+       // void ChannelAnnouncement_free(LDKChannelAnnouncement this_ptr);
        public static native void ChannelAnnouncement_free(long this_ptr);
-       /// LDKSignature ChannelAnnouncement_get_node_signature_1(const LDKChannelAnnouncement *this_ptr);
+       // LDKSignature ChannelAnnouncement_get_node_signature_1(const LDKChannelAnnouncement *this_ptr);
        public static native long ChannelAnnouncement_get_node_signature_1(long this_ptr);
-       /// void ChannelAnnouncement_set_node_signature_1(LDKChannelAnnouncement *this_ptr, LDKSignature val);
+       // void ChannelAnnouncement_set_node_signature_1(LDKChannelAnnouncement *this_ptr, LDKSignature val);
        public static native void ChannelAnnouncement_set_node_signature_1(long this_ptr, long val);
-       /// LDKSignature ChannelAnnouncement_get_node_signature_2(const LDKChannelAnnouncement *this_ptr);
+       // LDKSignature ChannelAnnouncement_get_node_signature_2(const LDKChannelAnnouncement *this_ptr);
        public static native long ChannelAnnouncement_get_node_signature_2(long this_ptr);
-       /// void ChannelAnnouncement_set_node_signature_2(LDKChannelAnnouncement *this_ptr, LDKSignature val);
+       // void ChannelAnnouncement_set_node_signature_2(LDKChannelAnnouncement *this_ptr, LDKSignature val);
        public static native void ChannelAnnouncement_set_node_signature_2(long this_ptr, long val);
-       /// LDKSignature ChannelAnnouncement_get_bitcoin_signature_1(const LDKChannelAnnouncement *this_ptr);
+       // LDKSignature ChannelAnnouncement_get_bitcoin_signature_1(const LDKChannelAnnouncement *this_ptr);
        public static native long ChannelAnnouncement_get_bitcoin_signature_1(long this_ptr);
-       /// void ChannelAnnouncement_set_bitcoin_signature_1(LDKChannelAnnouncement *this_ptr, LDKSignature val);
+       // void ChannelAnnouncement_set_bitcoin_signature_1(LDKChannelAnnouncement *this_ptr, LDKSignature val);
        public static native void ChannelAnnouncement_set_bitcoin_signature_1(long this_ptr, long val);
-       /// LDKSignature ChannelAnnouncement_get_bitcoin_signature_2(const LDKChannelAnnouncement *this_ptr);
+       // LDKSignature ChannelAnnouncement_get_bitcoin_signature_2(const LDKChannelAnnouncement *this_ptr);
        public static native long ChannelAnnouncement_get_bitcoin_signature_2(long this_ptr);
-       /// void ChannelAnnouncement_set_bitcoin_signature_2(LDKChannelAnnouncement *this_ptr, LDKSignature val);
+       // void ChannelAnnouncement_set_bitcoin_signature_2(LDKChannelAnnouncement *this_ptr, LDKSignature val);
        public static native void ChannelAnnouncement_set_bitcoin_signature_2(long this_ptr, long val);
-       /// LDKUnsignedChannelAnnouncement ChannelAnnouncement_get_contents(const LDKChannelAnnouncement *this_ptr);
+       // LDKUnsignedChannelAnnouncement ChannelAnnouncement_get_contents(const LDKChannelAnnouncement *this_ptr);
        public static native long ChannelAnnouncement_get_contents(long this_ptr);
-       /// void ChannelAnnouncement_set_contents(LDKChannelAnnouncement *this_ptr, LDKUnsignedChannelAnnouncement val);
+       // void ChannelAnnouncement_set_contents(LDKChannelAnnouncement *this_ptr, LDKUnsignedChannelAnnouncement val);
        public static native void ChannelAnnouncement_set_contents(long this_ptr, long val);
-       /// MUST_USE_RES LDKChannelAnnouncement ChannelAnnouncement_new(LDKSignature node_signature_1_arg, LDKSignature node_signature_2_arg, LDKSignature bitcoin_signature_1_arg, LDKSignature bitcoin_signature_2_arg, LDKUnsignedChannelAnnouncement contents_arg);
+       // MUST_USE_RES LDKChannelAnnouncement ChannelAnnouncement_new(LDKSignature node_signature_1_arg, LDKSignature node_signature_2_arg, LDKSignature bitcoin_signature_1_arg, LDKSignature bitcoin_signature_2_arg, LDKUnsignedChannelAnnouncement contents_arg);
        public static native long ChannelAnnouncement_new(long node_signature_1_arg, long node_signature_2_arg, long bitcoin_signature_1_arg, long bitcoin_signature_2_arg, long contents_arg);
-       /// void UnsignedChannelUpdate_free(LDKUnsignedChannelUpdate this_ptr);
+       // void UnsignedChannelUpdate_free(LDKUnsignedChannelUpdate this_ptr);
        public static native void UnsignedChannelUpdate_free(long this_ptr);
-       /// const uint8_t (*UnsignedChannelUpdate_get_chain_hash(const LDKUnsignedChannelUpdate *this_ptr))[32];
+       // const uint8_t (*UnsignedChannelUpdate_get_chain_hash(const LDKUnsignedChannelUpdate *this_ptr))[32];
        public static native byte[] UnsignedChannelUpdate_get_chain_hash(long this_ptr);
-       /// void UnsignedChannelUpdate_set_chain_hash(LDKUnsignedChannelUpdate *this_ptr, LDKThirtyTwoBytes val);
+       // void UnsignedChannelUpdate_set_chain_hash(LDKUnsignedChannelUpdate *this_ptr, LDKThirtyTwoBytes val);
        public static native void UnsignedChannelUpdate_set_chain_hash(long this_ptr, long val);
-       /// uint64_t UnsignedChannelUpdate_get_short_channel_id(const LDKUnsignedChannelUpdate *this_ptr);
+       // uint64_t UnsignedChannelUpdate_get_short_channel_id(const LDKUnsignedChannelUpdate *this_ptr);
        public static native long UnsignedChannelUpdate_get_short_channel_id(long this_ptr);
-       /// void UnsignedChannelUpdate_set_short_channel_id(LDKUnsignedChannelUpdate *this_ptr, uint64_t val);
+       // void UnsignedChannelUpdate_set_short_channel_id(LDKUnsignedChannelUpdate *this_ptr, uint64_t val);
        public static native void UnsignedChannelUpdate_set_short_channel_id(long this_ptr, long val);
-       /// uint32_t UnsignedChannelUpdate_get_timestamp(const LDKUnsignedChannelUpdate *this_ptr);
+       // uint32_t UnsignedChannelUpdate_get_timestamp(const LDKUnsignedChannelUpdate *this_ptr);
        public static native int UnsignedChannelUpdate_get_timestamp(long this_ptr);
-       /// void UnsignedChannelUpdate_set_timestamp(LDKUnsignedChannelUpdate *this_ptr, uint32_t val);
+       // void UnsignedChannelUpdate_set_timestamp(LDKUnsignedChannelUpdate *this_ptr, uint32_t val);
        public static native void UnsignedChannelUpdate_set_timestamp(long this_ptr, int val);
-       /// uint8_t UnsignedChannelUpdate_get_flags(const LDKUnsignedChannelUpdate *this_ptr);
+       // uint8_t UnsignedChannelUpdate_get_flags(const LDKUnsignedChannelUpdate *this_ptr);
        public static native byte UnsignedChannelUpdate_get_flags(long this_ptr);
-       /// void UnsignedChannelUpdate_set_flags(LDKUnsignedChannelUpdate *this_ptr, uint8_t val);
+       // void UnsignedChannelUpdate_set_flags(LDKUnsignedChannelUpdate *this_ptr, uint8_t val);
        public static native void UnsignedChannelUpdate_set_flags(long this_ptr, byte val);
-       /// uint16_t UnsignedChannelUpdate_get_cltv_expiry_delta(const LDKUnsignedChannelUpdate *this_ptr);
+       // uint16_t UnsignedChannelUpdate_get_cltv_expiry_delta(const LDKUnsignedChannelUpdate *this_ptr);
        public static native short UnsignedChannelUpdate_get_cltv_expiry_delta(long this_ptr);
-       /// void UnsignedChannelUpdate_set_cltv_expiry_delta(LDKUnsignedChannelUpdate *this_ptr, uint16_t val);
+       // void UnsignedChannelUpdate_set_cltv_expiry_delta(LDKUnsignedChannelUpdate *this_ptr, uint16_t val);
        public static native void UnsignedChannelUpdate_set_cltv_expiry_delta(long this_ptr, short val);
-       /// uint64_t UnsignedChannelUpdate_get_htlc_minimum_msat(const LDKUnsignedChannelUpdate *this_ptr);
+       // uint64_t UnsignedChannelUpdate_get_htlc_minimum_msat(const LDKUnsignedChannelUpdate *this_ptr);
        public static native long UnsignedChannelUpdate_get_htlc_minimum_msat(long this_ptr);
-       /// void UnsignedChannelUpdate_set_htlc_minimum_msat(LDKUnsignedChannelUpdate *this_ptr, uint64_t val);
+       // void UnsignedChannelUpdate_set_htlc_minimum_msat(LDKUnsignedChannelUpdate *this_ptr, uint64_t val);
        public static native void UnsignedChannelUpdate_set_htlc_minimum_msat(long this_ptr, long val);
-       /// uint32_t UnsignedChannelUpdate_get_fee_base_msat(const LDKUnsignedChannelUpdate *this_ptr);
+       // uint32_t UnsignedChannelUpdate_get_fee_base_msat(const LDKUnsignedChannelUpdate *this_ptr);
        public static native int UnsignedChannelUpdate_get_fee_base_msat(long this_ptr);
-       /// void UnsignedChannelUpdate_set_fee_base_msat(LDKUnsignedChannelUpdate *this_ptr, uint32_t val);
+       // void UnsignedChannelUpdate_set_fee_base_msat(LDKUnsignedChannelUpdate *this_ptr, uint32_t val);
        public static native void UnsignedChannelUpdate_set_fee_base_msat(long this_ptr, int val);
-       /// uint32_t UnsignedChannelUpdate_get_fee_proportional_millionths(const LDKUnsignedChannelUpdate *this_ptr);
+       // uint32_t UnsignedChannelUpdate_get_fee_proportional_millionths(const LDKUnsignedChannelUpdate *this_ptr);
        public static native int UnsignedChannelUpdate_get_fee_proportional_millionths(long this_ptr);
-       /// void UnsignedChannelUpdate_set_fee_proportional_millionths(LDKUnsignedChannelUpdate *this_ptr, uint32_t val);
+       // void UnsignedChannelUpdate_set_fee_proportional_millionths(LDKUnsignedChannelUpdate *this_ptr, uint32_t val);
        public static native void UnsignedChannelUpdate_set_fee_proportional_millionths(long this_ptr, int val);
-       /// void ChannelUpdate_free(LDKChannelUpdate this_ptr);
+       // void ChannelUpdate_free(LDKChannelUpdate this_ptr);
        public static native void ChannelUpdate_free(long this_ptr);
-       /// LDKSignature ChannelUpdate_get_signature(const LDKChannelUpdate *this_ptr);
+       // LDKSignature ChannelUpdate_get_signature(const LDKChannelUpdate *this_ptr);
        public static native long ChannelUpdate_get_signature(long this_ptr);
-       /// void ChannelUpdate_set_signature(LDKChannelUpdate *this_ptr, LDKSignature val);
+       // void ChannelUpdate_set_signature(LDKChannelUpdate *this_ptr, LDKSignature val);
        public static native void ChannelUpdate_set_signature(long this_ptr, long val);
-       /// LDKUnsignedChannelUpdate ChannelUpdate_get_contents(const LDKChannelUpdate *this_ptr);
+       // LDKUnsignedChannelUpdate ChannelUpdate_get_contents(const LDKChannelUpdate *this_ptr);
        public static native long ChannelUpdate_get_contents(long this_ptr);
-       /// void ChannelUpdate_set_contents(LDKChannelUpdate *this_ptr, LDKUnsignedChannelUpdate val);
+       // void ChannelUpdate_set_contents(LDKChannelUpdate *this_ptr, LDKUnsignedChannelUpdate val);
        public static native void ChannelUpdate_set_contents(long this_ptr, long val);
-       /// MUST_USE_RES LDKChannelUpdate ChannelUpdate_new(LDKSignature signature_arg, LDKUnsignedChannelUpdate contents_arg);
+       // MUST_USE_RES LDKChannelUpdate ChannelUpdate_new(LDKSignature signature_arg, LDKUnsignedChannelUpdate contents_arg);
        public static native long ChannelUpdate_new(long signature_arg, long contents_arg);
-       /// void QueryChannelRange_free(LDKQueryChannelRange this_ptr);
+       // void QueryChannelRange_free(LDKQueryChannelRange this_ptr);
        public static native void QueryChannelRange_free(long this_ptr);
-       /// const uint8_t (*QueryChannelRange_get_chain_hash(const LDKQueryChannelRange *this_ptr))[32];
+       // const uint8_t (*QueryChannelRange_get_chain_hash(const LDKQueryChannelRange *this_ptr))[32];
        public static native byte[] QueryChannelRange_get_chain_hash(long this_ptr);
-       /// void QueryChannelRange_set_chain_hash(LDKQueryChannelRange *this_ptr, LDKThirtyTwoBytes val);
+       // void QueryChannelRange_set_chain_hash(LDKQueryChannelRange *this_ptr, LDKThirtyTwoBytes val);
        public static native void QueryChannelRange_set_chain_hash(long this_ptr, long val);
-       /// uint32_t QueryChannelRange_get_first_blocknum(const LDKQueryChannelRange *this_ptr);
+       // uint32_t QueryChannelRange_get_first_blocknum(const LDKQueryChannelRange *this_ptr);
        public static native int QueryChannelRange_get_first_blocknum(long this_ptr);
-       /// void QueryChannelRange_set_first_blocknum(LDKQueryChannelRange *this_ptr, uint32_t val);
+       // void QueryChannelRange_set_first_blocknum(LDKQueryChannelRange *this_ptr, uint32_t val);
        public static native void QueryChannelRange_set_first_blocknum(long this_ptr, int val);
-       /// uint32_t QueryChannelRange_get_number_of_blocks(const LDKQueryChannelRange *this_ptr);
+       // uint32_t QueryChannelRange_get_number_of_blocks(const LDKQueryChannelRange *this_ptr);
        public static native int QueryChannelRange_get_number_of_blocks(long this_ptr);
-       /// void QueryChannelRange_set_number_of_blocks(LDKQueryChannelRange *this_ptr, uint32_t val);
+       // void QueryChannelRange_set_number_of_blocks(LDKQueryChannelRange *this_ptr, uint32_t val);
        public static native void QueryChannelRange_set_number_of_blocks(long this_ptr, int val);
-       /// MUST_USE_RES LDKQueryChannelRange QueryChannelRange_new(LDKThirtyTwoBytes chain_hash_arg, uint32_t first_blocknum_arg, uint32_t number_of_blocks_arg);
+       // MUST_USE_RES LDKQueryChannelRange QueryChannelRange_new(LDKThirtyTwoBytes chain_hash_arg, uint32_t first_blocknum_arg, uint32_t number_of_blocks_arg);
        public static native long QueryChannelRange_new(long chain_hash_arg, int first_blocknum_arg, int number_of_blocks_arg);
-       /// void ReplyChannelRange_free(LDKReplyChannelRange this_ptr);
+       // void ReplyChannelRange_free(LDKReplyChannelRange this_ptr);
        public static native void ReplyChannelRange_free(long this_ptr);
-       /// const uint8_t (*ReplyChannelRange_get_chain_hash(const LDKReplyChannelRange *this_ptr))[32];
+       // const uint8_t (*ReplyChannelRange_get_chain_hash(const LDKReplyChannelRange *this_ptr))[32];
        public static native byte[] ReplyChannelRange_get_chain_hash(long this_ptr);
-       /// void ReplyChannelRange_set_chain_hash(LDKReplyChannelRange *this_ptr, LDKThirtyTwoBytes val);
+       // void ReplyChannelRange_set_chain_hash(LDKReplyChannelRange *this_ptr, LDKThirtyTwoBytes val);
        public static native void ReplyChannelRange_set_chain_hash(long this_ptr, long val);
-       /// uint32_t ReplyChannelRange_get_first_blocknum(const LDKReplyChannelRange *this_ptr);
+       // uint32_t ReplyChannelRange_get_first_blocknum(const LDKReplyChannelRange *this_ptr);
        public static native int ReplyChannelRange_get_first_blocknum(long this_ptr);
-       /// void ReplyChannelRange_set_first_blocknum(LDKReplyChannelRange *this_ptr, uint32_t val);
+       // void ReplyChannelRange_set_first_blocknum(LDKReplyChannelRange *this_ptr, uint32_t val);
        public static native void ReplyChannelRange_set_first_blocknum(long this_ptr, int val);
-       /// uint32_t ReplyChannelRange_get_number_of_blocks(const LDKReplyChannelRange *this_ptr);
+       // uint32_t ReplyChannelRange_get_number_of_blocks(const LDKReplyChannelRange *this_ptr);
        public static native int ReplyChannelRange_get_number_of_blocks(long this_ptr);
-       /// void ReplyChannelRange_set_number_of_blocks(LDKReplyChannelRange *this_ptr, uint32_t val);
+       // void ReplyChannelRange_set_number_of_blocks(LDKReplyChannelRange *this_ptr, uint32_t val);
        public static native void ReplyChannelRange_set_number_of_blocks(long this_ptr, int val);
-       /// bool ReplyChannelRange_get_full_information(const LDKReplyChannelRange *this_ptr);
+       // bool ReplyChannelRange_get_full_information(const LDKReplyChannelRange *this_ptr);
        public static native boolean ReplyChannelRange_get_full_information(long this_ptr);
-       /// void ReplyChannelRange_set_full_information(LDKReplyChannelRange *this_ptr, bool val);
+       // void ReplyChannelRange_set_full_information(LDKReplyChannelRange *this_ptr, bool val);
        public static native void ReplyChannelRange_set_full_information(long this_ptr, boolean val);
-       /// void ReplyChannelRange_set_short_channel_ids(LDKReplyChannelRange *this_ptr, LDKCVec_u64Z val);
+       // void ReplyChannelRange_set_short_channel_ids(LDKReplyChannelRange *this_ptr, LDKCVec_u64Z val);
        public static native void ReplyChannelRange_set_short_channel_ids(long this_ptr, long val);
-       /// MUST_USE_RES LDKReplyChannelRange ReplyChannelRange_new(LDKThirtyTwoBytes chain_hash_arg, uint32_t first_blocknum_arg, uint32_t number_of_blocks_arg, bool full_information_arg, LDKCVec_u64Z short_channel_ids_arg);
+       // MUST_USE_RES LDKReplyChannelRange ReplyChannelRange_new(LDKThirtyTwoBytes chain_hash_arg, uint32_t first_blocknum_arg, uint32_t number_of_blocks_arg, bool full_information_arg, LDKCVec_u64Z short_channel_ids_arg);
        public static native long ReplyChannelRange_new(long chain_hash_arg, int first_blocknum_arg, int number_of_blocks_arg, boolean full_information_arg, long short_channel_ids_arg);
-       /// void QueryShortChannelIds_free(LDKQueryShortChannelIds this_ptr);
+       // void QueryShortChannelIds_free(LDKQueryShortChannelIds this_ptr);
        public static native void QueryShortChannelIds_free(long this_ptr);
-       /// const uint8_t (*QueryShortChannelIds_get_chain_hash(const LDKQueryShortChannelIds *this_ptr))[32];
+       // const uint8_t (*QueryShortChannelIds_get_chain_hash(const LDKQueryShortChannelIds *this_ptr))[32];
        public static native byte[] QueryShortChannelIds_get_chain_hash(long this_ptr);
-       /// void QueryShortChannelIds_set_chain_hash(LDKQueryShortChannelIds *this_ptr, LDKThirtyTwoBytes val);
+       // void QueryShortChannelIds_set_chain_hash(LDKQueryShortChannelIds *this_ptr, LDKThirtyTwoBytes val);
        public static native void QueryShortChannelIds_set_chain_hash(long this_ptr, long val);
-       /// void QueryShortChannelIds_set_short_channel_ids(LDKQueryShortChannelIds *this_ptr, LDKCVec_u64Z val);
+       // void QueryShortChannelIds_set_short_channel_ids(LDKQueryShortChannelIds *this_ptr, LDKCVec_u64Z val);
        public static native void QueryShortChannelIds_set_short_channel_ids(long this_ptr, long val);
-       /// MUST_USE_RES LDKQueryShortChannelIds QueryShortChannelIds_new(LDKThirtyTwoBytes chain_hash_arg, LDKCVec_u64Z short_channel_ids_arg);
+       // MUST_USE_RES LDKQueryShortChannelIds QueryShortChannelIds_new(LDKThirtyTwoBytes chain_hash_arg, LDKCVec_u64Z short_channel_ids_arg);
        public static native long QueryShortChannelIds_new(long chain_hash_arg, long short_channel_ids_arg);
-       /// void ReplyShortChannelIdsEnd_free(LDKReplyShortChannelIdsEnd this_ptr);
+       // void ReplyShortChannelIdsEnd_free(LDKReplyShortChannelIdsEnd this_ptr);
        public static native void ReplyShortChannelIdsEnd_free(long this_ptr);
-       /// const uint8_t (*ReplyShortChannelIdsEnd_get_chain_hash(const LDKReplyShortChannelIdsEnd *this_ptr))[32];
+       // const uint8_t (*ReplyShortChannelIdsEnd_get_chain_hash(const LDKReplyShortChannelIdsEnd *this_ptr))[32];
        public static native byte[] ReplyShortChannelIdsEnd_get_chain_hash(long this_ptr);
-       /// void ReplyShortChannelIdsEnd_set_chain_hash(LDKReplyShortChannelIdsEnd *this_ptr, LDKThirtyTwoBytes val);
+       // void ReplyShortChannelIdsEnd_set_chain_hash(LDKReplyShortChannelIdsEnd *this_ptr, LDKThirtyTwoBytes val);
        public static native void ReplyShortChannelIdsEnd_set_chain_hash(long this_ptr, long val);
-       /// bool ReplyShortChannelIdsEnd_get_full_information(const LDKReplyShortChannelIdsEnd *this_ptr);
+       // bool ReplyShortChannelIdsEnd_get_full_information(const LDKReplyShortChannelIdsEnd *this_ptr);
        public static native boolean ReplyShortChannelIdsEnd_get_full_information(long this_ptr);
-       /// void ReplyShortChannelIdsEnd_set_full_information(LDKReplyShortChannelIdsEnd *this_ptr, bool val);
+       // void ReplyShortChannelIdsEnd_set_full_information(LDKReplyShortChannelIdsEnd *this_ptr, bool val);
        public static native void ReplyShortChannelIdsEnd_set_full_information(long this_ptr, boolean val);
-       /// MUST_USE_RES LDKReplyShortChannelIdsEnd ReplyShortChannelIdsEnd_new(LDKThirtyTwoBytes chain_hash_arg, bool full_information_arg);
+       // MUST_USE_RES LDKReplyShortChannelIdsEnd ReplyShortChannelIdsEnd_new(LDKThirtyTwoBytes chain_hash_arg, bool full_information_arg);
        public static native long ReplyShortChannelIdsEnd_new(long chain_hash_arg, boolean full_information_arg);
-       /// void GossipTimestampFilter_free(LDKGossipTimestampFilter this_ptr);
+       // void GossipTimestampFilter_free(LDKGossipTimestampFilter this_ptr);
        public static native void GossipTimestampFilter_free(long this_ptr);
-       /// const uint8_t (*GossipTimestampFilter_get_chain_hash(const LDKGossipTimestampFilter *this_ptr))[32];
+       // const uint8_t (*GossipTimestampFilter_get_chain_hash(const LDKGossipTimestampFilter *this_ptr))[32];
        public static native byte[] GossipTimestampFilter_get_chain_hash(long this_ptr);
-       /// void GossipTimestampFilter_set_chain_hash(LDKGossipTimestampFilter *this_ptr, LDKThirtyTwoBytes val);
+       // void GossipTimestampFilter_set_chain_hash(LDKGossipTimestampFilter *this_ptr, LDKThirtyTwoBytes val);
        public static native void GossipTimestampFilter_set_chain_hash(long this_ptr, long val);
-       /// uint32_t GossipTimestampFilter_get_first_timestamp(const LDKGossipTimestampFilter *this_ptr);
+       // uint32_t GossipTimestampFilter_get_first_timestamp(const LDKGossipTimestampFilter *this_ptr);
        public static native int GossipTimestampFilter_get_first_timestamp(long this_ptr);
-       /// void GossipTimestampFilter_set_first_timestamp(LDKGossipTimestampFilter *this_ptr, uint32_t val);
+       // void GossipTimestampFilter_set_first_timestamp(LDKGossipTimestampFilter *this_ptr, uint32_t val);
        public static native void GossipTimestampFilter_set_first_timestamp(long this_ptr, int val);
-       /// uint32_t GossipTimestampFilter_get_timestamp_range(const LDKGossipTimestampFilter *this_ptr);
+       // uint32_t GossipTimestampFilter_get_timestamp_range(const LDKGossipTimestampFilter *this_ptr);
        public static native int GossipTimestampFilter_get_timestamp_range(long this_ptr);
-       /// void GossipTimestampFilter_set_timestamp_range(LDKGossipTimestampFilter *this_ptr, uint32_t val);
+       // void GossipTimestampFilter_set_timestamp_range(LDKGossipTimestampFilter *this_ptr, uint32_t val);
        public static native void GossipTimestampFilter_set_timestamp_range(long this_ptr, int val);
-       /// MUST_USE_RES LDKGossipTimestampFilter GossipTimestampFilter_new(LDKThirtyTwoBytes chain_hash_arg, uint32_t first_timestamp_arg, uint32_t timestamp_range_arg);
+       // MUST_USE_RES LDKGossipTimestampFilter GossipTimestampFilter_new(LDKThirtyTwoBytes chain_hash_arg, uint32_t first_timestamp_arg, uint32_t timestamp_range_arg);
        public static native long GossipTimestampFilter_new(long chain_hash_arg, int first_timestamp_arg, int timestamp_range_arg);
-       /// void ErrorAction_free(LDKErrorAction this_ptr);
+       // void ErrorAction_free(LDKErrorAction this_ptr);
        public static native void ErrorAction_free(long this_ptr);
-       /// void LightningError_free(LDKLightningError this_ptr);
+       // void LightningError_free(LDKLightningError this_ptr);
        public static native void LightningError_free(long this_ptr);
-       /// LDKStr LightningError_get_err(const LDKLightningError *this_ptr);
+       // LDKStr LightningError_get_err(const LDKLightningError *this_ptr);
        public static native long LightningError_get_err(long this_ptr);
-       /// void LightningError_set_err(LDKLightningError *this_ptr, LDKCVec_u8Z val);
+       // void LightningError_set_err(LDKLightningError *this_ptr, LDKCVec_u8Z val);
        public static native void LightningError_set_err(long this_ptr, long val);
-       /// LDKErrorAction LightningError_get_action(const LDKLightningError *this_ptr);
+       // LDKErrorAction LightningError_get_action(const LDKLightningError *this_ptr);
        public static native long LightningError_get_action(long this_ptr);
-       /// void LightningError_set_action(LDKLightningError *this_ptr, LDKErrorAction val);
+       // void LightningError_set_action(LDKLightningError *this_ptr, LDKErrorAction val);
        public static native void LightningError_set_action(long this_ptr, long val);
-       /// MUST_USE_RES LDKLightningError LightningError_new(LDKCVec_u8Z err_arg, LDKErrorAction action_arg);
+       // MUST_USE_RES LDKLightningError LightningError_new(LDKCVec_u8Z err_arg, LDKErrorAction action_arg);
        public static native long LightningError_new(long err_arg, long action_arg);
-       /// void CommitmentUpdate_free(LDKCommitmentUpdate this_ptr);
+       // void CommitmentUpdate_free(LDKCommitmentUpdate this_ptr);
        public static native void CommitmentUpdate_free(long this_ptr);
-       /// void CommitmentUpdate_set_update_add_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateAddHTLCZ val);
+       // void CommitmentUpdate_set_update_add_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateAddHTLCZ val);
        public static native void CommitmentUpdate_set_update_add_htlcs(long this_ptr, long val);
-       /// void CommitmentUpdate_set_update_fulfill_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateFulfillHTLCZ val);
+       // void CommitmentUpdate_set_update_fulfill_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateFulfillHTLCZ val);
        public static native void CommitmentUpdate_set_update_fulfill_htlcs(long this_ptr, long val);
-       /// void CommitmentUpdate_set_update_fail_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateFailHTLCZ val);
+       // void CommitmentUpdate_set_update_fail_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateFailHTLCZ val);
        public static native void CommitmentUpdate_set_update_fail_htlcs(long this_ptr, long val);
-       /// void CommitmentUpdate_set_update_fail_malformed_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateFailMalformedHTLCZ val);
+       // void CommitmentUpdate_set_update_fail_malformed_htlcs(LDKCommitmentUpdate *this_ptr, LDKCVec_UpdateFailMalformedHTLCZ val);
        public static native void CommitmentUpdate_set_update_fail_malformed_htlcs(long this_ptr, long val);
-       /// LDKUpdateFee CommitmentUpdate_get_update_fee(const LDKCommitmentUpdate *this_ptr);
+       // LDKUpdateFee CommitmentUpdate_get_update_fee(const LDKCommitmentUpdate *this_ptr);
        public static native long CommitmentUpdate_get_update_fee(long this_ptr);
-       /// void CommitmentUpdate_set_update_fee(LDKCommitmentUpdate *this_ptr, LDKUpdateFee val);
+       // void CommitmentUpdate_set_update_fee(LDKCommitmentUpdate *this_ptr, LDKUpdateFee val);
        public static native void CommitmentUpdate_set_update_fee(long this_ptr, long val);
-       /// LDKCommitmentSigned CommitmentUpdate_get_commitment_signed(const LDKCommitmentUpdate *this_ptr);
+       // LDKCommitmentSigned CommitmentUpdate_get_commitment_signed(const LDKCommitmentUpdate *this_ptr);
        public static native long CommitmentUpdate_get_commitment_signed(long this_ptr);
-       /// void CommitmentUpdate_set_commitment_signed(LDKCommitmentUpdate *this_ptr, LDKCommitmentSigned val);
+       // void CommitmentUpdate_set_commitment_signed(LDKCommitmentUpdate *this_ptr, LDKCommitmentSigned val);
        public static native void CommitmentUpdate_set_commitment_signed(long this_ptr, long val);
-       /// MUST_USE_RES LDKCommitmentUpdate CommitmentUpdate_new(LDKCVec_UpdateAddHTLCZ update_add_htlcs_arg, LDKCVec_UpdateFulfillHTLCZ update_fulfill_htlcs_arg, LDKCVec_UpdateFailHTLCZ update_fail_htlcs_arg, LDKCVec_UpdateFailMalformedHTLCZ update_fail_malformed_htlcs_arg, LDKUpdateFee update_fee_arg, LDKCommitmentSigned commitment_signed_arg);
+       // MUST_USE_RES LDKCommitmentUpdate CommitmentUpdate_new(LDKCVec_UpdateAddHTLCZ update_add_htlcs_arg, LDKCVec_UpdateFulfillHTLCZ update_fulfill_htlcs_arg, LDKCVec_UpdateFailHTLCZ update_fail_htlcs_arg, LDKCVec_UpdateFailMalformedHTLCZ update_fail_malformed_htlcs_arg, LDKUpdateFee update_fee_arg, LDKCommitmentSigned commitment_signed_arg);
        public static native long CommitmentUpdate_new(long update_add_htlcs_arg, long update_fulfill_htlcs_arg, long update_fail_htlcs_arg, long update_fail_malformed_htlcs_arg, long update_fee_arg, long commitment_signed_arg);
-       /// void HTLCFailChannelUpdate_free(LDKHTLCFailChannelUpdate this_ptr);
+       // void HTLCFailChannelUpdate_free(LDKHTLCFailChannelUpdate this_ptr);
        public static native void HTLCFailChannelUpdate_free(long this_ptr);
-       /// void ChannelMessageHandler_free(LDKChannelMessageHandler this_ptr);
+       // void ChannelMessageHandler_free(LDKChannelMessageHandler this_ptr);
        public static native void ChannelMessageHandler_free(long this_ptr);
-       /// void RoutingMessageHandler_free(LDKRoutingMessageHandler this_ptr);
+       // void RoutingMessageHandler_free(LDKRoutingMessageHandler this_ptr);
        public static native void RoutingMessageHandler_free(long this_ptr);
-       /// LDKCVec_u8Z AcceptChannel_write(const LDKAcceptChannel *obj);
+       // LDKCVec_u8Z AcceptChannel_write(const LDKAcceptChannel *obj);
        public static native long AcceptChannel_write(long obj);
-       /// LDKAcceptChannel AcceptChannel_read(LDKu8slice ser);
+       // LDKAcceptChannel AcceptChannel_read(LDKu8slice ser);
        public static native long AcceptChannel_read(long ser);
-       /// LDKCVec_u8Z AnnouncementSignatures_write(const LDKAnnouncementSignatures *obj);
+       // LDKCVec_u8Z AnnouncementSignatures_write(const LDKAnnouncementSignatures *obj);
        public static native long AnnouncementSignatures_write(long obj);
-       /// LDKAnnouncementSignatures AnnouncementSignatures_read(LDKu8slice ser);
+       // LDKAnnouncementSignatures AnnouncementSignatures_read(LDKu8slice ser);
        public static native long AnnouncementSignatures_read(long ser);
-       /// LDKCVec_u8Z ChannelReestablish_write(const LDKChannelReestablish *obj);
+       // LDKCVec_u8Z ChannelReestablish_write(const LDKChannelReestablish *obj);
        public static native long ChannelReestablish_write(long obj);
-       /// LDKChannelReestablish ChannelReestablish_read(LDKu8slice ser);
+       // LDKChannelReestablish ChannelReestablish_read(LDKu8slice ser);
        public static native long ChannelReestablish_read(long ser);
-       /// LDKCVec_u8Z ClosingSigned_write(const LDKClosingSigned *obj);
+       // LDKCVec_u8Z ClosingSigned_write(const LDKClosingSigned *obj);
        public static native long ClosingSigned_write(long obj);
-       /// LDKClosingSigned ClosingSigned_read(LDKu8slice ser);
+       // LDKClosingSigned ClosingSigned_read(LDKu8slice ser);
        public static native long ClosingSigned_read(long ser);
-       /// LDKCVec_u8Z CommitmentSigned_write(const LDKCommitmentSigned *obj);
+       // LDKCVec_u8Z CommitmentSigned_write(const LDKCommitmentSigned *obj);
        public static native long CommitmentSigned_write(long obj);
-       /// LDKCommitmentSigned CommitmentSigned_read(LDKu8slice ser);
+       // LDKCommitmentSigned CommitmentSigned_read(LDKu8slice ser);
        public static native long CommitmentSigned_read(long ser);
-       /// LDKCVec_u8Z FundingCreated_write(const LDKFundingCreated *obj);
+       // LDKCVec_u8Z FundingCreated_write(const LDKFundingCreated *obj);
        public static native long FundingCreated_write(long obj);
-       /// LDKFundingCreated FundingCreated_read(LDKu8slice ser);
+       // LDKFundingCreated FundingCreated_read(LDKu8slice ser);
        public static native long FundingCreated_read(long ser);
-       /// LDKCVec_u8Z FundingSigned_write(const LDKFundingSigned *obj);
+       // LDKCVec_u8Z FundingSigned_write(const LDKFundingSigned *obj);
        public static native long FundingSigned_write(long obj);
-       /// LDKFundingSigned FundingSigned_read(LDKu8slice ser);
+       // LDKFundingSigned FundingSigned_read(LDKu8slice ser);
        public static native long FundingSigned_read(long ser);
-       /// LDKCVec_u8Z FundingLocked_write(const LDKFundingLocked *obj);
+       // LDKCVec_u8Z FundingLocked_write(const LDKFundingLocked *obj);
        public static native long FundingLocked_write(long obj);
-       /// LDKFundingLocked FundingLocked_read(LDKu8slice ser);
+       // LDKFundingLocked FundingLocked_read(LDKu8slice ser);
        public static native long FundingLocked_read(long ser);
-       /// LDKCVec_u8Z Init_write(const LDKInit *obj);
+       // LDKCVec_u8Z Init_write(const LDKInit *obj);
        public static native long Init_write(long obj);
-       /// LDKInit Init_read(LDKu8slice ser);
+       // LDKInit Init_read(LDKu8slice ser);
        public static native long Init_read(long ser);
-       /// LDKCVec_u8Z OpenChannel_write(const LDKOpenChannel *obj);
+       // LDKCVec_u8Z OpenChannel_write(const LDKOpenChannel *obj);
        public static native long OpenChannel_write(long obj);
-       /// LDKOpenChannel OpenChannel_read(LDKu8slice ser);
+       // LDKOpenChannel OpenChannel_read(LDKu8slice ser);
        public static native long OpenChannel_read(long ser);
-       /// LDKCVec_u8Z RevokeAndACK_write(const LDKRevokeAndACK *obj);
+       // LDKCVec_u8Z RevokeAndACK_write(const LDKRevokeAndACK *obj);
        public static native long RevokeAndACK_write(long obj);
-       /// LDKRevokeAndACK RevokeAndACK_read(LDKu8slice ser);
+       // LDKRevokeAndACK RevokeAndACK_read(LDKu8slice ser);
        public static native long RevokeAndACK_read(long ser);
-       /// LDKCVec_u8Z Shutdown_write(const LDKShutdown *obj);
+       // LDKCVec_u8Z Shutdown_write(const LDKShutdown *obj);
        public static native long Shutdown_write(long obj);
-       /// LDKShutdown Shutdown_read(LDKu8slice ser);
+       // LDKShutdown Shutdown_read(LDKu8slice ser);
        public static native long Shutdown_read(long ser);
-       /// LDKCVec_u8Z UpdateFailHTLC_write(const LDKUpdateFailHTLC *obj);
+       // LDKCVec_u8Z UpdateFailHTLC_write(const LDKUpdateFailHTLC *obj);
        public static native long UpdateFailHTLC_write(long obj);
-       /// LDKUpdateFailHTLC UpdateFailHTLC_read(LDKu8slice ser);
+       // LDKUpdateFailHTLC UpdateFailHTLC_read(LDKu8slice ser);
        public static native long UpdateFailHTLC_read(long ser);
-       /// LDKCVec_u8Z UpdateFailMalformedHTLC_write(const LDKUpdateFailMalformedHTLC *obj);
+       // LDKCVec_u8Z UpdateFailMalformedHTLC_write(const LDKUpdateFailMalformedHTLC *obj);
        public static native long UpdateFailMalformedHTLC_write(long obj);
-       /// LDKUpdateFailMalformedHTLC UpdateFailMalformedHTLC_read(LDKu8slice ser);
+       // LDKUpdateFailMalformedHTLC UpdateFailMalformedHTLC_read(LDKu8slice ser);
        public static native long UpdateFailMalformedHTLC_read(long ser);
-       /// LDKCVec_u8Z UpdateFee_write(const LDKUpdateFee *obj);
+       // LDKCVec_u8Z UpdateFee_write(const LDKUpdateFee *obj);
        public static native long UpdateFee_write(long obj);
-       /// LDKUpdateFee UpdateFee_read(LDKu8slice ser);
+       // LDKUpdateFee UpdateFee_read(LDKu8slice ser);
        public static native long UpdateFee_read(long ser);
-       /// LDKCVec_u8Z UpdateFulfillHTLC_write(const LDKUpdateFulfillHTLC *obj);
+       // LDKCVec_u8Z UpdateFulfillHTLC_write(const LDKUpdateFulfillHTLC *obj);
        public static native long UpdateFulfillHTLC_write(long obj);
-       /// LDKUpdateFulfillHTLC UpdateFulfillHTLC_read(LDKu8slice ser);
+       // LDKUpdateFulfillHTLC UpdateFulfillHTLC_read(LDKu8slice ser);
        public static native long UpdateFulfillHTLC_read(long ser);
-       /// LDKCVec_u8Z UpdateAddHTLC_write(const LDKUpdateAddHTLC *obj);
+       // LDKCVec_u8Z UpdateAddHTLC_write(const LDKUpdateAddHTLC *obj);
        public static native long UpdateAddHTLC_write(long obj);
-       /// LDKUpdateAddHTLC UpdateAddHTLC_read(LDKu8slice ser);
+       // LDKUpdateAddHTLC UpdateAddHTLC_read(LDKu8slice ser);
        public static native long UpdateAddHTLC_read(long ser);
-       /// LDKCVec_u8Z Ping_write(const LDKPing *obj);
+       // LDKCVec_u8Z Ping_write(const LDKPing *obj);
        public static native long Ping_write(long obj);
-       /// LDKPing Ping_read(LDKu8slice ser);
+       // LDKPing Ping_read(LDKu8slice ser);
        public static native long Ping_read(long ser);
-       /// LDKCVec_u8Z Pong_write(const LDKPong *obj);
+       // LDKCVec_u8Z Pong_write(const LDKPong *obj);
        public static native long Pong_write(long obj);
-       /// LDKPong Pong_read(LDKu8slice ser);
+       // LDKPong Pong_read(LDKu8slice ser);
        public static native long Pong_read(long ser);
-       /// LDKCVec_u8Z UnsignedChannelAnnouncement_write(const LDKUnsignedChannelAnnouncement *obj);
+       // LDKCVec_u8Z UnsignedChannelAnnouncement_write(const LDKUnsignedChannelAnnouncement *obj);
        public static native long UnsignedChannelAnnouncement_write(long obj);
-       /// LDKUnsignedChannelAnnouncement UnsignedChannelAnnouncement_read(LDKu8slice ser);
+       // LDKUnsignedChannelAnnouncement UnsignedChannelAnnouncement_read(LDKu8slice ser);
        public static native long UnsignedChannelAnnouncement_read(long ser);
-       /// LDKCVec_u8Z ChannelAnnouncement_write(const LDKChannelAnnouncement *obj);
+       // LDKCVec_u8Z ChannelAnnouncement_write(const LDKChannelAnnouncement *obj);
        public static native long ChannelAnnouncement_write(long obj);
-       /// LDKChannelAnnouncement ChannelAnnouncement_read(LDKu8slice ser);
+       // LDKChannelAnnouncement ChannelAnnouncement_read(LDKu8slice ser);
        public static native long ChannelAnnouncement_read(long ser);
-       /// LDKCVec_u8Z UnsignedChannelUpdate_write(const LDKUnsignedChannelUpdate *obj);
+       // LDKCVec_u8Z UnsignedChannelUpdate_write(const LDKUnsignedChannelUpdate *obj);
        public static native long UnsignedChannelUpdate_write(long obj);
-       /// LDKUnsignedChannelUpdate UnsignedChannelUpdate_read(LDKu8slice ser);
+       // LDKUnsignedChannelUpdate UnsignedChannelUpdate_read(LDKu8slice ser);
        public static native long UnsignedChannelUpdate_read(long ser);
-       /// LDKCVec_u8Z ChannelUpdate_write(const LDKChannelUpdate *obj);
+       // LDKCVec_u8Z ChannelUpdate_write(const LDKChannelUpdate *obj);
        public static native long ChannelUpdate_write(long obj);
-       /// LDKChannelUpdate ChannelUpdate_read(LDKu8slice ser);
+       // LDKChannelUpdate ChannelUpdate_read(LDKu8slice ser);
        public static native long ChannelUpdate_read(long ser);
-       /// LDKCVec_u8Z ErrorMessage_write(const LDKErrorMessage *obj);
+       // LDKCVec_u8Z ErrorMessage_write(const LDKErrorMessage *obj);
        public static native long ErrorMessage_write(long obj);
-       /// LDKErrorMessage ErrorMessage_read(LDKu8slice ser);
+       // LDKErrorMessage ErrorMessage_read(LDKu8slice ser);
        public static native long ErrorMessage_read(long ser);
-       /// LDKCVec_u8Z UnsignedNodeAnnouncement_write(const LDKUnsignedNodeAnnouncement *obj);
+       // LDKCVec_u8Z UnsignedNodeAnnouncement_write(const LDKUnsignedNodeAnnouncement *obj);
        public static native long UnsignedNodeAnnouncement_write(long obj);
-       /// LDKUnsignedNodeAnnouncement UnsignedNodeAnnouncement_read(LDKu8slice ser);
+       // LDKUnsignedNodeAnnouncement UnsignedNodeAnnouncement_read(LDKu8slice ser);
        public static native long UnsignedNodeAnnouncement_read(long ser);
-       /// LDKCVec_u8Z NodeAnnouncement_write(const LDKNodeAnnouncement *obj);
+       // LDKCVec_u8Z NodeAnnouncement_write(const LDKNodeAnnouncement *obj);
        public static native long NodeAnnouncement_write(long obj);
-       /// LDKNodeAnnouncement NodeAnnouncement_read(LDKu8slice ser);
+       // LDKNodeAnnouncement NodeAnnouncement_read(LDKu8slice ser);
        public static native long NodeAnnouncement_read(long ser);
-       /// LDKQueryShortChannelIds QueryShortChannelIds_read(LDKu8slice ser);
+       // LDKQueryShortChannelIds QueryShortChannelIds_read(LDKu8slice ser);
        public static native long QueryShortChannelIds_read(long ser);
-       /// LDKCVec_u8Z QueryShortChannelIds_write(const LDKQueryShortChannelIds *obj);
+       // LDKCVec_u8Z QueryShortChannelIds_write(const LDKQueryShortChannelIds *obj);
        public static native long QueryShortChannelIds_write(long obj);
-       /// LDKReplyShortChannelIdsEnd ReplyShortChannelIdsEnd_read(LDKu8slice ser);
+       // LDKReplyShortChannelIdsEnd ReplyShortChannelIdsEnd_read(LDKu8slice ser);
        public static native long ReplyShortChannelIdsEnd_read(long ser);
-       /// LDKCVec_u8Z ReplyShortChannelIdsEnd_write(const LDKReplyShortChannelIdsEnd *obj);
+       // LDKCVec_u8Z ReplyShortChannelIdsEnd_write(const LDKReplyShortChannelIdsEnd *obj);
        public static native long ReplyShortChannelIdsEnd_write(long obj);
-       /// LDKQueryChannelRange QueryChannelRange_read(LDKu8slice ser);
+       // LDKQueryChannelRange QueryChannelRange_read(LDKu8slice ser);
        public static native long QueryChannelRange_read(long ser);
-       /// LDKCVec_u8Z QueryChannelRange_write(const LDKQueryChannelRange *obj);
+       // LDKCVec_u8Z QueryChannelRange_write(const LDKQueryChannelRange *obj);
        public static native long QueryChannelRange_write(long obj);
-       /// LDKReplyChannelRange ReplyChannelRange_read(LDKu8slice ser);
+       // LDKReplyChannelRange ReplyChannelRange_read(LDKu8slice ser);
        public static native long ReplyChannelRange_read(long ser);
-       /// LDKCVec_u8Z ReplyChannelRange_write(const LDKReplyChannelRange *obj);
+       // LDKCVec_u8Z ReplyChannelRange_write(const LDKReplyChannelRange *obj);
        public static native long ReplyChannelRange_write(long obj);
-       /// LDKGossipTimestampFilter GossipTimestampFilter_read(LDKu8slice ser);
+       // LDKGossipTimestampFilter GossipTimestampFilter_read(LDKu8slice ser);
        public static native long GossipTimestampFilter_read(long ser);
-       /// LDKCVec_u8Z GossipTimestampFilter_write(const LDKGossipTimestampFilter *obj);
+       // LDKCVec_u8Z GossipTimestampFilter_write(const LDKGossipTimestampFilter *obj);
        public static native long GossipTimestampFilter_write(long obj);
-       /// void MessageHandler_free(LDKMessageHandler this_ptr);
+       // void MessageHandler_free(LDKMessageHandler this_ptr);
        public static native void MessageHandler_free(long this_ptr);
-       /// const LDKChannelMessageHandler *MessageHandler_get_chan_handler(const LDKMessageHandler *this_ptr);
+       // const LDKChannelMessageHandler *MessageHandler_get_chan_handler(const LDKMessageHandler *this_ptr);
        public static native long MessageHandler_get_chan_handler(long this_ptr);
-       /// void MessageHandler_set_chan_handler(LDKMessageHandler *this_ptr, LDKChannelMessageHandler val);
+       // void MessageHandler_set_chan_handler(LDKMessageHandler *this_ptr, LDKChannelMessageHandler val);
        public static native void MessageHandler_set_chan_handler(long this_ptr, long val);
-       /// const LDKRoutingMessageHandler *MessageHandler_get_route_handler(const LDKMessageHandler *this_ptr);
+       // const LDKRoutingMessageHandler *MessageHandler_get_route_handler(const LDKMessageHandler *this_ptr);
        public static native long MessageHandler_get_route_handler(long this_ptr);
-       /// void MessageHandler_set_route_handler(LDKMessageHandler *this_ptr, LDKRoutingMessageHandler val);
+       // void MessageHandler_set_route_handler(LDKMessageHandler *this_ptr, LDKRoutingMessageHandler val);
        public static native void MessageHandler_set_route_handler(long this_ptr, long val);
-       /// MUST_USE_RES LDKMessageHandler MessageHandler_new(LDKChannelMessageHandler chan_handler_arg, LDKRoutingMessageHandler route_handler_arg);
+       // MUST_USE_RES LDKMessageHandler MessageHandler_new(LDKChannelMessageHandler chan_handler_arg, LDKRoutingMessageHandler route_handler_arg);
        public static native long MessageHandler_new(long chan_handler_arg, long route_handler_arg);
-       /// void SocketDescriptor_free(LDKSocketDescriptor this_ptr);
+       // void SocketDescriptor_free(LDKSocketDescriptor this_ptr);
        public static native void SocketDescriptor_free(long this_ptr);
-       /// void PeerHandleError_free(LDKPeerHandleError this_ptr);
+       // void PeerHandleError_free(LDKPeerHandleError this_ptr);
        public static native void PeerHandleError_free(long this_ptr);
-       /// bool PeerHandleError_get_no_connection_possible(const LDKPeerHandleError *this_ptr);
+       // bool PeerHandleError_get_no_connection_possible(const LDKPeerHandleError *this_ptr);
        public static native boolean PeerHandleError_get_no_connection_possible(long this_ptr);
-       /// void PeerHandleError_set_no_connection_possible(LDKPeerHandleError *this_ptr, bool val);
+       // void PeerHandleError_set_no_connection_possible(LDKPeerHandleError *this_ptr, bool val);
        public static native void PeerHandleError_set_no_connection_possible(long this_ptr, boolean val);
-       /// MUST_USE_RES LDKPeerHandleError PeerHandleError_new(bool no_connection_possible_arg);
+       // MUST_USE_RES LDKPeerHandleError PeerHandleError_new(bool no_connection_possible_arg);
        public static native long PeerHandleError_new(boolean no_connection_possible_arg);
-       /// void PeerManager_free(LDKPeerManager this_ptr);
+       // void PeerManager_free(LDKPeerManager this_ptr);
        public static native void PeerManager_free(long this_ptr);
-       /// MUST_USE_RES LDKPeerManager PeerManager_new(LDKMessageHandler message_handler, LDKSecretKey our_node_secret, const uint8_t (*ephemeral_random_data)[32], LDKLogger logger);
+       // MUST_USE_RES LDKPeerManager PeerManager_new(LDKMessageHandler message_handler, LDKSecretKey our_node_secret, const uint8_t (*ephemeral_random_data)[32], LDKLogger logger);
        public static native long PeerManager_new(long message_handler, long our_node_secret, byte[] ephemeral_random_data, long logger);
-       /// MUST_USE_RES LDKCVec_PublicKeyZ PeerManager_get_peer_node_ids(const LDKPeerManager *this_arg);
+       // MUST_USE_RES LDKCVec_PublicKeyZ PeerManager_get_peer_node_ids(const LDKPeerManager *this_arg);
        public static native long PeerManager_get_peer_node_ids(long this_arg);
-       /// MUST_USE_RES LDKCResult_CVec_u8ZPeerHandleErrorZ PeerManager_new_outbound_connection(const LDKPeerManager *this_arg, LDKPublicKey their_node_id, LDKSocketDescriptor descriptor);
+       // MUST_USE_RES LDKCResult_CVec_u8ZPeerHandleErrorZ PeerManager_new_outbound_connection(const LDKPeerManager *this_arg, LDKPublicKey their_node_id, LDKSocketDescriptor descriptor);
        public static native long PeerManager_new_outbound_connection(long this_arg, long their_node_id, long descriptor);
-       /// MUST_USE_RES LDKCResult_NonePeerHandleErrorZ PeerManager_new_inbound_connection(const LDKPeerManager *this_arg, LDKSocketDescriptor descriptor);
+       // MUST_USE_RES LDKCResult_NonePeerHandleErrorZ PeerManager_new_inbound_connection(const LDKPeerManager *this_arg, LDKSocketDescriptor descriptor);
        public static native long PeerManager_new_inbound_connection(long this_arg, long descriptor);
-       /// MUST_USE_RES LDKCResult_NonePeerHandleErrorZ PeerManager_write_buffer_space_avail(const LDKPeerManager *this_arg, LDKSocketDescriptor *descriptor);
+       // MUST_USE_RES LDKCResult_NonePeerHandleErrorZ PeerManager_write_buffer_space_avail(const LDKPeerManager *this_arg, LDKSocketDescriptor *descriptor);
        public static native long PeerManager_write_buffer_space_avail(long this_arg, long descriptor);
-       /// MUST_USE_RES LDKCResult_boolPeerHandleErrorZ PeerManager_read_event(const LDKPeerManager *this_arg, LDKSocketDescriptor *peer_descriptor, LDKu8slice data);
+       // MUST_USE_RES LDKCResult_boolPeerHandleErrorZ PeerManager_read_event(const LDKPeerManager *this_arg, LDKSocketDescriptor *peer_descriptor, LDKu8slice data);
        public static native long PeerManager_read_event(long this_arg, long peer_descriptor, long data);
-       /// void PeerManager_process_events(const LDKPeerManager *this_arg);
+       // void PeerManager_process_events(const LDKPeerManager *this_arg);
        public static native void PeerManager_process_events(long this_arg);
-       /// void PeerManager_socket_disconnected(const LDKPeerManager *this_arg, const LDKSocketDescriptor *descriptor);
+       // void PeerManager_socket_disconnected(const LDKPeerManager *this_arg, const LDKSocketDescriptor *descriptor);
        public static native void PeerManager_socket_disconnected(long this_arg, long descriptor);
-       /// void PeerManager_timer_tick_occured(const LDKPeerManager *this_arg);
+       // void PeerManager_timer_tick_occured(const LDKPeerManager *this_arg);
        public static native void PeerManager_timer_tick_occured(long this_arg);
-       /// LDKThirtyTwoBytes build_commitment_secret(const uint8_t (*commitment_seed)[32], uint64_t idx);
+       // LDKThirtyTwoBytes build_commitment_secret(const uint8_t (*commitment_seed)[32], uint64_t idx);
        public static native long build_commitment_secret(byte[] commitment_seed, long idx);
-       /// LDKCResult_SecretKeySecpErrorZ derive_private_key(LDKPublicKey per_commitment_point, const uint8_t (*base_secret)[32]);
+       // LDKCResult_SecretKeySecpErrorZ derive_private_key(LDKPublicKey per_commitment_point, const uint8_t (*base_secret)[32]);
        public static native long derive_private_key(long per_commitment_point, byte[] base_secret);
-       /// LDKCResult_PublicKeySecpErrorZ derive_public_key(LDKPublicKey per_commitment_point, LDKPublicKey base_point);
+       // LDKCResult_PublicKeySecpErrorZ derive_public_key(LDKPublicKey per_commitment_point, LDKPublicKey base_point);
        public static native long derive_public_key(long per_commitment_point, long base_point);
-       /// LDKCResult_SecretKeySecpErrorZ derive_private_revocation_key(const uint8_t (*per_commitment_secret)[32], const uint8_t (*countersignatory_revocation_base_secret)[32]);
+       // LDKCResult_SecretKeySecpErrorZ derive_private_revocation_key(const uint8_t (*per_commitment_secret)[32], const uint8_t (*countersignatory_revocation_base_secret)[32]);
        public static native long derive_private_revocation_key(byte[] per_commitment_secret, byte[] countersignatory_revocation_base_secret);
-       /// LDKCResult_PublicKeySecpErrorZ derive_public_revocation_key(LDKPublicKey per_commitment_point, LDKPublicKey countersignatory_revocation_base_point);
+       // LDKCResult_PublicKeySecpErrorZ derive_public_revocation_key(LDKPublicKey per_commitment_point, LDKPublicKey countersignatory_revocation_base_point);
        public static native long derive_public_revocation_key(long per_commitment_point, long countersignatory_revocation_base_point);
-       /// void TxCreationKeys_free(LDKTxCreationKeys this_ptr);
+       // void TxCreationKeys_free(LDKTxCreationKeys this_ptr);
        public static native void TxCreationKeys_free(long this_ptr);
-       /// LDKPublicKey TxCreationKeys_get_per_commitment_point(const LDKTxCreationKeys *this_ptr);
+       // LDKPublicKey TxCreationKeys_get_per_commitment_point(const LDKTxCreationKeys *this_ptr);
        public static native long TxCreationKeys_get_per_commitment_point(long this_ptr);
-       /// void TxCreationKeys_set_per_commitment_point(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
+       // void TxCreationKeys_set_per_commitment_point(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
        public static native void TxCreationKeys_set_per_commitment_point(long this_ptr, long val);
-       /// LDKPublicKey TxCreationKeys_get_revocation_key(const LDKTxCreationKeys *this_ptr);
+       // LDKPublicKey TxCreationKeys_get_revocation_key(const LDKTxCreationKeys *this_ptr);
        public static native long TxCreationKeys_get_revocation_key(long this_ptr);
-       /// void TxCreationKeys_set_revocation_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
+       // void TxCreationKeys_set_revocation_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
        public static native void TxCreationKeys_set_revocation_key(long this_ptr, long val);
-       /// LDKPublicKey TxCreationKeys_get_broadcaster_htlc_key(const LDKTxCreationKeys *this_ptr);
+       // LDKPublicKey TxCreationKeys_get_broadcaster_htlc_key(const LDKTxCreationKeys *this_ptr);
        public static native long TxCreationKeys_get_broadcaster_htlc_key(long this_ptr);
-       /// void TxCreationKeys_set_broadcaster_htlc_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
+       // void TxCreationKeys_set_broadcaster_htlc_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
        public static native void TxCreationKeys_set_broadcaster_htlc_key(long this_ptr, long val);
-       /// LDKPublicKey TxCreationKeys_get_countersignatory_htlc_key(const LDKTxCreationKeys *this_ptr);
+       // LDKPublicKey TxCreationKeys_get_countersignatory_htlc_key(const LDKTxCreationKeys *this_ptr);
        public static native long TxCreationKeys_get_countersignatory_htlc_key(long this_ptr);
-       /// void TxCreationKeys_set_countersignatory_htlc_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
+       // void TxCreationKeys_set_countersignatory_htlc_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
        public static native void TxCreationKeys_set_countersignatory_htlc_key(long this_ptr, long val);
-       /// LDKPublicKey TxCreationKeys_get_broadcaster_delayed_payment_key(const LDKTxCreationKeys *this_ptr);
+       // LDKPublicKey TxCreationKeys_get_broadcaster_delayed_payment_key(const LDKTxCreationKeys *this_ptr);
        public static native long TxCreationKeys_get_broadcaster_delayed_payment_key(long this_ptr);
-       /// void TxCreationKeys_set_broadcaster_delayed_payment_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
+       // void TxCreationKeys_set_broadcaster_delayed_payment_key(LDKTxCreationKeys *this_ptr, LDKPublicKey val);
        public static native void TxCreationKeys_set_broadcaster_delayed_payment_key(long this_ptr, long val);
-       /// MUST_USE_RES LDKTxCreationKeys TxCreationKeys_new(LDKPublicKey per_commitment_point_arg, LDKPublicKey revocation_key_arg, LDKPublicKey broadcaster_htlc_key_arg, LDKPublicKey countersignatory_htlc_key_arg, LDKPublicKey broadcaster_delayed_payment_key_arg);
+       // MUST_USE_RES LDKTxCreationKeys TxCreationKeys_new(LDKPublicKey per_commitment_point_arg, LDKPublicKey revocation_key_arg, LDKPublicKey broadcaster_htlc_key_arg, LDKPublicKey countersignatory_htlc_key_arg, LDKPublicKey broadcaster_delayed_payment_key_arg);
        public static native long TxCreationKeys_new(long per_commitment_point_arg, long revocation_key_arg, long broadcaster_htlc_key_arg, long countersignatory_htlc_key_arg, long broadcaster_delayed_payment_key_arg);
-       /// LDKCVec_u8Z TxCreationKeys_write(const LDKTxCreationKeys *obj);
+       // LDKCVec_u8Z TxCreationKeys_write(const LDKTxCreationKeys *obj);
        public static native long TxCreationKeys_write(long obj);
-       /// LDKTxCreationKeys TxCreationKeys_read(LDKu8slice ser);
+       // LDKTxCreationKeys TxCreationKeys_read(LDKu8slice ser);
        public static native long TxCreationKeys_read(long ser);
-       /// void PreCalculatedTxCreationKeys_free(LDKPreCalculatedTxCreationKeys this_ptr);
+       // void PreCalculatedTxCreationKeys_free(LDKPreCalculatedTxCreationKeys this_ptr);
        public static native void PreCalculatedTxCreationKeys_free(long this_ptr);
-       /// MUST_USE_RES LDKPreCalculatedTxCreationKeys PreCalculatedTxCreationKeys_new(LDKTxCreationKeys keys);
+       // MUST_USE_RES LDKPreCalculatedTxCreationKeys PreCalculatedTxCreationKeys_new(LDKTxCreationKeys keys);
        public static native long PreCalculatedTxCreationKeys_new(long keys);
-       /// MUST_USE_RES LDKTxCreationKeys PreCalculatedTxCreationKeys_trust_key_derivation(const LDKPreCalculatedTxCreationKeys *this_arg);
+       // MUST_USE_RES LDKTxCreationKeys PreCalculatedTxCreationKeys_trust_key_derivation(const LDKPreCalculatedTxCreationKeys *this_arg);
        public static native long PreCalculatedTxCreationKeys_trust_key_derivation(long this_arg);
-       /// MUST_USE_RES LDKPublicKey PreCalculatedTxCreationKeys_per_commitment_point(const LDKPreCalculatedTxCreationKeys *this_arg);
+       // MUST_USE_RES LDKPublicKey PreCalculatedTxCreationKeys_per_commitment_point(const LDKPreCalculatedTxCreationKeys *this_arg);
        public static native long PreCalculatedTxCreationKeys_per_commitment_point(long this_arg);
-       /// void ChannelPublicKeys_free(LDKChannelPublicKeys this_ptr);
+       // void ChannelPublicKeys_free(LDKChannelPublicKeys this_ptr);
        public static native void ChannelPublicKeys_free(long this_ptr);
-       /// LDKPublicKey ChannelPublicKeys_get_funding_pubkey(const LDKChannelPublicKeys *this_ptr);
+       // LDKPublicKey ChannelPublicKeys_get_funding_pubkey(const LDKChannelPublicKeys *this_ptr);
        public static native long ChannelPublicKeys_get_funding_pubkey(long this_ptr);
-       /// void ChannelPublicKeys_set_funding_pubkey(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
+       // void ChannelPublicKeys_set_funding_pubkey(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
        public static native void ChannelPublicKeys_set_funding_pubkey(long this_ptr, long val);
-       /// LDKPublicKey ChannelPublicKeys_get_revocation_basepoint(const LDKChannelPublicKeys *this_ptr);
+       // LDKPublicKey ChannelPublicKeys_get_revocation_basepoint(const LDKChannelPublicKeys *this_ptr);
        public static native long ChannelPublicKeys_get_revocation_basepoint(long this_ptr);
-       /// void ChannelPublicKeys_set_revocation_basepoint(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
+       // void ChannelPublicKeys_set_revocation_basepoint(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
        public static native void ChannelPublicKeys_set_revocation_basepoint(long this_ptr, long val);
-       /// LDKPublicKey ChannelPublicKeys_get_payment_point(const LDKChannelPublicKeys *this_ptr);
+       // LDKPublicKey ChannelPublicKeys_get_payment_point(const LDKChannelPublicKeys *this_ptr);
        public static native long ChannelPublicKeys_get_payment_point(long this_ptr);
-       /// void ChannelPublicKeys_set_payment_point(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
+       // void ChannelPublicKeys_set_payment_point(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
        public static native void ChannelPublicKeys_set_payment_point(long this_ptr, long val);
-       /// LDKPublicKey ChannelPublicKeys_get_delayed_payment_basepoint(const LDKChannelPublicKeys *this_ptr);
+       // LDKPublicKey ChannelPublicKeys_get_delayed_payment_basepoint(const LDKChannelPublicKeys *this_ptr);
        public static native long ChannelPublicKeys_get_delayed_payment_basepoint(long this_ptr);
-       /// void ChannelPublicKeys_set_delayed_payment_basepoint(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
+       // void ChannelPublicKeys_set_delayed_payment_basepoint(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
        public static native void ChannelPublicKeys_set_delayed_payment_basepoint(long this_ptr, long val);
-       /// LDKPublicKey ChannelPublicKeys_get_htlc_basepoint(const LDKChannelPublicKeys *this_ptr);
+       // LDKPublicKey ChannelPublicKeys_get_htlc_basepoint(const LDKChannelPublicKeys *this_ptr);
        public static native long ChannelPublicKeys_get_htlc_basepoint(long this_ptr);
-       /// void ChannelPublicKeys_set_htlc_basepoint(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
+       // void ChannelPublicKeys_set_htlc_basepoint(LDKChannelPublicKeys *this_ptr, LDKPublicKey val);
        public static native void ChannelPublicKeys_set_htlc_basepoint(long this_ptr, long val);
-       /// MUST_USE_RES LDKChannelPublicKeys ChannelPublicKeys_new(LDKPublicKey funding_pubkey_arg, LDKPublicKey revocation_basepoint_arg, LDKPublicKey payment_point_arg, LDKPublicKey delayed_payment_basepoint_arg, LDKPublicKey htlc_basepoint_arg);
+       // MUST_USE_RES LDKChannelPublicKeys ChannelPublicKeys_new(LDKPublicKey funding_pubkey_arg, LDKPublicKey revocation_basepoint_arg, LDKPublicKey payment_point_arg, LDKPublicKey delayed_payment_basepoint_arg, LDKPublicKey htlc_basepoint_arg);
        public static native long ChannelPublicKeys_new(long funding_pubkey_arg, long revocation_basepoint_arg, long payment_point_arg, long delayed_payment_basepoint_arg, long htlc_basepoint_arg);
-       /// LDKCVec_u8Z ChannelPublicKeys_write(const LDKChannelPublicKeys *obj);
+       // LDKCVec_u8Z ChannelPublicKeys_write(const LDKChannelPublicKeys *obj);
        public static native long ChannelPublicKeys_write(long obj);
-       /// LDKChannelPublicKeys ChannelPublicKeys_read(LDKu8slice ser);
+       // LDKChannelPublicKeys ChannelPublicKeys_read(LDKu8slice ser);
        public static native long ChannelPublicKeys_read(long ser);
-       /// MUST_USE_RES LDKCResult_TxCreationKeysSecpErrorZ TxCreationKeys_derive_new(LDKPublicKey per_commitment_point, LDKPublicKey broadcaster_delayed_payment_base, LDKPublicKey broadcaster_htlc_base, LDKPublicKey countersignatory_revocation_base, LDKPublicKey countersignatory_htlc_base);
+       // MUST_USE_RES LDKCResult_TxCreationKeysSecpErrorZ TxCreationKeys_derive_new(LDKPublicKey per_commitment_point, LDKPublicKey broadcaster_delayed_payment_base, LDKPublicKey broadcaster_htlc_base, LDKPublicKey countersignatory_revocation_base, LDKPublicKey countersignatory_htlc_base);
        public static native long TxCreationKeys_derive_new(long per_commitment_point, long broadcaster_delayed_payment_base, long broadcaster_htlc_base, long countersignatory_revocation_base, long countersignatory_htlc_base);
-       /// LDKCVec_u8Z get_revokeable_redeemscript(LDKPublicKey revocation_key, uint16_t contest_delay, LDKPublicKey broadcaster_delayed_payment_key);
+       // LDKCVec_u8Z get_revokeable_redeemscript(LDKPublicKey revocation_key, uint16_t contest_delay, LDKPublicKey broadcaster_delayed_payment_key);
        public static native long get_revokeable_redeemscript(long revocation_key, short contest_delay, long broadcaster_delayed_payment_key);
-       /// void HTLCOutputInCommitment_free(LDKHTLCOutputInCommitment this_ptr);
+       // void HTLCOutputInCommitment_free(LDKHTLCOutputInCommitment this_ptr);
        public static native void HTLCOutputInCommitment_free(long this_ptr);
-       /// bool HTLCOutputInCommitment_get_offered(const LDKHTLCOutputInCommitment *this_ptr);
+       // bool HTLCOutputInCommitment_get_offered(const LDKHTLCOutputInCommitment *this_ptr);
        public static native boolean HTLCOutputInCommitment_get_offered(long this_ptr);
-       /// void HTLCOutputInCommitment_set_offered(LDKHTLCOutputInCommitment *this_ptr, bool val);
+       // void HTLCOutputInCommitment_set_offered(LDKHTLCOutputInCommitment *this_ptr, bool val);
        public static native void HTLCOutputInCommitment_set_offered(long this_ptr, boolean val);
-       /// uint64_t HTLCOutputInCommitment_get_amount_msat(const LDKHTLCOutputInCommitment *this_ptr);
+       // uint64_t HTLCOutputInCommitment_get_amount_msat(const LDKHTLCOutputInCommitment *this_ptr);
        public static native long HTLCOutputInCommitment_get_amount_msat(long this_ptr);
-       /// void HTLCOutputInCommitment_set_amount_msat(LDKHTLCOutputInCommitment *this_ptr, uint64_t val);
+       // void HTLCOutputInCommitment_set_amount_msat(LDKHTLCOutputInCommitment *this_ptr, uint64_t val);
        public static native void HTLCOutputInCommitment_set_amount_msat(long this_ptr, long val);
-       /// uint32_t HTLCOutputInCommitment_get_cltv_expiry(const LDKHTLCOutputInCommitment *this_ptr);
+       // uint32_t HTLCOutputInCommitment_get_cltv_expiry(const LDKHTLCOutputInCommitment *this_ptr);
        public static native int HTLCOutputInCommitment_get_cltv_expiry(long this_ptr);
-       /// void HTLCOutputInCommitment_set_cltv_expiry(LDKHTLCOutputInCommitment *this_ptr, uint32_t val);
+       // void HTLCOutputInCommitment_set_cltv_expiry(LDKHTLCOutputInCommitment *this_ptr, uint32_t val);
        public static native void HTLCOutputInCommitment_set_cltv_expiry(long this_ptr, int val);
-       /// const uint8_t (*HTLCOutputInCommitment_get_payment_hash(const LDKHTLCOutputInCommitment *this_ptr))[32];
+       // const uint8_t (*HTLCOutputInCommitment_get_payment_hash(const LDKHTLCOutputInCommitment *this_ptr))[32];
        public static native byte[] HTLCOutputInCommitment_get_payment_hash(long this_ptr);
-       /// void HTLCOutputInCommitment_set_payment_hash(LDKHTLCOutputInCommitment *this_ptr, LDKThirtyTwoBytes val);
+       // void HTLCOutputInCommitment_set_payment_hash(LDKHTLCOutputInCommitment *this_ptr, LDKThirtyTwoBytes val);
        public static native void HTLCOutputInCommitment_set_payment_hash(long this_ptr, long val);
-       /// LDKCVec_u8Z HTLCOutputInCommitment_write(const LDKHTLCOutputInCommitment *obj);
+       // LDKCVec_u8Z HTLCOutputInCommitment_write(const LDKHTLCOutputInCommitment *obj);
        public static native long HTLCOutputInCommitment_write(long obj);
-       /// LDKHTLCOutputInCommitment HTLCOutputInCommitment_read(LDKu8slice ser);
+       // LDKHTLCOutputInCommitment HTLCOutputInCommitment_read(LDKu8slice ser);
        public static native long HTLCOutputInCommitment_read(long ser);
-       /// LDKCVec_u8Z get_htlc_redeemscript(const LDKHTLCOutputInCommitment *htlc, const LDKTxCreationKeys *keys);
+       // LDKCVec_u8Z get_htlc_redeemscript(const LDKHTLCOutputInCommitment *htlc, const LDKTxCreationKeys *keys);
        public static native long get_htlc_redeemscript(long htlc, long keys);
-       /// LDKCVec_u8Z make_funding_redeemscript(LDKPublicKey broadcaster, LDKPublicKey countersignatory);
+       // LDKCVec_u8Z make_funding_redeemscript(LDKPublicKey broadcaster, LDKPublicKey countersignatory);
        public static native long make_funding_redeemscript(long broadcaster, long countersignatory);
-       /// LDKTransaction build_htlc_transaction(const uint8_t (*prev_hash)[32], uint32_t feerate_per_kw, uint16_t contest_delay, const LDKHTLCOutputInCommitment *htlc, LDKPublicKey broadcaster_delayed_payment_key, LDKPublicKey revocation_key);
+       // LDKTransaction build_htlc_transaction(const uint8_t (*prev_hash)[32], uint32_t feerate_per_kw, uint16_t contest_delay, const LDKHTLCOutputInCommitment *htlc, LDKPublicKey broadcaster_delayed_payment_key, LDKPublicKey revocation_key);
        public static native long build_htlc_transaction(byte[] prev_hash, int feerate_per_kw, short contest_delay, long htlc, long broadcaster_delayed_payment_key, long revocation_key);
-       /// void HolderCommitmentTransaction_free(LDKHolderCommitmentTransaction this_ptr);
+       // void HolderCommitmentTransaction_free(LDKHolderCommitmentTransaction this_ptr);
        public static native void HolderCommitmentTransaction_free(long this_ptr);
-       /// LDKTransaction HolderCommitmentTransaction_get_unsigned_tx(const LDKHolderCommitmentTransaction *this_ptr);
+       // LDKTransaction HolderCommitmentTransaction_get_unsigned_tx(const LDKHolderCommitmentTransaction *this_ptr);
        public static native long HolderCommitmentTransaction_get_unsigned_tx(long this_ptr);
-       /// void HolderCommitmentTransaction_set_unsigned_tx(LDKHolderCommitmentTransaction *this_ptr, LDKTransaction val);
+       // void HolderCommitmentTransaction_set_unsigned_tx(LDKHolderCommitmentTransaction *this_ptr, LDKTransaction val);
        public static native void HolderCommitmentTransaction_set_unsigned_tx(long this_ptr, long val);
-       /// LDKSignature HolderCommitmentTransaction_get_counterparty_sig(const LDKHolderCommitmentTransaction *this_ptr);
+       // LDKSignature HolderCommitmentTransaction_get_counterparty_sig(const LDKHolderCommitmentTransaction *this_ptr);
        public static native long HolderCommitmentTransaction_get_counterparty_sig(long this_ptr);
-       /// void HolderCommitmentTransaction_set_counterparty_sig(LDKHolderCommitmentTransaction *this_ptr, LDKSignature val);
+       // void HolderCommitmentTransaction_set_counterparty_sig(LDKHolderCommitmentTransaction *this_ptr, LDKSignature val);
        public static native void HolderCommitmentTransaction_set_counterparty_sig(long this_ptr, long val);
-       /// uint32_t HolderCommitmentTransaction_get_feerate_per_kw(const LDKHolderCommitmentTransaction *this_ptr);
+       // uint32_t HolderCommitmentTransaction_get_feerate_per_kw(const LDKHolderCommitmentTransaction *this_ptr);
        public static native int HolderCommitmentTransaction_get_feerate_per_kw(long this_ptr);
-       /// void HolderCommitmentTransaction_set_feerate_per_kw(LDKHolderCommitmentTransaction *this_ptr, uint32_t val);
+       // void HolderCommitmentTransaction_set_feerate_per_kw(LDKHolderCommitmentTransaction *this_ptr, uint32_t val);
        public static native void HolderCommitmentTransaction_set_feerate_per_kw(long this_ptr, int val);
-       /// void HolderCommitmentTransaction_set_per_htlc(LDKHolderCommitmentTransaction *this_ptr, LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ val);
+       // void HolderCommitmentTransaction_set_per_htlc(LDKHolderCommitmentTransaction *this_ptr, LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ val);
        public static native void HolderCommitmentTransaction_set_per_htlc(long this_ptr, long val);
-       /// MUST_USE_RES LDKHolderCommitmentTransaction HolderCommitmentTransaction_new_missing_holder_sig(LDKTransaction unsigned_tx, LDKSignature counterparty_sig, LDKPublicKey holder_funding_key, LDKPublicKey counterparty_funding_key, LDKTxCreationKeys keys, uint32_t feerate_per_kw, LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ htlc_data);
+       // MUST_USE_RES LDKHolderCommitmentTransaction HolderCommitmentTransaction_new_missing_holder_sig(LDKTransaction unsigned_tx, LDKSignature counterparty_sig, LDKPublicKey holder_funding_key, LDKPublicKey counterparty_funding_key, LDKTxCreationKeys keys, uint32_t feerate_per_kw, LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ htlc_data);
        public static native long HolderCommitmentTransaction_new_missing_holder_sig(long unsigned_tx, long counterparty_sig, long holder_funding_key, long counterparty_funding_key, long keys, int feerate_per_kw, long htlc_data);
-       /// MUST_USE_RES LDKTxCreationKeys HolderCommitmentTransaction_trust_key_derivation(const LDKHolderCommitmentTransaction *this_arg);
+       // MUST_USE_RES LDKTxCreationKeys HolderCommitmentTransaction_trust_key_derivation(const LDKHolderCommitmentTransaction *this_arg);
        public static native long HolderCommitmentTransaction_trust_key_derivation(long this_arg);
-       /// MUST_USE_RES LDKThirtyTwoBytes HolderCommitmentTransaction_txid(const LDKHolderCommitmentTransaction *this_arg);
+       // MUST_USE_RES LDKThirtyTwoBytes HolderCommitmentTransaction_txid(const LDKHolderCommitmentTransaction *this_arg);
        public static native long HolderCommitmentTransaction_txid(long this_arg);
-       /// MUST_USE_RES LDKSignature HolderCommitmentTransaction_get_holder_sig(const LDKHolderCommitmentTransaction *this_arg, const uint8_t (*funding_key)[32], LDKu8slice funding_redeemscript, uint64_t channel_value_satoshis);
+       // MUST_USE_RES LDKSignature HolderCommitmentTransaction_get_holder_sig(const LDKHolderCommitmentTransaction *this_arg, const uint8_t (*funding_key)[32], LDKu8slice funding_redeemscript, uint64_t channel_value_satoshis);
        public static native long HolderCommitmentTransaction_get_holder_sig(long this_arg, byte[] funding_key, long funding_redeemscript, long channel_value_satoshis);
-       /// MUST_USE_RES LDKCResult_CVec_SignatureZNoneZ HolderCommitmentTransaction_get_htlc_sigs(const LDKHolderCommitmentTransaction *this_arg, const uint8_t (*htlc_base_key)[32], uint16_t counterparty_selected_contest_delay);
+       // MUST_USE_RES LDKCResult_CVec_SignatureZNoneZ HolderCommitmentTransaction_get_htlc_sigs(const LDKHolderCommitmentTransaction *this_arg, const uint8_t (*htlc_base_key)[32], uint16_t counterparty_selected_contest_delay);
        public static native long HolderCommitmentTransaction_get_htlc_sigs(long this_arg, byte[] htlc_base_key, short counterparty_selected_contest_delay);
-       /// LDKCVec_u8Z HolderCommitmentTransaction_write(const LDKHolderCommitmentTransaction *obj);
+       // LDKCVec_u8Z HolderCommitmentTransaction_write(const LDKHolderCommitmentTransaction *obj);
        public static native long HolderCommitmentTransaction_write(long obj);
-       /// LDKHolderCommitmentTransaction HolderCommitmentTransaction_read(LDKu8slice ser);
+       // LDKHolderCommitmentTransaction HolderCommitmentTransaction_read(LDKu8slice ser);
        public static native long HolderCommitmentTransaction_read(long ser);
-       /// void InitFeatures_free(LDKInitFeatures this_ptr);
+       // void InitFeatures_free(LDKInitFeatures this_ptr);
        public static native void InitFeatures_free(long this_ptr);
-       /// void NodeFeatures_free(LDKNodeFeatures this_ptr);
+       // void NodeFeatures_free(LDKNodeFeatures this_ptr);
        public static native void NodeFeatures_free(long this_ptr);
-       /// void ChannelFeatures_free(LDKChannelFeatures this_ptr);
+       // void ChannelFeatures_free(LDKChannelFeatures this_ptr);
        public static native void ChannelFeatures_free(long this_ptr);
-       /// void RouteHop_free(LDKRouteHop this_ptr);
+       // void RouteHop_free(LDKRouteHop this_ptr);
        public static native void RouteHop_free(long this_ptr);
-       /// LDKPublicKey RouteHop_get_pubkey(const LDKRouteHop *this_ptr);
+       // LDKPublicKey RouteHop_get_pubkey(const LDKRouteHop *this_ptr);
        public static native long RouteHop_get_pubkey(long this_ptr);
-       /// void RouteHop_set_pubkey(LDKRouteHop *this_ptr, LDKPublicKey val);
+       // void RouteHop_set_pubkey(LDKRouteHop *this_ptr, LDKPublicKey val);
        public static native void RouteHop_set_pubkey(long this_ptr, long val);
-       /// LDKNodeFeatures RouteHop_get_node_features(const LDKRouteHop *this_ptr);
+       // LDKNodeFeatures RouteHop_get_node_features(const LDKRouteHop *this_ptr);
        public static native long RouteHop_get_node_features(long this_ptr);
-       /// void RouteHop_set_node_features(LDKRouteHop *this_ptr, LDKNodeFeatures val);
+       // void RouteHop_set_node_features(LDKRouteHop *this_ptr, LDKNodeFeatures val);
        public static native void RouteHop_set_node_features(long this_ptr, long val);
-       /// uint64_t RouteHop_get_short_channel_id(const LDKRouteHop *this_ptr);
+       // uint64_t RouteHop_get_short_channel_id(const LDKRouteHop *this_ptr);
        public static native long RouteHop_get_short_channel_id(long this_ptr);
-       /// void RouteHop_set_short_channel_id(LDKRouteHop *this_ptr, uint64_t val);
+       // void RouteHop_set_short_channel_id(LDKRouteHop *this_ptr, uint64_t val);
        public static native void RouteHop_set_short_channel_id(long this_ptr, long val);
-       /// LDKChannelFeatures RouteHop_get_channel_features(const LDKRouteHop *this_ptr);
+       // LDKChannelFeatures RouteHop_get_channel_features(const LDKRouteHop *this_ptr);
        public static native long RouteHop_get_channel_features(long this_ptr);
-       /// void RouteHop_set_channel_features(LDKRouteHop *this_ptr, LDKChannelFeatures val);
+       // void RouteHop_set_channel_features(LDKRouteHop *this_ptr, LDKChannelFeatures val);
        public static native void RouteHop_set_channel_features(long this_ptr, long val);
-       /// uint64_t RouteHop_get_fee_msat(const LDKRouteHop *this_ptr);
+       // uint64_t RouteHop_get_fee_msat(const LDKRouteHop *this_ptr);
        public static native long RouteHop_get_fee_msat(long this_ptr);
-       /// void RouteHop_set_fee_msat(LDKRouteHop *this_ptr, uint64_t val);
+       // void RouteHop_set_fee_msat(LDKRouteHop *this_ptr, uint64_t val);
        public static native void RouteHop_set_fee_msat(long this_ptr, long val);
-       /// uint32_t RouteHop_get_cltv_expiry_delta(const LDKRouteHop *this_ptr);
+       // uint32_t RouteHop_get_cltv_expiry_delta(const LDKRouteHop *this_ptr);
        public static native int RouteHop_get_cltv_expiry_delta(long this_ptr);
-       /// void RouteHop_set_cltv_expiry_delta(LDKRouteHop *this_ptr, uint32_t val);
+       // void RouteHop_set_cltv_expiry_delta(LDKRouteHop *this_ptr, uint32_t val);
        public static native void RouteHop_set_cltv_expiry_delta(long this_ptr, int val);
-       /// MUST_USE_RES LDKRouteHop RouteHop_new(LDKPublicKey pubkey_arg, LDKNodeFeatures node_features_arg, uint64_t short_channel_id_arg, LDKChannelFeatures channel_features_arg, uint64_t fee_msat_arg, uint32_t cltv_expiry_delta_arg);
+       // MUST_USE_RES LDKRouteHop RouteHop_new(LDKPublicKey pubkey_arg, LDKNodeFeatures node_features_arg, uint64_t short_channel_id_arg, LDKChannelFeatures channel_features_arg, uint64_t fee_msat_arg, uint32_t cltv_expiry_delta_arg);
        public static native long RouteHop_new(long pubkey_arg, long node_features_arg, long short_channel_id_arg, long channel_features_arg, long fee_msat_arg, int cltv_expiry_delta_arg);
-       /// void Route_free(LDKRoute this_ptr);
+       // void Route_free(LDKRoute this_ptr);
        public static native void Route_free(long this_ptr);
-       /// void Route_set_paths(LDKRoute *this_ptr, LDKCVec_CVec_RouteHopZZ val);
+       // void Route_set_paths(LDKRoute *this_ptr, LDKCVec_CVec_RouteHopZZ val);
        public static native void Route_set_paths(long this_ptr, long val);
-       /// MUST_USE_RES LDKRoute Route_new(LDKCVec_CVec_RouteHopZZ paths_arg);
+       // MUST_USE_RES LDKRoute Route_new(LDKCVec_CVec_RouteHopZZ paths_arg);
        public static native long Route_new(long paths_arg);
-       /// LDKCVec_u8Z Route_write(const LDKRoute *obj);
+       // LDKCVec_u8Z Route_write(const LDKRoute *obj);
        public static native long Route_write(long obj);
-       /// LDKRoute Route_read(LDKu8slice ser);
+       // LDKRoute Route_read(LDKu8slice ser);
        public static native long Route_read(long ser);
-       /// void RouteHint_free(LDKRouteHint this_ptr);
+       // void RouteHint_free(LDKRouteHint this_ptr);
        public static native void RouteHint_free(long this_ptr);
-       /// LDKPublicKey RouteHint_get_src_node_id(const LDKRouteHint *this_ptr);
+       // LDKPublicKey RouteHint_get_src_node_id(const LDKRouteHint *this_ptr);
        public static native long RouteHint_get_src_node_id(long this_ptr);
-       /// void RouteHint_set_src_node_id(LDKRouteHint *this_ptr, LDKPublicKey val);
+       // void RouteHint_set_src_node_id(LDKRouteHint *this_ptr, LDKPublicKey val);
        public static native void RouteHint_set_src_node_id(long this_ptr, long val);
-       /// uint64_t RouteHint_get_short_channel_id(const LDKRouteHint *this_ptr);
+       // uint64_t RouteHint_get_short_channel_id(const LDKRouteHint *this_ptr);
        public static native long RouteHint_get_short_channel_id(long this_ptr);
-       /// void RouteHint_set_short_channel_id(LDKRouteHint *this_ptr, uint64_t val);
+       // void RouteHint_set_short_channel_id(LDKRouteHint *this_ptr, uint64_t val);
        public static native void RouteHint_set_short_channel_id(long this_ptr, long val);
-       /// LDKRoutingFees RouteHint_get_fees(const LDKRouteHint *this_ptr);
+       // LDKRoutingFees RouteHint_get_fees(const LDKRouteHint *this_ptr);
        public static native long RouteHint_get_fees(long this_ptr);
-       /// void RouteHint_set_fees(LDKRouteHint *this_ptr, LDKRoutingFees val);
+       // void RouteHint_set_fees(LDKRouteHint *this_ptr, LDKRoutingFees val);
        public static native void RouteHint_set_fees(long this_ptr, long val);
-       /// uint16_t RouteHint_get_cltv_expiry_delta(const LDKRouteHint *this_ptr);
+       // uint16_t RouteHint_get_cltv_expiry_delta(const LDKRouteHint *this_ptr);
        public static native short RouteHint_get_cltv_expiry_delta(long this_ptr);
-       /// void RouteHint_set_cltv_expiry_delta(LDKRouteHint *this_ptr, uint16_t val);
+       // void RouteHint_set_cltv_expiry_delta(LDKRouteHint *this_ptr, uint16_t val);
        public static native void RouteHint_set_cltv_expiry_delta(long this_ptr, short val);
-       /// uint64_t RouteHint_get_htlc_minimum_msat(const LDKRouteHint *this_ptr);
+       // uint64_t RouteHint_get_htlc_minimum_msat(const LDKRouteHint *this_ptr);
        public static native long RouteHint_get_htlc_minimum_msat(long this_ptr);
-       /// void RouteHint_set_htlc_minimum_msat(LDKRouteHint *this_ptr, uint64_t val);
+       // void RouteHint_set_htlc_minimum_msat(LDKRouteHint *this_ptr, uint64_t val);
        public static native void RouteHint_set_htlc_minimum_msat(long this_ptr, long val);
-       /// MUST_USE_RES LDKRouteHint RouteHint_new(LDKPublicKey src_node_id_arg, uint64_t short_channel_id_arg, LDKRoutingFees fees_arg, uint16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg);
+       // MUST_USE_RES LDKRouteHint RouteHint_new(LDKPublicKey src_node_id_arg, uint64_t short_channel_id_arg, LDKRoutingFees fees_arg, uint16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg);
        public static native long RouteHint_new(long src_node_id_arg, long short_channel_id_arg, long fees_arg, short cltv_expiry_delta_arg, long htlc_minimum_msat_arg);
-       /// LDKCResult_RouteLightningErrorZ get_route(LDKPublicKey our_node_id, const LDKNetworkGraph *network, LDKPublicKey target, LDKCVec_ChannelDetailsZ *first_hops, LDKCVec_RouteHintZ last_hops, uint64_t final_value_msat, uint32_t final_cltv, LDKLogger logger);
+       // LDKCResult_RouteLightningErrorZ get_route(LDKPublicKey our_node_id, const LDKNetworkGraph *network, LDKPublicKey target, LDKCVec_ChannelDetailsZ *first_hops, LDKCVec_RouteHintZ last_hops, uint64_t final_value_msat, uint32_t final_cltv, LDKLogger logger);
        public static native long get_route(long our_node_id, long network, long target, long first_hops, long last_hops, long final_value_msat, int final_cltv, long logger);
-       /// void NetworkGraph_free(LDKNetworkGraph this_ptr);
+       // void NetworkGraph_free(LDKNetworkGraph this_ptr);
        public static native void NetworkGraph_free(long this_ptr);
-       /// void LockedNetworkGraph_free(LDKLockedNetworkGraph this_ptr);
+       // void LockedNetworkGraph_free(LDKLockedNetworkGraph this_ptr);
        public static native void LockedNetworkGraph_free(long this_ptr);
-       /// void NetGraphMsgHandler_free(LDKNetGraphMsgHandler this_ptr);
+       // void NetGraphMsgHandler_free(LDKNetGraphMsgHandler this_ptr);
        public static native void NetGraphMsgHandler_free(long this_ptr);
-       /// MUST_USE_RES LDKNetGraphMsgHandler NetGraphMsgHandler_new(LDKAccess *chain_access, LDKLogger logger);
+       // MUST_USE_RES LDKNetGraphMsgHandler NetGraphMsgHandler_new(LDKAccess *chain_access, LDKLogger logger);
        public static native long NetGraphMsgHandler_new(long chain_access, long logger);
-       /// MUST_USE_RES LDKNetGraphMsgHandler NetGraphMsgHandler_from_net_graph(LDKAccess *chain_access, LDKLogger logger, LDKNetworkGraph network_graph);
+       // MUST_USE_RES LDKNetGraphMsgHandler NetGraphMsgHandler_from_net_graph(LDKAccess *chain_access, LDKLogger logger, LDKNetworkGraph network_graph);
        public static native long NetGraphMsgHandler_from_net_graph(long chain_access, long logger, long network_graph);
-       /// MUST_USE_RES LDKLockedNetworkGraph NetGraphMsgHandler_read_locked_graph(const LDKNetGraphMsgHandler *this_arg);
+       // MUST_USE_RES LDKLockedNetworkGraph NetGraphMsgHandler_read_locked_graph(const LDKNetGraphMsgHandler *this_arg);
        public static native long NetGraphMsgHandler_read_locked_graph(long this_arg);
-       /// MUST_USE_RES LDKNetworkGraph LockedNetworkGraph_graph(const LDKLockedNetworkGraph *this_arg);
+       // MUST_USE_RES LDKNetworkGraph LockedNetworkGraph_graph(const LDKLockedNetworkGraph *this_arg);
        public static native long LockedNetworkGraph_graph(long this_arg);
-       /// LDKRoutingMessageHandler NetGraphMsgHandler_as_RoutingMessageHandler(const LDKNetGraphMsgHandler *this_arg);
+       // LDKRoutingMessageHandler NetGraphMsgHandler_as_RoutingMessageHandler(const LDKNetGraphMsgHandler *this_arg);
        public static native long NetGraphMsgHandler_as_RoutingMessageHandler(long this_arg);
-       /// void DirectionalChannelInfo_free(LDKDirectionalChannelInfo this_ptr);
+       // void DirectionalChannelInfo_free(LDKDirectionalChannelInfo this_ptr);
        public static native void DirectionalChannelInfo_free(long this_ptr);
-       /// uint32_t DirectionalChannelInfo_get_last_update(const LDKDirectionalChannelInfo *this_ptr);
+       // uint32_t DirectionalChannelInfo_get_last_update(const LDKDirectionalChannelInfo *this_ptr);
        public static native int DirectionalChannelInfo_get_last_update(long this_ptr);
-       /// void DirectionalChannelInfo_set_last_update(LDKDirectionalChannelInfo *this_ptr, uint32_t val);
+       // void DirectionalChannelInfo_set_last_update(LDKDirectionalChannelInfo *this_ptr, uint32_t val);
        public static native void DirectionalChannelInfo_set_last_update(long this_ptr, int val);
-       /// bool DirectionalChannelInfo_get_enabled(const LDKDirectionalChannelInfo *this_ptr);
+       // bool DirectionalChannelInfo_get_enabled(const LDKDirectionalChannelInfo *this_ptr);
        public static native boolean DirectionalChannelInfo_get_enabled(long this_ptr);
-       /// void DirectionalChannelInfo_set_enabled(LDKDirectionalChannelInfo *this_ptr, bool val);
+       // void DirectionalChannelInfo_set_enabled(LDKDirectionalChannelInfo *this_ptr, bool val);
        public static native void DirectionalChannelInfo_set_enabled(long this_ptr, boolean val);
-       /// uint16_t DirectionalChannelInfo_get_cltv_expiry_delta(const LDKDirectionalChannelInfo *this_ptr);
+       // uint16_t DirectionalChannelInfo_get_cltv_expiry_delta(const LDKDirectionalChannelInfo *this_ptr);
        public static native short DirectionalChannelInfo_get_cltv_expiry_delta(long this_ptr);
-       /// void DirectionalChannelInfo_set_cltv_expiry_delta(LDKDirectionalChannelInfo *this_ptr, uint16_t val);
+       // void DirectionalChannelInfo_set_cltv_expiry_delta(LDKDirectionalChannelInfo *this_ptr, uint16_t val);
        public static native void DirectionalChannelInfo_set_cltv_expiry_delta(long this_ptr, short val);
-       /// uint64_t DirectionalChannelInfo_get_htlc_minimum_msat(const LDKDirectionalChannelInfo *this_ptr);
+       // uint64_t DirectionalChannelInfo_get_htlc_minimum_msat(const LDKDirectionalChannelInfo *this_ptr);
        public static native long DirectionalChannelInfo_get_htlc_minimum_msat(long this_ptr);
-       /// void DirectionalChannelInfo_set_htlc_minimum_msat(LDKDirectionalChannelInfo *this_ptr, uint64_t val);
+       // void DirectionalChannelInfo_set_htlc_minimum_msat(LDKDirectionalChannelInfo *this_ptr, uint64_t val);
        public static native void DirectionalChannelInfo_set_htlc_minimum_msat(long this_ptr, long val);
-       /// LDKChannelUpdate DirectionalChannelInfo_get_last_update_message(const LDKDirectionalChannelInfo *this_ptr);
+       // LDKChannelUpdate DirectionalChannelInfo_get_last_update_message(const LDKDirectionalChannelInfo *this_ptr);
        public static native long DirectionalChannelInfo_get_last_update_message(long this_ptr);
-       /// void DirectionalChannelInfo_set_last_update_message(LDKDirectionalChannelInfo *this_ptr, LDKChannelUpdate val);
+       // void DirectionalChannelInfo_set_last_update_message(LDKDirectionalChannelInfo *this_ptr, LDKChannelUpdate val);
        public static native void DirectionalChannelInfo_set_last_update_message(long this_ptr, long val);
-       /// LDKCVec_u8Z DirectionalChannelInfo_write(const LDKDirectionalChannelInfo *obj);
+       // LDKCVec_u8Z DirectionalChannelInfo_write(const LDKDirectionalChannelInfo *obj);
        public static native long DirectionalChannelInfo_write(long obj);
-       /// LDKDirectionalChannelInfo DirectionalChannelInfo_read(LDKu8slice ser);
+       // LDKDirectionalChannelInfo DirectionalChannelInfo_read(LDKu8slice ser);
        public static native long DirectionalChannelInfo_read(long ser);
-       /// void ChannelInfo_free(LDKChannelInfo this_ptr);
+       // void ChannelInfo_free(LDKChannelInfo this_ptr);
        public static native void ChannelInfo_free(long this_ptr);
-       /// LDKChannelFeatures ChannelInfo_get_features(const LDKChannelInfo *this_ptr);
+       // LDKChannelFeatures ChannelInfo_get_features(const LDKChannelInfo *this_ptr);
        public static native long ChannelInfo_get_features(long this_ptr);
-       /// void ChannelInfo_set_features(LDKChannelInfo *this_ptr, LDKChannelFeatures val);
+       // void ChannelInfo_set_features(LDKChannelInfo *this_ptr, LDKChannelFeatures val);
        public static native void ChannelInfo_set_features(long this_ptr, long val);
-       /// LDKPublicKey ChannelInfo_get_node_one(const LDKChannelInfo *this_ptr);
+       // LDKPublicKey ChannelInfo_get_node_one(const LDKChannelInfo *this_ptr);
        public static native long ChannelInfo_get_node_one(long this_ptr);
-       /// void ChannelInfo_set_node_one(LDKChannelInfo *this_ptr, LDKPublicKey val);
+       // void ChannelInfo_set_node_one(LDKChannelInfo *this_ptr, LDKPublicKey val);
        public static native void ChannelInfo_set_node_one(long this_ptr, long val);
-       /// LDKDirectionalChannelInfo ChannelInfo_get_one_to_two(const LDKChannelInfo *this_ptr);
+       // LDKDirectionalChannelInfo ChannelInfo_get_one_to_two(const LDKChannelInfo *this_ptr);
        public static native long ChannelInfo_get_one_to_two(long this_ptr);
-       /// void ChannelInfo_set_one_to_two(LDKChannelInfo *this_ptr, LDKDirectionalChannelInfo val);
+       // void ChannelInfo_set_one_to_two(LDKChannelInfo *this_ptr, LDKDirectionalChannelInfo val);
        public static native void ChannelInfo_set_one_to_two(long this_ptr, long val);
-       /// LDKPublicKey ChannelInfo_get_node_two(const LDKChannelInfo *this_ptr);
+       // LDKPublicKey ChannelInfo_get_node_two(const LDKChannelInfo *this_ptr);
        public static native long ChannelInfo_get_node_two(long this_ptr);
-       /// void ChannelInfo_set_node_two(LDKChannelInfo *this_ptr, LDKPublicKey val);
+       // void ChannelInfo_set_node_two(LDKChannelInfo *this_ptr, LDKPublicKey val);
        public static native void ChannelInfo_set_node_two(long this_ptr, long val);
-       /// LDKDirectionalChannelInfo ChannelInfo_get_two_to_one(const LDKChannelInfo *this_ptr);
+       // LDKDirectionalChannelInfo ChannelInfo_get_two_to_one(const LDKChannelInfo *this_ptr);
        public static native long ChannelInfo_get_two_to_one(long this_ptr);
-       /// void ChannelInfo_set_two_to_one(LDKChannelInfo *this_ptr, LDKDirectionalChannelInfo val);
+       // void ChannelInfo_set_two_to_one(LDKChannelInfo *this_ptr, LDKDirectionalChannelInfo val);
        public static native void ChannelInfo_set_two_to_one(long this_ptr, long val);
-       /// LDKChannelAnnouncement ChannelInfo_get_announcement_message(const LDKChannelInfo *this_ptr);
+       // LDKChannelAnnouncement ChannelInfo_get_announcement_message(const LDKChannelInfo *this_ptr);
        public static native long ChannelInfo_get_announcement_message(long this_ptr);
-       /// void ChannelInfo_set_announcement_message(LDKChannelInfo *this_ptr, LDKChannelAnnouncement val);
+       // void ChannelInfo_set_announcement_message(LDKChannelInfo *this_ptr, LDKChannelAnnouncement val);
        public static native void ChannelInfo_set_announcement_message(long this_ptr, long val);
-       /// LDKCVec_u8Z ChannelInfo_write(const LDKChannelInfo *obj);
+       // LDKCVec_u8Z ChannelInfo_write(const LDKChannelInfo *obj);
        public static native long ChannelInfo_write(long obj);
-       /// LDKChannelInfo ChannelInfo_read(LDKu8slice ser);
+       // LDKChannelInfo ChannelInfo_read(LDKu8slice ser);
        public static native long ChannelInfo_read(long ser);
-       /// void RoutingFees_free(LDKRoutingFees this_ptr);
+       // void RoutingFees_free(LDKRoutingFees this_ptr);
        public static native void RoutingFees_free(long this_ptr);
-       /// uint32_t RoutingFees_get_base_msat(const LDKRoutingFees *this_ptr);
+       // uint32_t RoutingFees_get_base_msat(const LDKRoutingFees *this_ptr);
        public static native int RoutingFees_get_base_msat(long this_ptr);
-       /// void RoutingFees_set_base_msat(LDKRoutingFees *this_ptr, uint32_t val);
+       // void RoutingFees_set_base_msat(LDKRoutingFees *this_ptr, uint32_t val);
        public static native void RoutingFees_set_base_msat(long this_ptr, int val);
-       /// uint32_t RoutingFees_get_proportional_millionths(const LDKRoutingFees *this_ptr);
+       // uint32_t RoutingFees_get_proportional_millionths(const LDKRoutingFees *this_ptr);
        public static native int RoutingFees_get_proportional_millionths(long this_ptr);
-       /// void RoutingFees_set_proportional_millionths(LDKRoutingFees *this_ptr, uint32_t val);
+       // void RoutingFees_set_proportional_millionths(LDKRoutingFees *this_ptr, uint32_t val);
        public static native void RoutingFees_set_proportional_millionths(long this_ptr, int val);
-       /// MUST_USE_RES LDKRoutingFees RoutingFees_new(uint32_t base_msat_arg, uint32_t proportional_millionths_arg);
+       // MUST_USE_RES LDKRoutingFees RoutingFees_new(uint32_t base_msat_arg, uint32_t proportional_millionths_arg);
        public static native long RoutingFees_new(int base_msat_arg, int proportional_millionths_arg);
-       /// LDKRoutingFees RoutingFees_read(LDKu8slice ser);
+       // LDKRoutingFees RoutingFees_read(LDKu8slice ser);
        public static native long RoutingFees_read(long ser);
-       /// LDKCVec_u8Z RoutingFees_write(const LDKRoutingFees *obj);
+       // LDKCVec_u8Z RoutingFees_write(const LDKRoutingFees *obj);
        public static native long RoutingFees_write(long obj);
-       /// void NodeAnnouncementInfo_free(LDKNodeAnnouncementInfo this_ptr);
+       // void NodeAnnouncementInfo_free(LDKNodeAnnouncementInfo this_ptr);
        public static native void NodeAnnouncementInfo_free(long this_ptr);
-       /// LDKNodeFeatures NodeAnnouncementInfo_get_features(const LDKNodeAnnouncementInfo *this_ptr);
+       // LDKNodeFeatures NodeAnnouncementInfo_get_features(const LDKNodeAnnouncementInfo *this_ptr);
        public static native long NodeAnnouncementInfo_get_features(long this_ptr);
-       /// void NodeAnnouncementInfo_set_features(LDKNodeAnnouncementInfo *this_ptr, LDKNodeFeatures val);
+       // void NodeAnnouncementInfo_set_features(LDKNodeAnnouncementInfo *this_ptr, LDKNodeFeatures val);
        public static native void NodeAnnouncementInfo_set_features(long this_ptr, long val);
-       /// uint32_t NodeAnnouncementInfo_get_last_update(const LDKNodeAnnouncementInfo *this_ptr);
+       // uint32_t NodeAnnouncementInfo_get_last_update(const LDKNodeAnnouncementInfo *this_ptr);
        public static native int NodeAnnouncementInfo_get_last_update(long this_ptr);
-       /// void NodeAnnouncementInfo_set_last_update(LDKNodeAnnouncementInfo *this_ptr, uint32_t val);
+       // void NodeAnnouncementInfo_set_last_update(LDKNodeAnnouncementInfo *this_ptr, uint32_t val);
        public static native void NodeAnnouncementInfo_set_last_update(long this_ptr, int val);
-       /// const uint8_t (*NodeAnnouncementInfo_get_rgb(const LDKNodeAnnouncementInfo *this_ptr))[3];
+       // const uint8_t (*NodeAnnouncementInfo_get_rgb(const LDKNodeAnnouncementInfo *this_ptr))[3];
        public static native byte[] NodeAnnouncementInfo_get_rgb(long this_ptr);
-       /// void NodeAnnouncementInfo_set_rgb(LDKNodeAnnouncementInfo *this_ptr, LDKThreeBytes val);
+       // void NodeAnnouncementInfo_set_rgb(LDKNodeAnnouncementInfo *this_ptr, LDKThreeBytes val);
        public static native void NodeAnnouncementInfo_set_rgb(long this_ptr, long val);
-       /// const uint8_t (*NodeAnnouncementInfo_get_alias(const LDKNodeAnnouncementInfo *this_ptr))[32];
+       // const uint8_t (*NodeAnnouncementInfo_get_alias(const LDKNodeAnnouncementInfo *this_ptr))[32];
        public static native byte[] NodeAnnouncementInfo_get_alias(long this_ptr);
-       /// void NodeAnnouncementInfo_set_alias(LDKNodeAnnouncementInfo *this_ptr, LDKThirtyTwoBytes val);
+       // void NodeAnnouncementInfo_set_alias(LDKNodeAnnouncementInfo *this_ptr, LDKThirtyTwoBytes val);
        public static native void NodeAnnouncementInfo_set_alias(long this_ptr, long val);
-       /// void NodeAnnouncementInfo_set_addresses(LDKNodeAnnouncementInfo *this_ptr, LDKCVec_NetAddressZ val);
+       // void NodeAnnouncementInfo_set_addresses(LDKNodeAnnouncementInfo *this_ptr, LDKCVec_NetAddressZ val);
        public static native void NodeAnnouncementInfo_set_addresses(long this_ptr, long val);
-       /// LDKNodeAnnouncement NodeAnnouncementInfo_get_announcement_message(const LDKNodeAnnouncementInfo *this_ptr);
+       // LDKNodeAnnouncement NodeAnnouncementInfo_get_announcement_message(const LDKNodeAnnouncementInfo *this_ptr);
        public static native long NodeAnnouncementInfo_get_announcement_message(long this_ptr);
-       /// void NodeAnnouncementInfo_set_announcement_message(LDKNodeAnnouncementInfo *this_ptr, LDKNodeAnnouncement val);
+       // void NodeAnnouncementInfo_set_announcement_message(LDKNodeAnnouncementInfo *this_ptr, LDKNodeAnnouncement val);
        public static native void NodeAnnouncementInfo_set_announcement_message(long this_ptr, long val);
-       /// MUST_USE_RES LDKNodeAnnouncementInfo NodeAnnouncementInfo_new(LDKNodeFeatures features_arg, uint32_t last_update_arg, LDKThreeBytes rgb_arg, LDKThirtyTwoBytes alias_arg, LDKCVec_NetAddressZ addresses_arg, LDKNodeAnnouncement announcement_message_arg);
+       // MUST_USE_RES LDKNodeAnnouncementInfo NodeAnnouncementInfo_new(LDKNodeFeatures features_arg, uint32_t last_update_arg, LDKThreeBytes rgb_arg, LDKThirtyTwoBytes alias_arg, LDKCVec_NetAddressZ addresses_arg, LDKNodeAnnouncement announcement_message_arg);
        public static native long NodeAnnouncementInfo_new(long features_arg, int last_update_arg, long rgb_arg, long alias_arg, long addresses_arg, long announcement_message_arg);
-       /// LDKCVec_u8Z NodeAnnouncementInfo_write(const LDKNodeAnnouncementInfo *obj);
+       // LDKCVec_u8Z NodeAnnouncementInfo_write(const LDKNodeAnnouncementInfo *obj);
        public static native long NodeAnnouncementInfo_write(long obj);
-       /// LDKNodeAnnouncementInfo NodeAnnouncementInfo_read(LDKu8slice ser);
+       // LDKNodeAnnouncementInfo NodeAnnouncementInfo_read(LDKu8slice ser);
        public static native long NodeAnnouncementInfo_read(long ser);
-       /// void NodeInfo_free(LDKNodeInfo this_ptr);
+       // void NodeInfo_free(LDKNodeInfo this_ptr);
        public static native void NodeInfo_free(long this_ptr);
-       /// void NodeInfo_set_channels(LDKNodeInfo *this_ptr, LDKCVec_u64Z val);
+       // void NodeInfo_set_channels(LDKNodeInfo *this_ptr, LDKCVec_u64Z val);
        public static native void NodeInfo_set_channels(long this_ptr, long val);
-       /// LDKRoutingFees NodeInfo_get_lowest_inbound_channel_fees(const LDKNodeInfo *this_ptr);
+       // LDKRoutingFees NodeInfo_get_lowest_inbound_channel_fees(const LDKNodeInfo *this_ptr);
        public static native long NodeInfo_get_lowest_inbound_channel_fees(long this_ptr);
-       /// void NodeInfo_set_lowest_inbound_channel_fees(LDKNodeInfo *this_ptr, LDKRoutingFees val);
+       // void NodeInfo_set_lowest_inbound_channel_fees(LDKNodeInfo *this_ptr, LDKRoutingFees val);
        public static native void NodeInfo_set_lowest_inbound_channel_fees(long this_ptr, long val);
-       /// LDKNodeAnnouncementInfo NodeInfo_get_announcement_info(const LDKNodeInfo *this_ptr);
+       // LDKNodeAnnouncementInfo NodeInfo_get_announcement_info(const LDKNodeInfo *this_ptr);
        public static native long NodeInfo_get_announcement_info(long this_ptr);
-       /// void NodeInfo_set_announcement_info(LDKNodeInfo *this_ptr, LDKNodeAnnouncementInfo val);
+       // void NodeInfo_set_announcement_info(LDKNodeInfo *this_ptr, LDKNodeAnnouncementInfo val);
        public static native void NodeInfo_set_announcement_info(long this_ptr, long val);
-       /// MUST_USE_RES LDKNodeInfo NodeInfo_new(LDKCVec_u64Z channels_arg, LDKRoutingFees lowest_inbound_channel_fees_arg, LDKNodeAnnouncementInfo announcement_info_arg);
+       // MUST_USE_RES LDKNodeInfo NodeInfo_new(LDKCVec_u64Z channels_arg, LDKRoutingFees lowest_inbound_channel_fees_arg, LDKNodeAnnouncementInfo announcement_info_arg);
        public static native long NodeInfo_new(long channels_arg, long lowest_inbound_channel_fees_arg, long announcement_info_arg);
-       /// LDKCVec_u8Z NodeInfo_write(const LDKNodeInfo *obj);
+       // LDKCVec_u8Z NodeInfo_write(const LDKNodeInfo *obj);
        public static native long NodeInfo_write(long obj);
-       /// LDKNodeInfo NodeInfo_read(LDKu8slice ser);
+       // LDKNodeInfo NodeInfo_read(LDKu8slice ser);
        public static native long NodeInfo_read(long ser);
-       /// LDKCVec_u8Z NetworkGraph_write(const LDKNetworkGraph *obj);
+       // LDKCVec_u8Z NetworkGraph_write(const LDKNetworkGraph *obj);
        public static native long NetworkGraph_write(long obj);
-       /// LDKNetworkGraph NetworkGraph_read(LDKu8slice ser);
+       // LDKNetworkGraph NetworkGraph_read(LDKu8slice ser);
        public static native long NetworkGraph_read(long ser);
-       /// MUST_USE_RES LDKNetworkGraph NetworkGraph_new(void);
+       // MUST_USE_RES LDKNetworkGraph NetworkGraph_new(void);
        public static native long NetworkGraph_new();
-       /// void NetworkGraph_close_channel_from_update(LDKNetworkGraph *this_arg, uint64_t short_channel_id, bool is_permanent);
+       // void NetworkGraph_close_channel_from_update(LDKNetworkGraph *this_arg, uint64_t short_channel_id, bool is_permanent);
        public static native void NetworkGraph_close_channel_from_update(long this_arg, long short_channel_id, boolean is_permanent);
 }

diff --git a/src/main/jni/bindings.c b/src/main/jni/bindings.c
index fb492f34a856534e0b0b60d043d03622ae4a9c96..b696dcd0af3d8bf2deba93b639ddbf12c64c3513 100644 (file)
--- a/src/main/jni/bindings.c
+++ b/src/main/jni/bindings.c
@@ -5,14 +5,80 @@
 #include <string.h>
 #include <stdatomic.h>
 
+#include <threads.h>
+static mtx_t allocation_mtx;
+
+void __attribute__((constructor)) init_mtx() {
+       assert(mtx_init(&allocation_mtx, mtx_plain) == thrd_success);
+}
+
+typedef struct allocation {
+       struct allocation* next;
+       void* ptr;
+       const char* struct_name;
+} allocation;
+static allocation* allocation_ll = NULL;
+
+void* MALLOC(size_t len, const char* struct_name) {
+       void* res = malloc(len);
+       allocation* new_alloc = malloc(sizeof(allocation));
+       new_alloc->ptr = res;
+       new_alloc->struct_name = struct_name;
+       assert(mtx_lock(&allocation_mtx) == thrd_success);
+       new_alloc->next = allocation_ll;
+       allocation_ll = new_alloc;
+       assert(mtx_unlock(&allocation_mtx) == thrd_success);
+       return res;
+}
+
+void FREE(void* ptr) {
+       allocation* p = NULL;
+       assert(mtx_lock(&allocation_mtx) == thrd_success);
+       allocation* it = allocation_ll;
+       while (it->ptr != ptr) { p = it; it = it->next; }
+       if (p) { p->next = it->next; } else { allocation_ll = it->next; }
+       assert(mtx_unlock(&allocation_mtx) == thrd_success);
+       assert(it->ptr == ptr);
+       free(it);
+       free(ptr);
+}
+
+void __attribute__((destructor)) check_leaks() {
+       for (allocation* a = allocation_ll; a != NULL; a = a->next) { fprintf(stderr, "%s %p remains\n", a->struct_name, a->ptr); }
+       assert(allocation_ll == NULL);
+}
+
 jmethodID ordinal_meth = NULL;
 JNIEXPORT void Java_org_ldk_impl_bindings_init(JNIEnv * env, jclass _b, jclass enum_class) {
        ordinal_meth = (*env)->GetMethodID(env, enum_class, "ordinal", "()I");
        assert(ordinal_meth != NULL);
 }
 
-#define MALLOC(a, _) malloc(a)
-#define FREE free
+JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_deref_1bool (JNIEnv * env, jclass _a, jlong ptr) {
+       return *((bool*)ptr);
+}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_deref_1long (JNIEnv * env, jclass _a, jlong ptr) {
+       return *((long*)ptr);
+}
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_free_1heap_1ptr (JNIEnv * env, jclass _a, jlong ptr) {
+       FREE((void*)ptr);
+}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_u8_1vec_1to_1heap_1slice (JNIEnv * env, jclass _a, jlong ptr) {
+       LDKCVec_u8Z *vec = (LDKCVec_u8Z*)ptr;
+       LDKu8slice *slice = (LDKu8slice*)MALLOC(sizeof(LDKu8slice), "u8slice");
+        slice->data = vec->data;
+        slice->datalen = vec->datalen;
+       return (long)slice;
+}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_u8_1vec_1len (JNIEnv * env, jclass _a, jlong ptr) {
+       LDKCVec_u8Z *vec = (LDKCVec_u8Z*)ptr;
+       return (long)vec->datalen;
+}
+
+// We assume that CVec_u8Z and u8slice are the same size and layout (and thus pointers to the two can be mixed)
+_Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKu8slice), "Vec<u8> and [u8] need to have been mapped identically");
+_Static_assert(offsetof(LDKCVec_u8Z, data) == offsetof(LDKu8slice, data), "Vec<u8> and [u8] need to have been mapped identically");
+_Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKu8slice, datalen), "Vec<u8> and [u8] need to have been mapped identically");
 
 JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSecretKey_1new(JNIEnv * _env, jclass _b) {
        LDKSecretKey* key = (LDKSecretKey*)MALLOC(sizeof(LDKSecretKey), "LDKSecretKey");
@@ -382,6 +448,13 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEventsProvider_1
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEventsProvider_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKMessageSendEventsProvider_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEventsProvider_1call_1get_1and_1clear_1pending_1msg_1events(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKMessageSendEventsProvider* arg_conv = (LDKMessageSendEventsProvider*)arg;
+       LDKCVec_MessageSendEventZ* ret = MALLOC(sizeof(LDKCVec_MessageSendEventZ), "LDKCVec_MessageSendEventZ");
+       *ret = (arg_conv->get_and_clear_pending_msg_events)(arg_conv->this_arg);
+       return (long)ret;
+}
+
 typedef struct LDKEventsProvider_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -432,6 +505,13 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKEventsProvider_1new (JNIEnv
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKEventsProvider_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKEventsProvider_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKEventsProvider_1call_1get_1and_1clear_1pending_1events(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKEventsProvider* arg_conv = (LDKEventsProvider*)arg;
+       LDKCVec_EventZ* ret = MALLOC(sizeof(LDKCVec_EventZ), "LDKCVec_EventZ");
+       *ret = (arg_conv->get_and_clear_pending_events)(arg_conv->this_arg);
+       return (long)ret;
+}
+
 typedef struct LDKLogger_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -542,6 +622,16 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKAccess_1new (JNIEnv * env,
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKAccess_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKAccess_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKAccess_1call_1get_1utxo(JNIEnv * _env, jclass _b, jlong arg, jbyteArray genesis_hash, jlong short_channel_id) {
+       LDKAccess* arg_conv = (LDKAccess*)arg;
+       unsigned char genesis_hash_arr[32];
+       (*_env)->GetByteArrayRegion (_env, genesis_hash, 0, 32, genesis_hash_arr);
+       unsigned char (*genesis_hash_ref)[32] = &genesis_hash_arr;
+       LDKCResult_TxOutAccessErrorZ* ret = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
+       *ret = (arg_conv->get_utxo)(arg_conv->this_arg, genesis_hash_ref, short_channel_id);
+       return (long)ret;
+}
+
 typedef struct LDKChannelKeys_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -702,6 +792,103 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1new (JNIEnv *
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKChannelKeys_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1get_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong arg, jlong idx) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
+       *ret = (arg_conv->get_per_commitment_point)(arg_conv->this_arg, idx);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1release_1commitment_1secret(JNIEnv * _env, jclass _b, jlong arg, jlong idx) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKThirtyTwoBytes* ret = MALLOC(sizeof(LDKThirtyTwoBytes), "LDKThirtyTwoBytes");
+       *ret = (arg_conv->release_commitment_secret)(arg_conv->this_arg, idx);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1key_1derivation_1params(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKC2Tuple_u64u64Z* ret = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z");
+       *ret = (arg_conv->key_derivation_params)(arg_conv->this_arg);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1counterparty_1commitment(JNIEnv * _env, jclass _b, jlong arg, jint feerate_per_kw, jlong commitment_tx, jlong keys, jlong htlcs) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKTransaction commitment_tx_conv = *(LDKTransaction*)commitment_tx;
+       FREE((void*)commitment_tx);
+       LDKPreCalculatedTxCreationKeys* keys_conv = (LDKPreCalculatedTxCreationKeys*)keys;
+       LDKCVec_HTLCOutputInCommitmentZ htlcs_conv = *(LDKCVec_HTLCOutputInCommitmentZ*)htlcs;
+       FREE((void*)htlcs);
+       LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
+       *ret = (arg_conv->sign_counterparty_commitment)(arg_conv->this_arg, feerate_per_kw, commitment_tx_conv, keys_conv, htlcs_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1holder_1commitment(JNIEnv * _env, jclass _b, jlong arg, jlong holder_commitment_tx) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKHolderCommitmentTransaction* holder_commitment_tx_conv = (LDKHolderCommitmentTransaction*)holder_commitment_tx;
+       LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+       *ret = (arg_conv->sign_holder_commitment)(arg_conv->this_arg, holder_commitment_tx_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1holder_1commitment_1htlc_1transactions(JNIEnv * _env, jclass _b, jlong arg, jlong holder_commitment_tx) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKHolderCommitmentTransaction* holder_commitment_tx_conv = (LDKHolderCommitmentTransaction*)holder_commitment_tx;
+       LDKCResult_CVec_SignatureZNoneZ* ret = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
+       *ret = (arg_conv->sign_holder_commitment_htlc_transactions)(arg_conv->this_arg, holder_commitment_tx_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1justice_1transaction(JNIEnv * _env, jclass _b, jlong arg, jlong justice_tx, jlong input, jlong amount, jbyteArray per_commitment_key, jlong htlc) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKTransaction justice_tx_conv = *(LDKTransaction*)justice_tx;
+       FREE((void*)justice_tx);
+       unsigned char per_commitment_key_arr[32];
+       (*_env)->GetByteArrayRegion (_env, per_commitment_key, 0, 32, per_commitment_key_arr);
+       unsigned char (*per_commitment_key_ref)[32] = &per_commitment_key_arr;
+       LDKHTLCOutputInCommitment* htlc_conv = (LDKHTLCOutputInCommitment*)htlc;
+       LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+       *ret = (arg_conv->sign_justice_transaction)(arg_conv->this_arg, justice_tx_conv, input, amount, per_commitment_key_ref, htlc_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1counterparty_1htlc_1transaction(JNIEnv * _env, jclass _b, jlong arg, jlong htlc_tx, jlong input, jlong amount, jlong per_commitment_point, jlong htlc) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKTransaction htlc_tx_conv = *(LDKTransaction*)htlc_tx;
+       FREE((void*)htlc_tx);
+       LDKPublicKey per_commitment_point_conv = *(LDKPublicKey*)per_commitment_point;
+       FREE((void*)per_commitment_point);
+       LDKHTLCOutputInCommitment* htlc_conv = (LDKHTLCOutputInCommitment*)htlc;
+       LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+       *ret = (arg_conv->sign_counterparty_htlc_transaction)(arg_conv->this_arg, htlc_tx_conv, input, amount, per_commitment_point_conv, htlc_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1closing_1transaction(JNIEnv * _env, jclass _b, jlong arg, jlong closing_tx) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKTransaction closing_tx_conv = *(LDKTransaction*)closing_tx;
+       FREE((void*)closing_tx);
+       LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+       *ret = (arg_conv->sign_closing_transaction)(arg_conv->this_arg, closing_tx_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1channel_1announcement(JNIEnv * _env, jclass _b, jlong arg, jlong msg) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKUnsignedChannelAnnouncement* msg_conv = (LDKUnsignedChannelAnnouncement*)msg;
+       LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+       *ret = (arg_conv->sign_channel_announcement)(arg_conv->this_arg, msg_conv);
+       return (long)ret;
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1on_1accept(JNIEnv * _env, jclass _b, jlong arg, jlong channel_points, jshort counterparty_selected_contest_delay, jshort holder_selected_contest_delay) {
+       LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+       LDKChannelPublicKeys* channel_points_conv = (LDKChannelPublicKeys*)channel_points;
+       return (arg_conv->on_accept)(arg_conv->this_arg, channel_points_conv, counterparty_selected_contest_delay, holder_selected_contest_delay);
+}
+
 typedef struct LDKWatch_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -774,6 +961,39 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKWatch_1new (JNIEnv * env, j
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKWatch_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKWatch_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKWatch_1call_1watch_1channel(JNIEnv * _env, jclass _b, jlong arg, jlong funding_txo, jlong monitor) {
+       LDKWatch* arg_conv = (LDKWatch*)arg;
+       LDKOutPoint funding_txo_conv = *(LDKOutPoint*)funding_txo;
+       FREE((void*)funding_txo);
+       funding_txo_conv.is_owned = true;
+       LDKChannelMonitor monitor_conv = *(LDKChannelMonitor*)monitor;
+       FREE((void*)monitor);
+       monitor_conv.is_owned = true;
+       LDKCResult_NoneChannelMonitorUpdateErrZ* ret = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
+       *ret = (arg_conv->watch_channel)(arg_conv->this_arg, funding_txo_conv, monitor_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKWatch_1call_1update_1channel(JNIEnv * _env, jclass _b, jlong arg, jlong funding_txo, jlong update) {
+       LDKWatch* arg_conv = (LDKWatch*)arg;
+       LDKOutPoint funding_txo_conv = *(LDKOutPoint*)funding_txo;
+       FREE((void*)funding_txo);
+       funding_txo_conv.is_owned = true;
+       LDKChannelMonitorUpdate update_conv = *(LDKChannelMonitorUpdate*)update;
+       FREE((void*)update);
+       update_conv.is_owned = true;
+       LDKCResult_NoneChannelMonitorUpdateErrZ* ret = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
+       *ret = (arg_conv->update_channel)(arg_conv->this_arg, funding_txo_conv, update_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKWatch_1call_1release_1pending_1monitor_1events(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKWatch* arg_conv = (LDKWatch*)arg;
+       LDKCVec_MonitorEventZ* ret = MALLOC(sizeof(LDKCVec_MonitorEventZ), "LDKCVec_MonitorEventZ");
+       *ret = (arg_conv->release_pending_monitor_events)(arg_conv->this_arg);
+       return (long)ret;
+}
+
 typedef struct LDKFilter_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -831,6 +1051,24 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKFilter_1new (JNIEnv * env,
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKFilter_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKFilter_JCalls*)val)->o;
 }
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKFilter_1call_1register_1tx(JNIEnv * _env, jclass _b, jlong arg, jbyteArray txid, jlong script_pubkey) {
+       LDKFilter* arg_conv = (LDKFilter*)arg;
+       unsigned char txid_arr[32];
+       (*_env)->GetByteArrayRegion (_env, txid, 0, 32, txid_arr);
+       unsigned char (*txid_ref)[32] = &txid_arr;
+       LDKu8slice script_pubkey_conv = *(LDKu8slice*)script_pubkey;
+       FREE((void*)script_pubkey);
+       return (arg_conv->register_tx)(arg_conv->this_arg, txid_ref, script_pubkey_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKFilter_1call_1register_1output(JNIEnv * _env, jclass _b, jlong arg, jlong outpoint, jlong script_pubkey) {
+       LDKFilter* arg_conv = (LDKFilter*)arg;
+       LDKOutPoint* outpoint_conv = (LDKOutPoint*)outpoint;
+       LDKu8slice script_pubkey_conv = *(LDKu8slice*)script_pubkey;
+       FREE((void*)script_pubkey);
+       return (arg_conv->register_output)(arg_conv->this_arg, outpoint_conv, script_pubkey_conv);
+}
+
 typedef struct LDKBroadcasterInterface_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -878,6 +1116,13 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1new (
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKBroadcasterInterface_JCalls*)val)->o;
 }
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1call_1broadcast_1transaction(JNIEnv * _env, jclass _b, jlong arg, jlong tx) {
+       LDKBroadcasterInterface* arg_conv = (LDKBroadcasterInterface*)arg;
+       LDKTransaction tx_conv = *(LDKTransaction*)tx;
+       FREE((void*)tx);
+       return (arg_conv->broadcast_transaction)(arg_conv->this_arg, tx_conv);
+}
+
 typedef struct LDKFeeEstimator_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -926,6 +1171,12 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1new (JNIEnv *
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKFeeEstimator_JCalls*)val)->o;
 }
+JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1call_1get_1est_1sat_1per_11000_1weight(JNIEnv * _env, jclass _b, jlong arg, jclass confirmation_target) {
+       LDKFeeEstimator* arg_conv = (LDKFeeEstimator*)arg;
+       LDKConfirmationTarget confirmation_target_conv = LDKConfirmationTarget_from_java(_env, confirmation_target);
+       return (arg_conv->get_est_sat_per_1000_weight)(arg_conv->this_arg, confirmation_target_conv);
+}
+
 typedef struct LDKKeysInterface_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -1020,6 +1271,41 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1new (JNIEnv
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKKeysInterface_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1node_1secret(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
+       LDKSecretKey* ret = MALLOC(sizeof(LDKSecretKey), "LDKSecretKey");
+       *ret = (arg_conv->get_node_secret)(arg_conv->this_arg);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1destination_1script(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
+       LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z");
+       *ret = (arg_conv->get_destination_script)(arg_conv->this_arg);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1shutdown_1pubkey(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
+       LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
+       *ret = (arg_conv->get_shutdown_pubkey)(arg_conv->this_arg);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1channel_1keys(JNIEnv * _env, jclass _b, jlong arg, jboolean inbound, jlong channel_value_satoshis) {
+       LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
+       LDKChannelKeys* ret = MALLOC(sizeof(LDKChannelKeys), "LDKChannelKeys");
+       *ret = (arg_conv->get_channel_keys)(arg_conv->this_arg, inbound, channel_value_satoshis);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1secure_1random_1bytes(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
+       LDKThirtyTwoBytes* ret = MALLOC(sizeof(LDKThirtyTwoBytes), "LDKThirtyTwoBytes");
+       *ret = (arg_conv->get_secure_random_bytes)(arg_conv->this_arg);
+       return (long)ret;
+}
+
 typedef struct LDKChannelMessageHandler_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -1215,6 +1501,163 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKChannelMessageHandler_JCalls*)val)->o;
 }
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1open_1channel(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong their_features, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKInitFeatures their_features_conv = *(LDKInitFeatures*)their_features;
+       FREE((void*)their_features);
+       their_features_conv.is_owned = true;
+       LDKOpenChannel* msg_conv = (LDKOpenChannel*)msg;
+       return (arg_conv->handle_open_channel)(arg_conv->this_arg, their_node_id_conv, their_features_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1accept_1channel(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong their_features, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKInitFeatures their_features_conv = *(LDKInitFeatures*)their_features;
+       FREE((void*)their_features);
+       their_features_conv.is_owned = true;
+       LDKAcceptChannel* msg_conv = (LDKAcceptChannel*)msg;
+       return (arg_conv->handle_accept_channel)(arg_conv->this_arg, their_node_id_conv, their_features_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1funding_1created(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKFundingCreated* msg_conv = (LDKFundingCreated*)msg;
+       return (arg_conv->handle_funding_created)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1funding_1signed(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKFundingSigned* msg_conv = (LDKFundingSigned*)msg;
+       return (arg_conv->handle_funding_signed)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1funding_1locked(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKFundingLocked* msg_conv = (LDKFundingLocked*)msg;
+       return (arg_conv->handle_funding_locked)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1shutdown(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKShutdown* msg_conv = (LDKShutdown*)msg;
+       return (arg_conv->handle_shutdown)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1closing_1signed(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKClosingSigned* msg_conv = (LDKClosingSigned*)msg;
+       return (arg_conv->handle_closing_signed)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1add_1htlc(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKUpdateAddHTLC* msg_conv = (LDKUpdateAddHTLC*)msg;
+       return (arg_conv->handle_update_add_htlc)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fulfill_1htlc(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKUpdateFulfillHTLC* msg_conv = (LDKUpdateFulfillHTLC*)msg;
+       return (arg_conv->handle_update_fulfill_htlc)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fail_1htlc(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKUpdateFailHTLC* msg_conv = (LDKUpdateFailHTLC*)msg;
+       return (arg_conv->handle_update_fail_htlc)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fail_1malformed_1htlc(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKUpdateFailMalformedHTLC* msg_conv = (LDKUpdateFailMalformedHTLC*)msg;
+       return (arg_conv->handle_update_fail_malformed_htlc)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1commitment_1signed(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKCommitmentSigned* msg_conv = (LDKCommitmentSigned*)msg;
+       return (arg_conv->handle_commitment_signed)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1revoke_1and_1ack(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKRevokeAndACK* msg_conv = (LDKRevokeAndACK*)msg;
+       return (arg_conv->handle_revoke_and_ack)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fee(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKUpdateFee* msg_conv = (LDKUpdateFee*)msg;
+       return (arg_conv->handle_update_fee)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1announcement_1signatures(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKAnnouncementSignatures* msg_conv = (LDKAnnouncementSignatures*)msg;
+       return (arg_conv->handle_announcement_signatures)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1peer_1disconnected(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jboolean no_connection_possible) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       return (arg_conv->peer_disconnected)(arg_conv->this_arg, their_node_id_conv, no_connection_possible);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1peer_1connected(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKInit* msg_conv = (LDKInit*)msg;
+       return (arg_conv->peer_connected)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1channel_1reestablish(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKChannelReestablish* msg_conv = (LDKChannelReestablish*)msg;
+       return (arg_conv->handle_channel_reestablish)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1error(JNIEnv * _env, jclass _b, jlong arg, jlong their_node_id, jlong msg) {
+       LDKChannelMessageHandler* arg_conv = (LDKChannelMessageHandler*)arg;
+       LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
+       FREE((void*)their_node_id);
+       LDKErrorMessage* msg_conv = (LDKErrorMessage*)msg;
+       return (arg_conv->handle_error)(arg_conv->this_arg, their_node_id_conv, msg_conv);
+}
+
 JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1boolLightningErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) {
        return ((LDKCResult_boolLightningErrorZ*)arg)->result_ok;
 }
@@ -1335,6 +1778,59 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKRoutingMessageHandler_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1node_1announcement(JNIEnv * _env, jclass _b, jlong arg, jlong msg) {
+       LDKRoutingMessageHandler* arg_conv = (LDKRoutingMessageHandler*)arg;
+       LDKNodeAnnouncement* msg_conv = (LDKNodeAnnouncement*)msg;
+       LDKCResult_boolLightningErrorZ* ret = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
+       *ret = (arg_conv->handle_node_announcement)(arg_conv->this_arg, msg_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1channel_1announcement(JNIEnv * _env, jclass _b, jlong arg, jlong msg) {
+       LDKRoutingMessageHandler* arg_conv = (LDKRoutingMessageHandler*)arg;
+       LDKChannelAnnouncement* msg_conv = (LDKChannelAnnouncement*)msg;
+       LDKCResult_boolLightningErrorZ* ret = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
+       *ret = (arg_conv->handle_channel_announcement)(arg_conv->this_arg, msg_conv);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1channel_1update(JNIEnv * _env, jclass _b, jlong arg, jlong msg) {
+       LDKRoutingMessageHandler* arg_conv = (LDKRoutingMessageHandler*)arg;
+       LDKChannelUpdate* msg_conv = (LDKChannelUpdate*)msg;
+       LDKCResult_boolLightningErrorZ* ret = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
+       *ret = (arg_conv->handle_channel_update)(arg_conv->this_arg, msg_conv);
+       return (long)ret;
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1htlc_1fail_1channel_1update(JNIEnv * _env, jclass _b, jlong arg, jlong update) {
+       LDKRoutingMessageHandler* arg_conv = (LDKRoutingMessageHandler*)arg;
+       LDKHTLCFailChannelUpdate* update_conv = (LDKHTLCFailChannelUpdate*)update;
+       return (arg_conv->handle_htlc_fail_channel_update)(arg_conv->this_arg, update_conv);
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1get_1next_1channel_1announcements(JNIEnv * _env, jclass _b, jlong arg, jlong starting_point, jbyte batch_amount) {
+       LDKRoutingMessageHandler* arg_conv = (LDKRoutingMessageHandler*)arg;
+       LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ* ret = MALLOC(sizeof(LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ");
+       *ret = (arg_conv->get_next_channel_announcements)(arg_conv->this_arg, starting_point, batch_amount);
+       return (long)ret;
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1get_1next_1node_1announcements(JNIEnv * _env, jclass _b, jlong arg, jlong starting_point, jbyte batch_amount) {
+       LDKRoutingMessageHandler* arg_conv = (LDKRoutingMessageHandler*)arg;
+       LDKPublicKey starting_point_conv = *(LDKPublicKey*)starting_point;
+       FREE((void*)starting_point);
+       LDKCVec_NodeAnnouncementZ* ret = MALLOC(sizeof(LDKCVec_NodeAnnouncementZ), "LDKCVec_NodeAnnouncementZ");
+       *ret = (arg_conv->get_next_node_announcements)(arg_conv->this_arg, starting_point_conv, batch_amount);
+       return (long)ret;
+}
+
+JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1should_1request_1full_1sync(JNIEnv * _env, jclass _b, jlong arg, jlong node_id) {
+       LDKRoutingMessageHandler* arg_conv = (LDKRoutingMessageHandler*)arg;
+       LDKPublicKey node_id_conv = *(LDKPublicKey*)node_id;
+       FREE((void*)node_id);
+       return (arg_conv->should_request_full_sync)(arg_conv->this_arg, node_id_conv);
+}
+
 typedef struct LDKSocketDescriptor_JCalls {
        atomic_size_t refcnt;
        JNIEnv *env;
@@ -1407,6 +1903,23 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1new (JNIE
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
        return ((LDKSocketDescriptor_JCalls*)val)->o;
 }
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1call_1send_1data(JNIEnv * _env, jclass _b, jlong arg, jlong data, jboolean resume_read) {
+       LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg;
+       LDKu8slice data_conv = *(LDKu8slice*)data;
+       FREE((void*)data);
+       return (arg_conv->send_data)(arg_conv->this_arg, data_conv, resume_read);
+}
+
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1call_1disconnect_1socket(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg;
+       return (arg_conv->disconnect_socket)(arg_conv->this_arg);
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1call_1hash(JNIEnv * _env, jclass _b, jlong arg) {
+       LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg;
+       return (arg_conv->hash)(arg_conv->this_arg);
+}
+
 JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1CVec_1u8ZPeerHandleErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) {
        return ((LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg)->result_ok;
 }

diff --git a/src/main/jni/org_ldk_impl_bindings.h b/src/main/jni/org_ldk_impl_bindings.h
index 6a3bdbd155d0b821ca8fd08aa64f0cade868fdde..4d6686a6f8045f2e421b869cdabee4ed9ffc484b 100644 (file)
--- a/src/main/jni/org_ldk_impl_bindings.h
+++ b/src/main/jni/org_ldk_impl_bindings.h
@@ -15,6 +15,46 @@ extern "C" {
 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_init
   (JNIEnv *, jclass, jclass);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    deref_bool
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_deref_1bool
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    deref_long
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_deref_1long
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    free_heap_ptr
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_free_1heap_1ptr
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    u8_vec_to_heap_slice
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_u8_1vec_1to_1heap_1slice
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    u8_vec_len
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_u8_1vec_1len
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKSecretKey_new
@@ -167,6 +207,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEventsProvider_
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEventsProvider_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKMessageSendEventsProvider_call_get_and_clear_pending_msg_events
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEventsProvider_1call_1get_1and_1clear_1pending_1msg_1events
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKEventsProvider_new
@@ -183,6 +231,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKEventsProvider_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKEventsProvider_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKEventsProvider_call_get_and_clear_pending_events
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKEventsProvider_1call_1get_1and_1clear_1pending_1events
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKLogger_new
@@ -231,6 +287,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKAccess_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKAccess_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKAccess_call_get_utxo
+ * Signature: (J[BJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKAccess_1call_1get_1utxo
+  (JNIEnv *, jclass, jlong, jbyteArray, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKChannelKeys_new
@@ -247,6 +311,94 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_get_per_commitment_point
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1get_1per_1commitment_1point
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_release_commitment_secret
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1release_1commitment_1secret
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_key_derivation_params
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1key_1derivation_1params
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_sign_counterparty_commitment
+ * Signature: (JIJJJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1counterparty_1commitment
+  (JNIEnv *, jclass, jlong, jint, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_sign_holder_commitment
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1holder_1commitment
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_sign_holder_commitment_htlc_transactions
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1holder_1commitment_1htlc_1transactions
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_sign_justice_transaction
+ * Signature: (JJJJ[BJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1justice_1transaction
+  (JNIEnv *, jclass, jlong, jlong, jlong, jlong, jbyteArray, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_sign_counterparty_htlc_transaction
+ * Signature: (JJJJJJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1counterparty_1htlc_1transaction
+  (JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_sign_closing_transaction
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1closing_1transaction
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_sign_channel_announcement
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1sign_1channel_1announcement
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelKeys_call_on_accept
+ * Signature: (JJSS)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1on_1accept
+  (JNIEnv *, jclass, jlong, jlong, jshort, jshort);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKWatch_new
@@ -263,6 +415,30 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKWatch_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKWatch_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKWatch_call_watch_channel
+ * Signature: (JJJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKWatch_1call_1watch_1channel
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKWatch_call_update_channel
+ * Signature: (JJJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKWatch_1call_1update_1channel
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKWatch_call_release_pending_monitor_events
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKWatch_1call_1release_1pending_1monitor_1events
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKFilter_new
@@ -279,6 +455,22 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKFilter_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKFilter_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKFilter_call_register_tx
+ * Signature: (J[BJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKFilter_1call_1register_1tx
+  (JNIEnv *, jclass, jlong, jbyteArray, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKFilter_call_register_output
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKFilter_1call_1register_1output
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKBroadcasterInterface_new
@@ -295,6 +487,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKBroadcasterInterface_call_broadcast_transaction
+ * Signature: (JJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1call_1broadcast_1transaction
+  (JNIEnv *, jclass, jlong, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKFeeEstimator_new
@@ -311,6 +511,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKFeeEstimator_call_get_est_sat_per_1000_weight
+ * Signature: (JLorg/ldk/impl/bindings/LDKConfirmationTarget;)I
+ */
+JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1call_1get_1est_1sat_1per_11000_1weight
+  (JNIEnv *, jclass, jlong, jobject);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKKeysInterface_new
@@ -327,6 +535,46 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKKeysInterface_call_get_node_secret
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1node_1secret
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKKeysInterface_call_get_destination_script
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1destination_1script
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKKeysInterface_call_get_shutdown_pubkey
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1shutdown_1pubkey
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKKeysInterface_call_get_channel_keys
+ * Signature: (JZJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1channel_1keys
+  (JNIEnv *, jclass, jlong, jboolean, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKKeysInterface_call_get_secure_random_bytes
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1secure_1random_1bytes
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKChannelMessageHandler_new
@@ -343,6 +591,158 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_open_channel
+ * Signature: (JJJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1open_1channel
+  (JNIEnv *, jclass, jlong, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_accept_channel
+ * Signature: (JJJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1accept_1channel
+  (JNIEnv *, jclass, jlong, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_funding_created
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1funding_1created
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_funding_signed
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1funding_1signed
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_funding_locked
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1funding_1locked
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_shutdown
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1shutdown
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_closing_signed
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1closing_1signed
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_update_add_htlc
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1add_1htlc
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_update_fulfill_htlc
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fulfill_1htlc
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_update_fail_htlc
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fail_1htlc
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_update_fail_malformed_htlc
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fail_1malformed_1htlc
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_commitment_signed
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1commitment_1signed
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_revoke_and_ack
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1revoke_1and_1ack
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_update_fee
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1update_1fee
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_announcement_signatures
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1announcement_1signatures
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_peer_disconnected
+ * Signature: (JJZ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1peer_1disconnected
+  (JNIEnv *, jclass, jlong, jlong, jboolean);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_peer_connected
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1peer_1connected
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_channel_reestablish
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1channel_1reestablish
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKChannelMessageHandler_call_handle_error
+ * Signature: (JJJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1call_1handle_1error
+  (JNIEnv *, jclass, jlong, jlong, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKCResult_boolLightningErrorZ_result_ok
@@ -375,6 +775,62 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKRoutingMessageHandler_call_handle_node_announcement
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1node_1announcement
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKRoutingMessageHandler_call_handle_channel_announcement
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1channel_1announcement
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKRoutingMessageHandler_call_handle_channel_update
+ * Signature: (JJ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1channel_1update
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKRoutingMessageHandler_call_handle_htlc_fail_channel_update
+ * Signature: (JJ)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1handle_1htlc_1fail_1channel_1update
+  (JNIEnv *, jclass, jlong, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKRoutingMessageHandler_call_get_next_channel_announcements
+ * Signature: (JJB)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1get_1next_1channel_1announcements
+  (JNIEnv *, jclass, jlong, jlong, jbyte);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKRoutingMessageHandler_call_get_next_node_announcements
+ * Signature: (JJB)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1get_1next_1node_1announcements
+  (JNIEnv *, jclass, jlong, jlong, jbyte);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKRoutingMessageHandler_call_should_request_full_sync
+ * Signature: (JJ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1call_1should_1request_1full_1sync
+  (JNIEnv *, jclass, jlong, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKSocketDescriptor_new
@@ -391,6 +847,30 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1new
 JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1get_1obj_1from_1jcalls
   (JNIEnv *, jclass, jlong);
 
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKSocketDescriptor_call_send_data
+ * Signature: (JJZ)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1call_1send_1data
+  (JNIEnv *, jclass, jlong, jlong, jboolean);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKSocketDescriptor_call_disconnect_socket
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1call_1disconnect_1socket
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_ldk_impl_bindings
+ * Method:    LDKSocketDescriptor_call_hash
+ * Signature: (J)J
+ */
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1call_1hash
+  (JNIEnv *, jclass, jlong);
+
 /*
  * Class:     org_ldk_impl_bindings
  * Method:    LDKCResult_CVec_u8ZPeerHandleErrorZ_result_ok