X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjni%2Fbindings.c;h=732c134c54f320b0ccc714f3d43dc11114446128;hb=fb413f154cf5dd9c4be4046a3eb56c3aa7f57fcd;hp=db1d9c5a8d40c8149d33b833254d73ed361dea3a;hpb=4fa9aa0bf8a88a9d7c9a35d1131539557aa4a061;p=ldk-java diff --git a/src/main/jni/bindings.c b/src/main/jni/bindings.c index db1d9c5a..732c134c 100644 --- a/src/main/jni/bindings.c +++ b/src/main/jni/bindings.c @@ -1,15 +1,16 @@ #include "org_ldk_impl_bindings.h" #include #include -#include #include #include +#include +#define DO_ASSERT(a) do { bool _assert_val = (a); assert(_assert_val); } while(0) #include static mtx_t allocation_mtx; void __attribute__((constructor)) init_mtx() { - assert(mtx_init(&allocation_mtx, mtx_plain) == thrd_success); + DO_ASSERT(mtx_init(&allocation_mtx, mtx_plain) == thrd_success); } typedef struct allocation { @@ -24,43 +25,397 @@ void* MALLOC(size_t len, const char* struct_name) { allocation* new_alloc = malloc(sizeof(allocation)); new_alloc->ptr = res; new_alloc->struct_name = struct_name; - assert(mtx_lock(&allocation_mtx) == thrd_success); + DO_ASSERT(mtx_lock(&allocation_mtx) == thrd_success); new_alloc->next = allocation_ll; allocation_ll = new_alloc; - assert(mtx_unlock(&allocation_mtx) == thrd_success); + DO_ASSERT(mtx_unlock(&allocation_mtx) == thrd_success); return res; } void FREE(void* ptr) { allocation* p = NULL; - assert(mtx_lock(&allocation_mtx) == thrd_success); + DO_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); + DO_ASSERT(mtx_unlock(&allocation_mtx) == thrd_success); + DO_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); + DO_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"); + DO_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 jbyteArray JNICALL Java_org_ldk_impl_bindings_get_1u8_1slice_1bytes (JNIEnv * _env, jclass _b, jlong slice_ptr) { + LDKu8slice *slice = (LDKu8slice*)slice_ptr; + jbyteArray ret_arr = (*_env)->NewByteArray(_env, slice->datalen); + (*_env)->SetByteArrayRegion(_env, ret_arr, 0, slice->datalen, slice->data); + return ret_arr; +} +JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_bytes_1to_1u8_1vec (JNIEnv * _env, jclass _b, jbyteArray bytes) { + LDKCVec_u8Z *vec = (LDKCVec_u8Z*)MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8"); + vec->datalen = (*_env)->GetArrayLength(_env, bytes); + vec->data = (uint8_t*)malloc(vec->datalen); // May be freed by rust, so don't track allocation + (*_env)->GetByteArrayRegion (_env, bytes, 0, vec->datalen, vec->data); + return (long)vec; +} +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 and [u8] need to have been mapped identically"); +_Static_assert(offsetof(LDKCVec_u8Z, data) == offsetof(LDKu8slice, data), "Vec and [u8] need to have been mapped identically"); +_Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKu8slice, datalen), "Vec 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"); return (long)key; } +static inline LDKAccessError LDKAccessError_from_java(JNIEnv *env, jclass val) { + switch ((*env)->CallIntMethod(env, val, ordinal_meth)) { + case 0: return LDKAccessError_UnknownChain; + case 1: return LDKAccessError_UnknownTx; + } + abort(); +} +static inline jclass LDKAccessError_to_java(JNIEnv *env, LDKAccessError val) { + // TODO: This is pretty inefficient, we really need to cache the field IDs and class + jclass enum_class = (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKAccessError;"); + DO_ASSERT(enum_class != NULL); + switch (val) { + case LDKAccessError_UnknownChain: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKAccessError_UnknownChain", "Lorg/ldk/impl/bindings$LDKAccessError;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKAccessError_UnknownTx: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKAccessError_UnknownTx", "Lorg/ldk/impl/bindings$LDKAccessError;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + default: abort(); + } +} + +static inline LDKChannelMonitorUpdateErr LDKChannelMonitorUpdateErr_from_java(JNIEnv *env, jclass val) { + switch ((*env)->CallIntMethod(env, val, ordinal_meth)) { + case 0: return LDKChannelMonitorUpdateErr_TemporaryFailure; + case 1: return LDKChannelMonitorUpdateErr_PermanentFailure; + } + abort(); +} +static inline jclass LDKChannelMonitorUpdateErr_to_java(JNIEnv *env, LDKChannelMonitorUpdateErr val) { + // TODO: This is pretty inefficient, we really need to cache the field IDs and class + jclass enum_class = (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKChannelMonitorUpdateErr;"); + DO_ASSERT(enum_class != NULL); + switch (val) { + case LDKChannelMonitorUpdateErr_TemporaryFailure: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKChannelMonitorUpdateErr_TemporaryFailure", "Lorg/ldk/impl/bindings$LDKChannelMonitorUpdateErr;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKChannelMonitorUpdateErr_PermanentFailure: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKChannelMonitorUpdateErr_PermanentFailure", "Lorg/ldk/impl/bindings$LDKChannelMonitorUpdateErr;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + default: abort(); + } +} + +static inline LDKConfirmationTarget LDKConfirmationTarget_from_java(JNIEnv *env, jclass val) { + switch ((*env)->CallIntMethod(env, val, ordinal_meth)) { + case 0: return LDKConfirmationTarget_Background; + case 1: return LDKConfirmationTarget_Normal; + case 2: return LDKConfirmationTarget_HighPriority; + } + abort(); +} +static inline jclass LDKConfirmationTarget_to_java(JNIEnv *env, LDKConfirmationTarget val) { + // TODO: This is pretty inefficient, we really need to cache the field IDs and class + jclass enum_class = (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKConfirmationTarget;"); + DO_ASSERT(enum_class != NULL); + switch (val) { + case LDKConfirmationTarget_Background: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKConfirmationTarget_Background", "Lorg/ldk/impl/bindings$LDKConfirmationTarget;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKConfirmationTarget_Normal: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKConfirmationTarget_Normal", "Lorg/ldk/impl/bindings$LDKConfirmationTarget;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKConfirmationTarget_HighPriority: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKConfirmationTarget_HighPriority", "Lorg/ldk/impl/bindings$LDKConfirmationTarget;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + default: abort(); + } +} + +static inline LDKLevel LDKLevel_from_java(JNIEnv *env, jclass val) { + switch ((*env)->CallIntMethod(env, val, ordinal_meth)) { + case 0: return LDKLevel_Off; + case 1: return LDKLevel_Error; + case 2: return LDKLevel_Warn; + case 3: return LDKLevel_Info; + case 4: return LDKLevel_Debug; + case 5: return LDKLevel_Trace; + } + abort(); +} +static inline jclass LDKLevel_to_java(JNIEnv *env, LDKLevel val) { + // TODO: This is pretty inefficient, we really need to cache the field IDs and class + jclass enum_class = (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKLevel;"); + DO_ASSERT(enum_class != NULL); + switch (val) { + case LDKLevel_Off: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKLevel_Off", "Lorg/ldk/impl/bindings$LDKLevel;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKLevel_Error: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKLevel_Error", "Lorg/ldk/impl/bindings$LDKLevel;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKLevel_Warn: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKLevel_Warn", "Lorg/ldk/impl/bindings$LDKLevel;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKLevel_Info: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKLevel_Info", "Lorg/ldk/impl/bindings$LDKLevel;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKLevel_Debug: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKLevel_Debug", "Lorg/ldk/impl/bindings$LDKLevel;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKLevel_Trace: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKLevel_Trace", "Lorg/ldk/impl/bindings$LDKLevel;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + default: abort(); + } +} + +static inline LDKNetwork LDKNetwork_from_java(JNIEnv *env, jclass val) { + switch ((*env)->CallIntMethod(env, val, ordinal_meth)) { + case 0: return LDKNetwork_Bitcoin; + case 1: return LDKNetwork_Testnet; + case 2: return LDKNetwork_Regtest; + } + abort(); +} +static inline jclass LDKNetwork_to_java(JNIEnv *env, LDKNetwork val) { + // TODO: This is pretty inefficient, we really need to cache the field IDs and class + jclass enum_class = (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKNetwork;"); + DO_ASSERT(enum_class != NULL); + switch (val) { + case LDKNetwork_Bitcoin: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKNetwork_Bitcoin", "Lorg/ldk/impl/bindings$LDKNetwork;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKNetwork_Testnet: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKNetwork_Testnet", "Lorg/ldk/impl/bindings$LDKNetwork;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKNetwork_Regtest: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKNetwork_Regtest", "Lorg/ldk/impl/bindings$LDKNetwork;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + default: abort(); + } +} + +static inline LDKSecp256k1Error LDKSecp256k1Error_from_java(JNIEnv *env, jclass val) { + switch ((*env)->CallIntMethod(env, val, ordinal_meth)) { + case 0: return LDKSecp256k1Error_IncorrectSignature; + case 1: return LDKSecp256k1Error_InvalidMessage; + case 2: return LDKSecp256k1Error_InvalidPublicKey; + case 3: return LDKSecp256k1Error_InvalidSignature; + case 4: return LDKSecp256k1Error_InvalidSecretKey; + case 5: return LDKSecp256k1Error_InvalidRecoveryId; + case 6: return LDKSecp256k1Error_InvalidTweak; + case 7: return LDKSecp256k1Error_NotEnoughMemory; + case 8: return LDKSecp256k1Error_CallbackPanicked; + } + abort(); +} +static inline jclass LDKSecp256k1Error_to_java(JNIEnv *env, LDKSecp256k1Error val) { + // TODO: This is pretty inefficient, we really need to cache the field IDs and class + jclass enum_class = (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(enum_class != NULL); + switch (val) { + case LDKSecp256k1Error_IncorrectSignature: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_IncorrectSignature", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_InvalidMessage: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_InvalidMessage", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_InvalidPublicKey: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_InvalidPublicKey", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_InvalidSignature: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_InvalidSignature", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_InvalidSecretKey: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_InvalidSecretKey", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_InvalidRecoveryId: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_InvalidRecoveryId", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_InvalidTweak: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_InvalidTweak", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_NotEnoughMemory: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_NotEnoughMemory", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + case LDKSecp256k1Error_CallbackPanicked: { + jfieldID field = (*env)->GetStaticFieldID(env, enum_class, "LDKSecp256k1Error_CallbackPanicked", "Lorg/ldk/impl/bindings$LDKSecp256k1Error;"); + DO_ASSERT(field != NULL); + return (*env)->GetStaticObjectField(env, enum_class, field); + } + default: abort(); + } +} + +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NoneChannelMonitorUpdateErrZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_NoneChannelMonitorUpdateErrZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NoneChannelMonitorUpdateErrZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_NoneChannelMonitorUpdateErrZ*)arg)->result_ok) { + return (long)((LDKCResult_NoneChannelMonitorUpdateErrZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_NoneChannelMonitorUpdateErrZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NoneMonitorUpdateErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_NoneMonitorUpdateErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NoneMonitorUpdateErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_NoneMonitorUpdateErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_NoneMonitorUpdateErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_NoneMonitorUpdateErrorZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1C2Tuple_1SignatureCVec_1SignatureZZNoneZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1C2Tuple_1SignatureCVec_1SignatureZZNoneZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg)->result_ok) { + return (long)((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1SignatureNoneZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_SignatureNoneZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1SignatureNoneZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_SignatureNoneZ*)arg)->result_ok) { + return (long)((LDKCResult_SignatureNoneZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_SignatureNoneZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1CVec_1SignatureZNoneZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_CVec_SignatureZNoneZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1CVec_1SignatureZNoneZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_CVec_SignatureZNoneZ*)arg)->result_ok) { + return (long)((LDKCResult_CVec_SignatureZNoneZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_CVec_SignatureZNoneZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NoneAPIErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_NoneAPIErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NoneAPIErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_NoneAPIErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_NoneAPIErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_NoneAPIErrorZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NonePaymentSendFailureZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_NonePaymentSendFailureZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NonePaymentSendFailureZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_NonePaymentSendFailureZ*)arg)->result_ok) { + return (long)((LDKCResult_NonePaymentSendFailureZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_NonePaymentSendFailureZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NonePeerHandleErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_NonePeerHandleErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1NonePeerHandleErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_NonePeerHandleErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_NonePeerHandleErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_NonePeerHandleErrorZ*)arg)->contents.err; + } +} typedef struct LDKMessageSendEventsProvider_JCalls { atomic_size_t refcnt; - JNIEnv *env; + JavaVM *vm; jobject o; jmethodID get_and_clear_pending_msg_events_meth; } LDKMessageSendEventsProvider_JCalls; LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_jcall(const void* this_arg) { LDKMessageSendEventsProvider_JCalls *j_calls = (LDKMessageSendEventsProvider_JCalls*) this_arg; - LDKCVec_MessageSendEventZ* ret = (LDKCVec_MessageSendEventZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_and_clear_pending_msg_events_meth); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCVec_MessageSendEventZ* ret = (LDKCVec_MessageSendEventZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_and_clear_pending_msg_events_meth); LDKCVec_MessageSendEventZ res = *ret; FREE(ret); return res; @@ -68,7 +423,9 @@ LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_jcall(const void* thi static void LDKMessageSendEventsProvider_JCalls_free(void* this_arg) { LDKMessageSendEventsProvider_JCalls *j_calls = (LDKMessageSendEventsProvider_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -79,13 +436,13 @@ static void* LDKMessageSendEventsProvider_JCalls_clone(const void* this_arg) { } static inline LDKMessageSendEventsProvider LDKMessageSendEventsProvider_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKMessageSendEventsProvider_JCalls *calls = MALLOC(sizeof(LDKMessageSendEventsProvider_JCalls), "LDKMessageSendEventsProvider_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->get_and_clear_pending_msg_events_meth = (*env)->GetMethodID(env, c, "get_and_clear_pending_msg_events", "()J"); - assert(calls->get_and_clear_pending_msg_events_meth != NULL); + DO_ASSERT(calls->get_and_clear_pending_msg_events_meth != NULL); LDKMessageSendEventsProvider ret = { .this_arg = (void*) calls, @@ -99,15 +456,27 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEventsProvider_1 *res_ptr = LDKMessageSendEventsProvider_init(env, _a, o); return (long)res_ptr; } +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; + JavaVM *vm; jobject o; jmethodID get_and_clear_pending_events_meth; } LDKEventsProvider_JCalls; LDKCVec_EventZ get_and_clear_pending_events_jcall(const void* this_arg) { LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) this_arg; - LDKCVec_EventZ* ret = (LDKCVec_EventZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_and_clear_pending_events_meth); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCVec_EventZ* ret = (LDKCVec_EventZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_and_clear_pending_events_meth); LDKCVec_EventZ res = *ret; FREE(ret); return res; @@ -115,7 +484,9 @@ LDKCVec_EventZ get_and_clear_pending_events_jcall(const void* this_arg) { static void LDKEventsProvider_JCalls_free(void* this_arg) { LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -126,13 +497,13 @@ static void* LDKEventsProvider_JCalls_clone(const void* this_arg) { } static inline LDKEventsProvider LDKEventsProvider_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKEventsProvider_JCalls *calls = MALLOC(sizeof(LDKEventsProvider_JCalls), "LDKEventsProvider_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->get_and_clear_pending_events_meth = (*env)->GetMethodID(env, c, "get_and_clear_pending_events", "()J"); - assert(calls->get_and_clear_pending_events_meth != NULL); + DO_ASSERT(calls->get_and_clear_pending_events_meth != NULL); LDKEventsProvider ret = { .this_arg = (void*) calls, @@ -146,21 +517,35 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKEventsProvider_1new (JNIEnv *res_ptr = LDKEventsProvider_init(env, _a, o); return (long)res_ptr; } +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; + JavaVM *vm; jobject o; jmethodID log_meth; } LDKLogger_JCalls; void log_jcall(const void* this_arg, const char *record) { LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg; - jstring record_conv = (*j_calls->env)->NewStringUTF(j_calls->env, record); - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->log_meth, record_conv); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + jstring record_conv = (*env)->NewStringUTF(env, record); + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->log_meth, record_conv); } static void LDKLogger_JCalls_free(void* this_arg) { LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -171,13 +556,13 @@ static void* LDKLogger_JCalls_clone(const void* this_arg) { } static inline LDKLogger LDKLogger_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKLogger_JCalls *calls = MALLOC(sizeof(LDKLogger_JCalls), "LDKLogger_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->log_meth = (*env)->GetMethodID(env, c, "log", "(Ljava/lang/String;)V"); - assert(calls->log_meth != NULL); + DO_ASSERT(calls->log_meth != NULL); LDKLogger ret = { .this_arg = (void*) calls, @@ -191,341 +576,211 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKLogger_1new (JNIEnv * env, *res_ptr = LDKLogger_init(env, _a, o); return (long)res_ptr; } -typedef struct LDKChainWatchInterface_JCalls { - atomic_size_t refcnt; - JNIEnv *env; - jobject o; - jmethodID install_watch_tx_meth; - jmethodID install_watch_outpoint_meth; - jmethodID watch_all_txn_meth; - jmethodID get_chain_utxo_meth; - jmethodID filter_block_meth; - jmethodID reentered_meth; -} LDKChainWatchInterface_JCalls; -void install_watch_tx_jcall(const void* this_arg, const uint8_t (*txid)[32], LDKu8slice script_pub_key) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - jbyteArray txid_arr = (*j_calls->env)->NewByteArray(j_calls->env, 32); - (*j_calls->env)->SetByteArrayRegion(j_calls->env, txid_arr, 0, 32, *txid); - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->install_watch_tx_meth, txid_arr, script_pub_key); -} -void install_watch_outpoint_jcall(const void* this_arg, LDKC2Tuple_Txidu32Z outpoint, LDKu8slice out_script) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->install_watch_outpoint_meth, outpoint, out_script); -} -void watch_all_txn_jcall(const void* this_arg) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->watch_all_txn_meth); -} -LDKCResult_C2Tuple_Scriptu64ZChainErrorZ get_chain_utxo_jcall(const void* this_arg, LDKThirtyTwoBytes genesis_hash, uint64_t unspent_tx_output_identifier) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - LDKCResult_C2Tuple_Scriptu64ZChainErrorZ* ret = (LDKCResult_C2Tuple_Scriptu64ZChainErrorZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_chain_utxo_meth, genesis_hash, unspent_tx_output_identifier); - LDKCResult_C2Tuple_Scriptu64ZChainErrorZ res = *ret; - FREE(ret); - return res; -} -LDKCVec_usizeZ filter_block_jcall(const void* this_arg, LDKu8slice block) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - LDKCVec_usizeZ* ret = (LDKCVec_usizeZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->filter_block_meth, block); - LDKCVec_usizeZ res = *ret; - FREE(ret); - return res; +JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKLogger_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) { + return ((LDKLogger_JCalls*)val)->o; } -uintptr_t reentered_jcall(const void* this_arg) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - uintptr_t* ret = (uintptr_t*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->reentered_meth); - uintptr_t res = *ret; - FREE(ret); - return res; +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1TxOutAccessErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_TxOutAccessErrorZ*)arg)->result_ok; } -static void LDKChainWatchInterface_JCalls_free(void* this_arg) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); - FREE(j_calls); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1TxOutAccessErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_TxOutAccessErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_TxOutAccessErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_TxOutAccessErrorZ*)arg)->contents.err; } } -static void* LDKChainWatchInterface_JCalls_clone(const void* this_arg) { - LDKChainWatchInterface_JCalls *j_calls = (LDKChainWatchInterface_JCalls*) this_arg; - atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); - return (void*) this_arg; -} -static inline LDKChainWatchInterface LDKChainWatchInterface_init (JNIEnv * env, jclass _a, jobject o) { - jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); - LDKChainWatchInterface_JCalls *calls = MALLOC(sizeof(LDKChainWatchInterface_JCalls), "LDKChainWatchInterface_JCalls"); - atomic_init(&calls->refcnt, 1); - calls->env = env; - calls->o = (*env)->NewGlobalRef(env, o); - calls->install_watch_tx_meth = (*env)->GetMethodID(env, c, "install_watch_tx", "([BJ)V"); - assert(calls->install_watch_tx_meth != NULL); - calls->install_watch_outpoint_meth = (*env)->GetMethodID(env, c, "install_watch_outpoint", "(JJ)V"); - assert(calls->install_watch_outpoint_meth != NULL); - calls->watch_all_txn_meth = (*env)->GetMethodID(env, c, "watch_all_txn", "()V"); - assert(calls->watch_all_txn_meth != NULL); - calls->get_chain_utxo_meth = (*env)->GetMethodID(env, c, "get_chain_utxo", "(JJ)J"); - assert(calls->get_chain_utxo_meth != NULL); - calls->filter_block_meth = (*env)->GetMethodID(env, c, "filter_block", "(J)J"); - assert(calls->filter_block_meth != NULL); - calls->reentered_meth = (*env)->GetMethodID(env, c, "reentered", "()J"); - assert(calls->reentered_meth != NULL); - - LDKChainWatchInterface ret = { - .this_arg = (void*) calls, - .install_watch_tx = install_watch_tx_jcall, - .install_watch_outpoint = install_watch_outpoint_jcall, - .watch_all_txn = watch_all_txn_jcall, - .get_chain_utxo = get_chain_utxo_jcall, - .filter_block = filter_block_jcall, - .reentered = reentered_jcall, - .free = LDKChainWatchInterface_JCalls_free, - }; - return ret; -} -JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKChainWatchInterface_1new (JNIEnv * env, jclass _a, jobject o) { - LDKChainWatchInterface *res_ptr = MALLOC(sizeof(LDKChainWatchInterface), "LDKChainWatchInterface"); - *res_ptr = LDKChainWatchInterface_init(env, _a, o); - return (long)res_ptr; -} -typedef struct LDKBroadcasterInterface_JCalls { +typedef struct LDKAccess_JCalls { atomic_size_t refcnt; - JNIEnv *env; + JavaVM *vm; jobject o; - jmethodID broadcast_transaction_meth; -} LDKBroadcasterInterface_JCalls; -void broadcast_transaction_jcall(const void* this_arg, LDKTransaction tx) { - LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->broadcast_transaction_meth, tx); -} -static void LDKBroadcasterInterface_JCalls_free(void* this_arg) { - LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) this_arg; - if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); - FREE(j_calls); - } -} -static void* LDKBroadcasterInterface_JCalls_clone(const void* this_arg) { - LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) this_arg; - atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); - return (void*) this_arg; -} -static inline LDKBroadcasterInterface LDKBroadcasterInterface_init (JNIEnv * env, jclass _a, jobject o) { - jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); - LDKBroadcasterInterface_JCalls *calls = MALLOC(sizeof(LDKBroadcasterInterface_JCalls), "LDKBroadcasterInterface_JCalls"); - atomic_init(&calls->refcnt, 1); - calls->env = env; - calls->o = (*env)->NewGlobalRef(env, o); - calls->broadcast_transaction_meth = (*env)->GetMethodID(env, c, "broadcast_transaction", "(J)V"); - assert(calls->broadcast_transaction_meth != NULL); - - LDKBroadcasterInterface ret = { - .this_arg = (void*) calls, - .broadcast_transaction = broadcast_transaction_jcall, - .free = LDKBroadcasterInterface_JCalls_free, - }; - return ret; -} -JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1new (JNIEnv * env, jclass _a, jobject o) { - LDKBroadcasterInterface *res_ptr = MALLOC(sizeof(LDKBroadcasterInterface), "LDKBroadcasterInterface"); - *res_ptr = LDKBroadcasterInterface_init(env, _a, o); - return (long)res_ptr; -} -typedef struct LDKChainListener_JCalls { - atomic_size_t refcnt; + jmethodID get_utxo_meth; +} LDKAccess_JCalls; +LDKCResult_TxOutAccessErrorZ get_utxo_jcall(const void* this_arg, const uint8_t (*genesis_hash)[32], uint64_t short_channel_id) { + LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg; JNIEnv *env; - jobject o; - jmethodID block_connected_meth; - jmethodID block_disconnected_meth; -} LDKChainListener_JCalls; -void block_connected_jcall(const void* this_arg, const uint8_t (*header)[80], uint32_t height, LDKCVec_TransactionZ txn_matched, LDKusizeslice indexes_of_txn_matched) { - LDKChainListener_JCalls *j_calls = (LDKChainListener_JCalls*) this_arg; - jbyteArray header_arr = (*j_calls->env)->NewByteArray(j_calls->env, 80); - (*j_calls->env)->SetByteArrayRegion(j_calls->env, header_arr, 0, 80, *header); - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->block_connected_meth, header_arr, height, txn_matched, indexes_of_txn_matched); -} -void block_disconnected_jcall(const void* this_arg, const uint8_t (*header)[80], uint32_t disconnected_height) { - LDKChainListener_JCalls *j_calls = (LDKChainListener_JCalls*) this_arg; - jbyteArray header_arr = (*j_calls->env)->NewByteArray(j_calls->env, 80); - (*j_calls->env)->SetByteArrayRegion(j_calls->env, header_arr, 0, 80, *header); - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->block_disconnected_meth, header_arr, disconnected_height); -} -static void LDKChainListener_JCalls_free(void* this_arg) { - LDKChainListener_JCalls *j_calls = (LDKChainListener_JCalls*) this_arg; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + jbyteArray genesis_hash_arr = (*env)->NewByteArray(env, 32); + (*env)->SetByteArrayRegion(env, genesis_hash_arr, 0, 32, *genesis_hash); + LDKCResult_TxOutAccessErrorZ* ret = (LDKCResult_TxOutAccessErrorZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_utxo_meth, genesis_hash_arr, short_channel_id); + LDKCResult_TxOutAccessErrorZ res = *ret; + FREE(ret); + return res; +} +static void LDKAccess_JCalls_free(void* this_arg) { + LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } -static void* LDKChainListener_JCalls_clone(const void* this_arg) { - LDKChainListener_JCalls *j_calls = (LDKChainListener_JCalls*) this_arg; +static void* LDKAccess_JCalls_clone(const void* this_arg) { + LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg; atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); return (void*) this_arg; } -static inline LDKChainListener LDKChainListener_init (JNIEnv * env, jclass _a, jobject o) { +static inline LDKAccess LDKAccess_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); - LDKChainListener_JCalls *calls = MALLOC(sizeof(LDKChainListener_JCalls), "LDKChainListener_JCalls"); + DO_ASSERT(c != NULL); + LDKAccess_JCalls *calls = MALLOC(sizeof(LDKAccess_JCalls), "LDKAccess_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); - calls->block_connected_meth = (*env)->GetMethodID(env, c, "block_connected", "([BIJJ)V"); - assert(calls->block_connected_meth != NULL); - calls->block_disconnected_meth = (*env)->GetMethodID(env, c, "block_disconnected", "([BI)V"); - assert(calls->block_disconnected_meth != NULL); + calls->get_utxo_meth = (*env)->GetMethodID(env, c, "get_utxo", "([BJ)J"); + DO_ASSERT(calls->get_utxo_meth != NULL); - LDKChainListener ret = { + LDKAccess ret = { .this_arg = (void*) calls, - .block_connected = block_connected_jcall, - .block_disconnected = block_disconnected_jcall, - .free = LDKChainListener_JCalls_free, + .get_utxo = get_utxo_jcall, + .free = LDKAccess_JCalls_free, }; return ret; } -JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKChainListener_1new (JNIEnv * env, jclass _a, jobject o) { - LDKChainListener *res_ptr = MALLOC(sizeof(LDKChainListener), "LDKChainListener"); - *res_ptr = LDKChainListener_init(env, _a, o); +JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKAccess_1new (JNIEnv * env, jclass _a, jobject o) { + LDKAccess *res_ptr = MALLOC(sizeof(LDKAccess), "LDKAccess"); + *res_ptr = LDKAccess_init(env, _a, o); return (long)res_ptr; } -typedef struct LDKFeeEstimator_JCalls { - atomic_size_t refcnt; - JNIEnv *env; - jobject o; - jmethodID get_est_sat_per_1000_weight_meth; -} LDKFeeEstimator_JCalls; -uint32_t get_est_sat_per_1000_weight_jcall(const void* this_arg, LDKConfirmationTarget confirmation_target) { - LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; - return (*j_calls->env)->CallIntMethod(j_calls->env, j_calls->o, j_calls->get_est_sat_per_1000_weight_meth, confirmation_target); -} -static void LDKFeeEstimator_JCalls_free(void* this_arg) { - LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; - if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); - FREE(j_calls); - } +JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKAccess_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) { + return ((LDKAccess_JCalls*)val)->o; } -static void* LDKFeeEstimator_JCalls_clone(const void* this_arg) { - LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; - atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); - return (void*) this_arg; +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; } -static inline LDKFeeEstimator LDKFeeEstimator_init (JNIEnv * env, jclass _a, jobject o) { - jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); - LDKFeeEstimator_JCalls *calls = MALLOC(sizeof(LDKFeeEstimator_JCalls), "LDKFeeEstimator_JCalls"); - atomic_init(&calls->refcnt, 1); - calls->env = env; - calls->o = (*env)->NewGlobalRef(env, o); - calls->get_est_sat_per_1000_weight_meth = (*env)->GetMethodID(env, c, "get_est_sat_per_1000_weight", "(J)I"); - assert(calls->get_est_sat_per_1000_weight_meth != NULL); - LDKFeeEstimator ret = { - .this_arg = (void*) calls, - .get_est_sat_per_1000_weight = get_est_sat_per_1000_weight_jcall, - .free = LDKFeeEstimator_JCalls_free, - }; - return ret; -} -JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1new (JNIEnv * env, jclass _a, jobject o) { - LDKFeeEstimator *res_ptr = MALLOC(sizeof(LDKFeeEstimator), "LDKFeeEstimator"); - *res_ptr = LDKFeeEstimator_init(env, _a, o); - return (long)res_ptr; -} typedef struct LDKChannelKeys_JCalls { atomic_size_t refcnt; - JNIEnv *env; + JavaVM *vm; jobject o; jmethodID get_per_commitment_point_meth; jmethodID release_commitment_secret_meth; jmethodID key_derivation_params_meth; - jmethodID sign_remote_commitment_meth; - jmethodID sign_local_commitment_meth; - jmethodID sign_local_commitment_htlc_transactions_meth; + jmethodID sign_counterparty_commitment_meth; + jmethodID sign_holder_commitment_meth; + jmethodID sign_holder_commitment_htlc_transactions_meth; jmethodID sign_justice_transaction_meth; - jmethodID sign_remote_htlc_transaction_meth; + jmethodID sign_counterparty_htlc_transaction_meth; jmethodID sign_closing_transaction_meth; jmethodID sign_channel_announcement_meth; jmethodID on_accept_meth; } LDKChannelKeys_JCalls; LDKPublicKey get_per_commitment_point_jcall(const void* this_arg, uint64_t idx) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKPublicKey* ret = (LDKPublicKey*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_per_commitment_point_meth, idx); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKPublicKey* ret = (LDKPublicKey*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_per_commitment_point_meth, idx); LDKPublicKey res = *ret; FREE(ret); return res; } LDKThirtyTwoBytes release_commitment_secret_jcall(const void* this_arg, uint64_t idx) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKThirtyTwoBytes* ret = (LDKThirtyTwoBytes*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->release_commitment_secret_meth, idx); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKThirtyTwoBytes* ret = (LDKThirtyTwoBytes*)(*env)->CallLongMethod(env, j_calls->o, j_calls->release_commitment_secret_meth, idx); LDKThirtyTwoBytes res = *ret; FREE(ret); return res; } LDKC2Tuple_u64u64Z key_derivation_params_jcall(const void* this_arg) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKC2Tuple_u64u64Z* ret = (LDKC2Tuple_u64u64Z*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->key_derivation_params_meth); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKC2Tuple_u64u64Z* ret = (LDKC2Tuple_u64u64Z*)(*env)->CallLongMethod(env, j_calls->o, j_calls->key_derivation_params_meth); LDKC2Tuple_u64u64Z res = *ret; FREE(ret); return res; } -LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_remote_commitment_jcall(const void* this_arg, uint32_t feerate_per_kw, LDKTransaction commitment_tx, const LDKPreCalculatedTxCreationKeys *keys, LDKCVec_HTLCOutputInCommitmentZ htlcs) { +LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_jcall(const void* this_arg, uint32_t feerate_per_kw, LDKTransaction commitment_tx, const LDKPreCalculatedTxCreationKeys *keys, LDKCVec_HTLCOutputInCommitmentZ htlcs) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->sign_remote_commitment_meth, feerate_per_kw, commitment_tx, keys, htlcs); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long commitment_tx_ref = (long)&commitment_tx; + long htlcs_ref = (long)&htlcs; + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->sign_counterparty_commitment_meth, feerate_per_kw, commitment_tx_ref, keys, htlcs_ref); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ res = *ret; FREE(ret); return res; } -LDKCResult_SignatureNoneZ sign_local_commitment_jcall(const void* this_arg, const LDKLocalCommitmentTransaction *local_commitment_tx) { +LDKCResult_SignatureNoneZ sign_holder_commitment_jcall(const void* this_arg, const LDKHolderCommitmentTransaction *holder_commitment_tx) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->sign_local_commitment_meth, local_commitment_tx); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->sign_holder_commitment_meth, holder_commitment_tx); LDKCResult_SignatureNoneZ res = *ret; FREE(ret); return res; } -LDKCResult_CVec_SignatureZNoneZ sign_local_commitment_htlc_transactions_jcall(const void* this_arg, const LDKLocalCommitmentTransaction *local_commitment_tx) { +LDKCResult_CVec_SignatureZNoneZ sign_holder_commitment_htlc_transactions_jcall(const void* this_arg, const LDKHolderCommitmentTransaction *holder_commitment_tx) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKCResult_CVec_SignatureZNoneZ* ret = (LDKCResult_CVec_SignatureZNoneZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->sign_local_commitment_htlc_transactions_meth, local_commitment_tx); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCResult_CVec_SignatureZNoneZ* ret = (LDKCResult_CVec_SignatureZNoneZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->sign_holder_commitment_htlc_transactions_meth, holder_commitment_tx); LDKCResult_CVec_SignatureZNoneZ res = *ret; FREE(ret); return res; } LDKCResult_SignatureNoneZ sign_justice_transaction_jcall(const void* this_arg, LDKTransaction justice_tx, uintptr_t input, uint64_t amount, const uint8_t (*per_commitment_key)[32], const LDKHTLCOutputInCommitment *htlc) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - jbyteArray per_commitment_key_arr = (*j_calls->env)->NewByteArray(j_calls->env, 32); - (*j_calls->env)->SetByteArrayRegion(j_calls->env, per_commitment_key_arr, 0, 32, *per_commitment_key); - LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->sign_justice_transaction_meth, justice_tx, input, amount, per_commitment_key_arr, htlc); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long justice_tx_ref = (long)&justice_tx; + jbyteArray per_commitment_key_arr = (*env)->NewByteArray(env, 32); + (*env)->SetByteArrayRegion(env, per_commitment_key_arr, 0, 32, *per_commitment_key); + LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->sign_justice_transaction_meth, justice_tx_ref, input, amount, per_commitment_key_arr, htlc); LDKCResult_SignatureNoneZ res = *ret; FREE(ret); return res; } -LDKCResult_SignatureNoneZ sign_remote_htlc_transaction_jcall(const void* this_arg, LDKTransaction htlc_tx, uintptr_t input, uint64_t amount, LDKPublicKey per_commitment_point, const LDKHTLCOutputInCommitment *htlc) { +LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_jcall(const void* this_arg, LDKTransaction htlc_tx, uintptr_t input, uint64_t amount, LDKPublicKey per_commitment_point, const LDKHTLCOutputInCommitment *htlc) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->sign_remote_htlc_transaction_meth, htlc_tx, input, amount, per_commitment_point, htlc); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long htlc_tx_ref = (long)&htlc_tx; + long per_commitment_point_ref = (long)&per_commitment_point; + LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->sign_counterparty_htlc_transaction_meth, htlc_tx_ref, input, amount, per_commitment_point_ref, htlc); LDKCResult_SignatureNoneZ res = *ret; FREE(ret); return res; } LDKCResult_SignatureNoneZ sign_closing_transaction_jcall(const void* this_arg, LDKTransaction closing_tx) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->sign_closing_transaction_meth, closing_tx); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long closing_tx_ref = (long)&closing_tx; + LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->sign_closing_transaction_meth, closing_tx_ref); LDKCResult_SignatureNoneZ res = *ret; FREE(ret); return res; } LDKCResult_SignatureNoneZ sign_channel_announcement_jcall(const void* this_arg, const LDKUnsignedChannelAnnouncement *msg) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->sign_channel_announcement_meth, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->sign_channel_announcement_meth, msg); LDKCResult_SignatureNoneZ res = *ret; FREE(ret); return res; } -void on_accept_jcall(void* this_arg, const LDKChannelPublicKeys *channel_points, uint16_t remote_to_self_delay, uint16_t local_to_self_delay) { +void on_accept_jcall(void* this_arg, const LDKChannelPublicKeys *channel_points, uint16_t counterparty_selected_contest_delay, uint16_t holder_selected_contest_delay) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->on_accept_meth, channel_points, remote_to_self_delay, local_to_self_delay); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->on_accept_meth, channel_points, counterparty_selected_contest_delay, holder_selected_contest_delay); } static void LDKChannelKeys_JCalls_free(void* this_arg) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -536,44 +791,44 @@ static void* LDKChannelKeys_JCalls_clone(const void* this_arg) { } static inline LDKChannelKeys LDKChannelKeys_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKChannelKeys_JCalls *calls = MALLOC(sizeof(LDKChannelKeys_JCalls), "LDKChannelKeys_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->get_per_commitment_point_meth = (*env)->GetMethodID(env, c, "get_per_commitment_point", "(J)J"); - assert(calls->get_per_commitment_point_meth != NULL); + DO_ASSERT(calls->get_per_commitment_point_meth != NULL); calls->release_commitment_secret_meth = (*env)->GetMethodID(env, c, "release_commitment_secret", "(J)J"); - assert(calls->release_commitment_secret_meth != NULL); + DO_ASSERT(calls->release_commitment_secret_meth != NULL); calls->key_derivation_params_meth = (*env)->GetMethodID(env, c, "key_derivation_params", "()J"); - assert(calls->key_derivation_params_meth != NULL); - calls->sign_remote_commitment_meth = (*env)->GetMethodID(env, c, "sign_remote_commitment", "(IJJJ)J"); - assert(calls->sign_remote_commitment_meth != NULL); - calls->sign_local_commitment_meth = (*env)->GetMethodID(env, c, "sign_local_commitment", "(J)J"); - assert(calls->sign_local_commitment_meth != NULL); - calls->sign_local_commitment_htlc_transactions_meth = (*env)->GetMethodID(env, c, "sign_local_commitment_htlc_transactions", "(J)J"); - assert(calls->sign_local_commitment_htlc_transactions_meth != NULL); + DO_ASSERT(calls->key_derivation_params_meth != NULL); + calls->sign_counterparty_commitment_meth = (*env)->GetMethodID(env, c, "sign_counterparty_commitment", "(IJJJ)J"); + DO_ASSERT(calls->sign_counterparty_commitment_meth != NULL); + calls->sign_holder_commitment_meth = (*env)->GetMethodID(env, c, "sign_holder_commitment", "(J)J"); + DO_ASSERT(calls->sign_holder_commitment_meth != NULL); + calls->sign_holder_commitment_htlc_transactions_meth = (*env)->GetMethodID(env, c, "sign_holder_commitment_htlc_transactions", "(J)J"); + DO_ASSERT(calls->sign_holder_commitment_htlc_transactions_meth != NULL); calls->sign_justice_transaction_meth = (*env)->GetMethodID(env, c, "sign_justice_transaction", "(JJJ[BJ)J"); - assert(calls->sign_justice_transaction_meth != NULL); - calls->sign_remote_htlc_transaction_meth = (*env)->GetMethodID(env, c, "sign_remote_htlc_transaction", "(JJJJJ)J"); - assert(calls->sign_remote_htlc_transaction_meth != NULL); + DO_ASSERT(calls->sign_justice_transaction_meth != NULL); + calls->sign_counterparty_htlc_transaction_meth = (*env)->GetMethodID(env, c, "sign_counterparty_htlc_transaction", "(JJJJJ)J"); + DO_ASSERT(calls->sign_counterparty_htlc_transaction_meth != NULL); calls->sign_closing_transaction_meth = (*env)->GetMethodID(env, c, "sign_closing_transaction", "(J)J"); - assert(calls->sign_closing_transaction_meth != NULL); + DO_ASSERT(calls->sign_closing_transaction_meth != NULL); calls->sign_channel_announcement_meth = (*env)->GetMethodID(env, c, "sign_channel_announcement", "(J)J"); - assert(calls->sign_channel_announcement_meth != NULL); + DO_ASSERT(calls->sign_channel_announcement_meth != NULL); calls->on_accept_meth = (*env)->GetMethodID(env, c, "on_accept", "(JSS)V"); - assert(calls->on_accept_meth != NULL); + DO_ASSERT(calls->on_accept_meth != NULL); LDKChannelKeys ret = { .this_arg = (void*) calls, .get_per_commitment_point = get_per_commitment_point_jcall, .release_commitment_secret = release_commitment_secret_jcall, .key_derivation_params = key_derivation_params_jcall, - .sign_remote_commitment = sign_remote_commitment_jcall, - .sign_local_commitment = sign_local_commitment_jcall, - .sign_local_commitment_htlc_transactions = sign_local_commitment_htlc_transactions_jcall, + .sign_counterparty_commitment = sign_counterparty_commitment_jcall, + .sign_holder_commitment = sign_holder_commitment_jcall, + .sign_holder_commitment_htlc_transactions = sign_holder_commitment_htlc_transactions_jcall, .sign_justice_transaction = sign_justice_transaction_jcall, - .sign_remote_htlc_transaction = sign_remote_htlc_transaction_jcall, + .sign_counterparty_htlc_transaction = sign_counterparty_htlc_transaction_jcall, .sign_closing_transaction = sign_closing_transaction_jcall, .sign_channel_announcement = sign_channel_announcement_jcall, .on_accept = on_accept_jcall, @@ -587,47 +842,472 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1new (JNIEnv * *res_ptr = LDKChannelKeys_init(env, _a, o); return (long)res_ptr; } -typedef struct LDKKeysInterface_JCalls { +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; + JavaVM *vm; jobject o; - jmethodID get_node_secret_meth; - jmethodID get_destination_script_meth; - jmethodID get_shutdown_pubkey_meth; - jmethodID get_channel_keys_meth; - jmethodID get_secure_random_bytes_meth; -} LDKKeysInterface_JCalls; -LDKSecretKey get_node_secret_jcall(const void* this_arg) { - LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - LDKSecretKey* ret = (LDKSecretKey*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_node_secret_meth); - LDKSecretKey res = *ret; + jmethodID watch_channel_meth; + jmethodID update_channel_meth; + jmethodID release_pending_monitor_events_meth; +} LDKWatch_JCalls; +LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitor monitor) { + LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long funding_txo_ref = (long)&funding_txo; + long monitor_ref = (long)&monitor; + LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->watch_channel_meth, funding_txo_ref, monitor_ref); + LDKCResult_NoneChannelMonitorUpdateErrZ res = *ret; FREE(ret); return res; } -LDKCVec_u8Z get_destination_script_jcall(const void* this_arg) { - LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - LDKCVec_u8Z* ret = (LDKCVec_u8Z*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_destination_script_meth); - LDKCVec_u8Z res = *ret; +LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitorUpdate update) { + LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long funding_txo_ref = (long)&funding_txo; + long update_ref = (long)&update; + LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->update_channel_meth, funding_txo_ref, update_ref); + LDKCResult_NoneChannelMonitorUpdateErrZ res = *ret; FREE(ret); return res; } -LDKPublicKey get_shutdown_pubkey_jcall(const void* this_arg) { +LDKCVec_MonitorEventZ release_pending_monitor_events_jcall(const void* this_arg) { + LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCVec_MonitorEventZ* ret = (LDKCVec_MonitorEventZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->release_pending_monitor_events_meth); + LDKCVec_MonitorEventZ res = *ret; + FREE(ret); + return res; +} +static void LDKWatch_JCalls_free(void* this_arg) { + LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; + if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); + FREE(j_calls); + } +} +static void* LDKWatch_JCalls_clone(const void* this_arg) { + LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; + atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); + return (void*) this_arg; +} +static inline LDKWatch LDKWatch_init (JNIEnv * env, jclass _a, jobject o) { + jclass c = (*env)->GetObjectClass(env, o); + DO_ASSERT(c != NULL); + LDKWatch_JCalls *calls = MALLOC(sizeof(LDKWatch_JCalls), "LDKWatch_JCalls"); + atomic_init(&calls->refcnt, 1); + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); + calls->o = (*env)->NewGlobalRef(env, o); + calls->watch_channel_meth = (*env)->GetMethodID(env, c, "watch_channel", "(JJ)J"); + DO_ASSERT(calls->watch_channel_meth != NULL); + calls->update_channel_meth = (*env)->GetMethodID(env, c, "update_channel", "(JJ)J"); + DO_ASSERT(calls->update_channel_meth != NULL); + calls->release_pending_monitor_events_meth = (*env)->GetMethodID(env, c, "release_pending_monitor_events", "()J"); + DO_ASSERT(calls->release_pending_monitor_events_meth != NULL); + + LDKWatch ret = { + .this_arg = (void*) calls, + .watch_channel = watch_channel_jcall, + .update_channel = update_channel_jcall, + .release_pending_monitor_events = release_pending_monitor_events_jcall, + .free = LDKWatch_JCalls_free, + }; + return ret; +} +JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKWatch_1new (JNIEnv * env, jclass _a, jobject o) { + LDKWatch *res_ptr = MALLOC(sizeof(LDKWatch), "LDKWatch"); + *res_ptr = LDKWatch_init(env, _a, o); + return (long)res_ptr; +} +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; + JavaVM *vm; + jobject o; + jmethodID register_tx_meth; + jmethodID register_output_meth; +} LDKFilter_JCalls; +void register_tx_jcall(const void* this_arg, const uint8_t (*txid)[32], LDKu8slice script_pubkey) { + LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + jbyteArray txid_arr = (*env)->NewByteArray(env, 32); + (*env)->SetByteArrayRegion(env, txid_arr, 0, 32, *txid); + long script_pubkey_ref = (long)&script_pubkey; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->register_tx_meth, txid_arr, script_pubkey_ref); +} +void register_output_jcall(const void* this_arg, const LDKOutPoint *outpoint, LDKu8slice script_pubkey) { + LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long script_pubkey_ref = (long)&script_pubkey; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->register_output_meth, outpoint, script_pubkey_ref); +} +static void LDKFilter_JCalls_free(void* this_arg) { + LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; + if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); + FREE(j_calls); + } +} +static void* LDKFilter_JCalls_clone(const void* this_arg) { + LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; + atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); + return (void*) this_arg; +} +static inline LDKFilter LDKFilter_init (JNIEnv * env, jclass _a, jobject o) { + jclass c = (*env)->GetObjectClass(env, o); + DO_ASSERT(c != NULL); + LDKFilter_JCalls *calls = MALLOC(sizeof(LDKFilter_JCalls), "LDKFilter_JCalls"); + atomic_init(&calls->refcnt, 1); + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); + calls->o = (*env)->NewGlobalRef(env, o); + calls->register_tx_meth = (*env)->GetMethodID(env, c, "register_tx", "([BJ)V"); + DO_ASSERT(calls->register_tx_meth != NULL); + calls->register_output_meth = (*env)->GetMethodID(env, c, "register_output", "(JJ)V"); + DO_ASSERT(calls->register_output_meth != NULL); + + LDKFilter ret = { + .this_arg = (void*) calls, + .register_tx = register_tx_jcall, + .register_output = register_output_jcall, + .free = LDKFilter_JCalls_free, + }; + return ret; +} +JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKFilter_1new (JNIEnv * env, jclass _a, jobject o) { + LDKFilter *res_ptr = MALLOC(sizeof(LDKFilter), "LDKFilter"); + *res_ptr = LDKFilter_init(env, _a, o); + return (long)res_ptr; +} +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; + 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; + return (arg_conv->register_output)(arg_conv->this_arg, outpoint_conv, script_pubkey_conv); +} + +typedef struct LDKBroadcasterInterface_JCalls { + atomic_size_t refcnt; + JavaVM *vm; + jobject o; + jmethodID broadcast_transaction_meth; +} LDKBroadcasterInterface_JCalls; +void broadcast_transaction_jcall(const void* this_arg, LDKTransaction tx) { + LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long tx_ref = (long)&tx; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->broadcast_transaction_meth, tx_ref); +} +static void LDKBroadcasterInterface_JCalls_free(void* this_arg) { + LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) this_arg; + if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); + FREE(j_calls); + } +} +static void* LDKBroadcasterInterface_JCalls_clone(const void* this_arg) { + LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) this_arg; + atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); + return (void*) this_arg; +} +static inline LDKBroadcasterInterface LDKBroadcasterInterface_init (JNIEnv * env, jclass _a, jobject o) { + jclass c = (*env)->GetObjectClass(env, o); + DO_ASSERT(c != NULL); + LDKBroadcasterInterface_JCalls *calls = MALLOC(sizeof(LDKBroadcasterInterface_JCalls), "LDKBroadcasterInterface_JCalls"); + atomic_init(&calls->refcnt, 1); + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); + calls->o = (*env)->NewGlobalRef(env, o); + calls->broadcast_transaction_meth = (*env)->GetMethodID(env, c, "broadcast_transaction", "(J)V"); + DO_ASSERT(calls->broadcast_transaction_meth != NULL); + + LDKBroadcasterInterface ret = { + .this_arg = (void*) calls, + .broadcast_transaction = broadcast_transaction_jcall, + .free = LDKBroadcasterInterface_JCalls_free, + }; + return ret; +} +JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKBroadcasterInterface_1new (JNIEnv * env, jclass _a, jobject o) { + LDKBroadcasterInterface *res_ptr = MALLOC(sizeof(LDKBroadcasterInterface), "LDKBroadcasterInterface"); + *res_ptr = LDKBroadcasterInterface_init(env, _a, o); + return (long)res_ptr; +} +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; + JavaVM *vm; + jobject o; + jmethodID get_est_sat_per_1000_weight_meth; +} LDKFeeEstimator_JCalls; +uint32_t get_est_sat_per_1000_weight_jcall(const void* this_arg, LDKConfirmationTarget confirmation_target) { + LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + jclass confirmation_target_conv = LDKConfirmationTarget_to_java(env, confirmation_target); + return (*env)->CallIntMethod(env, j_calls->o, j_calls->get_est_sat_per_1000_weight_meth, confirmation_target_conv); +} +static void LDKFeeEstimator_JCalls_free(void* this_arg) { + LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; + if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); + FREE(j_calls); + } +} +static void* LDKFeeEstimator_JCalls_clone(const void* this_arg) { + LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; + atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); + return (void*) this_arg; +} +static inline LDKFeeEstimator LDKFeeEstimator_init (JNIEnv * env, jclass _a, jobject o) { + jclass c = (*env)->GetObjectClass(env, o); + DO_ASSERT(c != NULL); + LDKFeeEstimator_JCalls *calls = MALLOC(sizeof(LDKFeeEstimator_JCalls), "LDKFeeEstimator_JCalls"); + atomic_init(&calls->refcnt, 1); + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); + calls->o = (*env)->NewGlobalRef(env, o); + calls->get_est_sat_per_1000_weight_meth = (*env)->GetMethodID(env, c, "get_est_sat_per_1000_weight", "(Lorg/ldk/impl/bindings$LDKConfirmationTarget;)I"); + DO_ASSERT(calls->get_est_sat_per_1000_weight_meth != NULL); + + LDKFeeEstimator ret = { + .this_arg = (void*) calls, + .get_est_sat_per_1000_weight = get_est_sat_per_1000_weight_jcall, + .free = LDKFeeEstimator_JCalls_free, + }; + return ret; +} +JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKFeeEstimator_1new (JNIEnv * env, jclass _a, jobject o) { + LDKFeeEstimator *res_ptr = MALLOC(sizeof(LDKFeeEstimator), "LDKFeeEstimator"); + *res_ptr = LDKFeeEstimator_init(env, _a, o); + return (long)res_ptr; +} +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; + JavaVM *vm; + jobject o; + jmethodID get_node_secret_meth; + jmethodID get_destination_script_meth; + jmethodID get_shutdown_pubkey_meth; + jmethodID get_channel_keys_meth; + jmethodID get_secure_random_bytes_meth; +} LDKKeysInterface_JCalls; +LDKSecretKey get_node_secret_jcall(const void* this_arg) { + LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKSecretKey* ret = (LDKSecretKey*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_node_secret_meth); + LDKSecretKey res = *ret; + FREE(ret); + return res; +} +LDKCVec_u8Z get_destination_script_jcall(const void* this_arg) { + LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCVec_u8Z* ret = (LDKCVec_u8Z*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_destination_script_meth); + LDKCVec_u8Z res = *ret; + FREE(ret); + return res; +} +LDKPublicKey get_shutdown_pubkey_jcall(const void* this_arg) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - LDKPublicKey* ret = (LDKPublicKey*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_shutdown_pubkey_meth); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKPublicKey* ret = (LDKPublicKey*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_shutdown_pubkey_meth); LDKPublicKey res = *ret; FREE(ret); return res; } LDKChannelKeys get_channel_keys_jcall(const void* this_arg, bool inbound, uint64_t channel_value_satoshis) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - LDKChannelKeys* ret = (LDKChannelKeys*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_channel_keys_meth, inbound, channel_value_satoshis); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKChannelKeys* ret = (LDKChannelKeys*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_channel_keys_meth, inbound, channel_value_satoshis); LDKChannelKeys res = *ret; FREE(ret); return res; } LDKThirtyTwoBytes get_secure_random_bytes_jcall(const void* this_arg) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - LDKThirtyTwoBytes* ret = (LDKThirtyTwoBytes*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_secure_random_bytes_meth); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKThirtyTwoBytes* ret = (LDKThirtyTwoBytes*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_secure_random_bytes_meth); LDKThirtyTwoBytes res = *ret; FREE(ret); return res; @@ -635,7 +1315,9 @@ LDKThirtyTwoBytes get_secure_random_bytes_jcall(const void* this_arg) { static void LDKKeysInterface_JCalls_free(void* this_arg) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -646,21 +1328,21 @@ static void* LDKKeysInterface_JCalls_clone(const void* this_arg) { } static inline LDKKeysInterface LDKKeysInterface_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKKeysInterface_JCalls *calls = MALLOC(sizeof(LDKKeysInterface_JCalls), "LDKKeysInterface_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->get_node_secret_meth = (*env)->GetMethodID(env, c, "get_node_secret", "()J"); - assert(calls->get_node_secret_meth != NULL); + DO_ASSERT(calls->get_node_secret_meth != NULL); calls->get_destination_script_meth = (*env)->GetMethodID(env, c, "get_destination_script", "()J"); - assert(calls->get_destination_script_meth != NULL); + DO_ASSERT(calls->get_destination_script_meth != NULL); calls->get_shutdown_pubkey_meth = (*env)->GetMethodID(env, c, "get_shutdown_pubkey", "()J"); - assert(calls->get_shutdown_pubkey_meth != NULL); + DO_ASSERT(calls->get_shutdown_pubkey_meth != NULL); calls->get_channel_keys_meth = (*env)->GetMethodID(env, c, "get_channel_keys", "(ZJ)J"); - assert(calls->get_channel_keys_meth != NULL); + DO_ASSERT(calls->get_channel_keys_meth != NULL); calls->get_secure_random_bytes_meth = (*env)->GetMethodID(env, c, "get_secure_random_bytes", "()J"); - assert(calls->get_secure_random_bytes_meth != NULL); + DO_ASSERT(calls->get_secure_random_bytes_meth != NULL); LDKKeysInterface ret = { .this_arg = (void*) calls, @@ -678,78 +1360,47 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1new (JNIEnv *res_ptr = LDKKeysInterface_init(env, _a, o); return (long)res_ptr; } -typedef struct LDKManyChannelMonitor_JCalls { - atomic_size_t refcnt; - JNIEnv *env; - jobject o; - jmethodID add_monitor_meth; - jmethodID update_monitor_meth; - jmethodID get_and_clear_pending_monitor_events_meth; -} LDKManyChannelMonitor_JCalls; -LDKCResult_NoneChannelMonitorUpdateErrZ add_monitor_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitor monitor) { - LDKManyChannelMonitor_JCalls *j_calls = (LDKManyChannelMonitor_JCalls*) this_arg; - LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->add_monitor_meth, funding_txo, monitor); - LDKCResult_NoneChannelMonitorUpdateErrZ res = *ret; - FREE(ret); - return res; -} -LDKCResult_NoneChannelMonitorUpdateErrZ update_monitor_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitorUpdate monitor) { - LDKManyChannelMonitor_JCalls *j_calls = (LDKManyChannelMonitor_JCalls*) this_arg; - LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->update_monitor_meth, funding_txo, monitor); - LDKCResult_NoneChannelMonitorUpdateErrZ res = *ret; - FREE(ret); - return res; +JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) { + return ((LDKKeysInterface_JCalls*)val)->o; } -LDKCVec_MonitorEventZ get_and_clear_pending_monitor_events_jcall(const void* this_arg) { - LDKManyChannelMonitor_JCalls *j_calls = (LDKManyChannelMonitor_JCalls*) this_arg; - LDKCVec_MonitorEventZ* ret = (LDKCVec_MonitorEventZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_and_clear_pending_monitor_events_meth); - LDKCVec_MonitorEventZ res = *ret; - FREE(ret); - return res; +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; } -static void LDKManyChannelMonitor_JCalls_free(void* this_arg) { - LDKManyChannelMonitor_JCalls *j_calls = (LDKManyChannelMonitor_JCalls*) this_arg; - if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); - FREE(j_calls); - } + +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; } -static void* LDKManyChannelMonitor_JCalls_clone(const void* this_arg) { - LDKManyChannelMonitor_JCalls *j_calls = (LDKManyChannelMonitor_JCalls*) this_arg; - atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release); - return (void*) this_arg; + +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; } -static inline LDKManyChannelMonitor LDKManyChannelMonitor_init (JNIEnv * env, jclass _a, jobject o) { - jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); - LDKManyChannelMonitor_JCalls *calls = MALLOC(sizeof(LDKManyChannelMonitor_JCalls), "LDKManyChannelMonitor_JCalls"); - atomic_init(&calls->refcnt, 1); - calls->env = env; - calls->o = (*env)->NewGlobalRef(env, o); - calls->add_monitor_meth = (*env)->GetMethodID(env, c, "add_monitor", "(JJ)J"); - assert(calls->add_monitor_meth != NULL); - calls->update_monitor_meth = (*env)->GetMethodID(env, c, "update_monitor", "(JJ)J"); - assert(calls->update_monitor_meth != NULL); - calls->get_and_clear_pending_monitor_events_meth = (*env)->GetMethodID(env, c, "get_and_clear_pending_monitor_events", "()J"); - assert(calls->get_and_clear_pending_monitor_events_meth != NULL); - - LDKManyChannelMonitor ret = { - .this_arg = (void*) calls, - .add_monitor = add_monitor_jcall, - .update_monitor = update_monitor_jcall, - .get_and_clear_pending_monitor_events = get_and_clear_pending_monitor_events_jcall, - .free = LDKManyChannelMonitor_JCalls_free, - }; - return 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 long JNICALL Java_org_ldk_impl_bindings_LDKManyChannelMonitor_1new (JNIEnv * env, jclass _a, jobject o) { - LDKManyChannelMonitor *res_ptr = MALLOC(sizeof(LDKManyChannelMonitor), "LDKManyChannelMonitor"); - *res_ptr = LDKManyChannelMonitor_init(env, _a, o); - return (long)res_ptr; + +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; + JavaVM *vm; jobject o; LDKMessageSendEventsProvider_JCalls* MessageSendEventsProvider; jmethodID handle_open_channel_meth; @@ -774,84 +1425,145 @@ typedef struct LDKChannelMessageHandler_JCalls { } LDKChannelMessageHandler_JCalls; void handle_open_channel_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKOpenChannel *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_open_channel_meth, their_node_id, their_features, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + long their_features_ref = (long)&their_features; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_open_channel_meth, their_node_id_ref, their_features_ref, msg); } void handle_accept_channel_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKAcceptChannel *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_accept_channel_meth, their_node_id, their_features, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + long their_features_ref = (long)&their_features; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_accept_channel_meth, their_node_id_ref, their_features_ref, msg); } void handle_funding_created_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingCreated *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_funding_created_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_funding_created_meth, their_node_id_ref, msg); } void handle_funding_signed_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingSigned *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_funding_signed_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_funding_signed_meth, their_node_id_ref, msg); } void handle_funding_locked_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingLocked *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_funding_locked_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_funding_locked_meth, their_node_id_ref, msg); } void handle_shutdown_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKShutdown *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_shutdown_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_shutdown_meth, their_node_id_ref, msg); } void handle_closing_signed_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKClosingSigned *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_closing_signed_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_closing_signed_meth, their_node_id_ref, msg); } void handle_update_add_htlc_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateAddHTLC *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_update_add_htlc_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_update_add_htlc_meth, their_node_id_ref, msg); } void handle_update_fulfill_htlc_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFulfillHTLC *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_update_fulfill_htlc_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_update_fulfill_htlc_meth, their_node_id_ref, msg); } void handle_update_fail_htlc_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailHTLC *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_update_fail_htlc_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_update_fail_htlc_meth, their_node_id_ref, msg); } void handle_update_fail_malformed_htlc_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailMalformedHTLC *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_update_fail_malformed_htlc_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_update_fail_malformed_htlc_meth, their_node_id_ref, msg); } void handle_commitment_signed_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKCommitmentSigned *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_commitment_signed_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_commitment_signed_meth, their_node_id_ref, msg); } void handle_revoke_and_ack_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKRevokeAndACK *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_revoke_and_ack_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_revoke_and_ack_meth, their_node_id_ref, msg); } void handle_update_fee_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFee *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_update_fee_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_update_fee_meth, their_node_id_ref, msg); } void handle_announcement_signatures_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKAnnouncementSignatures *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_announcement_signatures_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_announcement_signatures_meth, their_node_id_ref, msg); } void peer_disconnected_jcall(const void* this_arg, LDKPublicKey their_node_id, bool no_connection_possible) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->peer_disconnected_meth, their_node_id, no_connection_possible); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->peer_disconnected_meth, their_node_id_ref, no_connection_possible); } void peer_connected_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->peer_connected_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->peer_connected_meth, their_node_id_ref, msg); } void handle_channel_reestablish_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReestablish *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_channel_reestablish_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_channel_reestablish_meth, their_node_id_ref, msg); } void handle_error_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKErrorMessage *msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_error_meth, their_node_id, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long their_node_id_ref = (long)&their_node_id; + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_error_meth, their_node_id_ref, msg); } static void LDKChannelMessageHandler_JCalls_free(void* this_arg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -863,49 +1575,49 @@ static void* LDKChannelMessageHandler_JCalls_clone(const void* this_arg) { } static inline LDKChannelMessageHandler LDKChannelMessageHandler_init (JNIEnv * env, jclass _a, jobject o, jobject MessageSendEventsProvider) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKChannelMessageHandler_JCalls *calls = MALLOC(sizeof(LDKChannelMessageHandler_JCalls), "LDKChannelMessageHandler_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->handle_open_channel_meth = (*env)->GetMethodID(env, c, "handle_open_channel", "(JJJ)V"); - assert(calls->handle_open_channel_meth != NULL); + DO_ASSERT(calls->handle_open_channel_meth != NULL); calls->handle_accept_channel_meth = (*env)->GetMethodID(env, c, "handle_accept_channel", "(JJJ)V"); - assert(calls->handle_accept_channel_meth != NULL); + DO_ASSERT(calls->handle_accept_channel_meth != NULL); calls->handle_funding_created_meth = (*env)->GetMethodID(env, c, "handle_funding_created", "(JJ)V"); - assert(calls->handle_funding_created_meth != NULL); + DO_ASSERT(calls->handle_funding_created_meth != NULL); calls->handle_funding_signed_meth = (*env)->GetMethodID(env, c, "handle_funding_signed", "(JJ)V"); - assert(calls->handle_funding_signed_meth != NULL); + DO_ASSERT(calls->handle_funding_signed_meth != NULL); calls->handle_funding_locked_meth = (*env)->GetMethodID(env, c, "handle_funding_locked", "(JJ)V"); - assert(calls->handle_funding_locked_meth != NULL); + DO_ASSERT(calls->handle_funding_locked_meth != NULL); calls->handle_shutdown_meth = (*env)->GetMethodID(env, c, "handle_shutdown", "(JJ)V"); - assert(calls->handle_shutdown_meth != NULL); + DO_ASSERT(calls->handle_shutdown_meth != NULL); calls->handle_closing_signed_meth = (*env)->GetMethodID(env, c, "handle_closing_signed", "(JJ)V"); - assert(calls->handle_closing_signed_meth != NULL); + DO_ASSERT(calls->handle_closing_signed_meth != NULL); calls->handle_update_add_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_add_htlc", "(JJ)V"); - assert(calls->handle_update_add_htlc_meth != NULL); + DO_ASSERT(calls->handle_update_add_htlc_meth != NULL); calls->handle_update_fulfill_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_fulfill_htlc", "(JJ)V"); - assert(calls->handle_update_fulfill_htlc_meth != NULL); + DO_ASSERT(calls->handle_update_fulfill_htlc_meth != NULL); calls->handle_update_fail_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_fail_htlc", "(JJ)V"); - assert(calls->handle_update_fail_htlc_meth != NULL); + DO_ASSERT(calls->handle_update_fail_htlc_meth != NULL); calls->handle_update_fail_malformed_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_fail_malformed_htlc", "(JJ)V"); - assert(calls->handle_update_fail_malformed_htlc_meth != NULL); + DO_ASSERT(calls->handle_update_fail_malformed_htlc_meth != NULL); calls->handle_commitment_signed_meth = (*env)->GetMethodID(env, c, "handle_commitment_signed", "(JJ)V"); - assert(calls->handle_commitment_signed_meth != NULL); + DO_ASSERT(calls->handle_commitment_signed_meth != NULL); calls->handle_revoke_and_ack_meth = (*env)->GetMethodID(env, c, "handle_revoke_and_ack", "(JJ)V"); - assert(calls->handle_revoke_and_ack_meth != NULL); + DO_ASSERT(calls->handle_revoke_and_ack_meth != NULL); calls->handle_update_fee_meth = (*env)->GetMethodID(env, c, "handle_update_fee", "(JJ)V"); - assert(calls->handle_update_fee_meth != NULL); + DO_ASSERT(calls->handle_update_fee_meth != NULL); calls->handle_announcement_signatures_meth = (*env)->GetMethodID(env, c, "handle_announcement_signatures", "(JJ)V"); - assert(calls->handle_announcement_signatures_meth != NULL); + DO_ASSERT(calls->handle_announcement_signatures_meth != NULL); calls->peer_disconnected_meth = (*env)->GetMethodID(env, c, "peer_disconnected", "(JZ)V"); - assert(calls->peer_disconnected_meth != NULL); + DO_ASSERT(calls->peer_disconnected_meth != NULL); calls->peer_connected_meth = (*env)->GetMethodID(env, c, "peer_connected", "(JJ)V"); - assert(calls->peer_connected_meth != NULL); + DO_ASSERT(calls->peer_connected_meth != NULL); calls->handle_channel_reestablish_meth = (*env)->GetMethodID(env, c, "handle_channel_reestablish", "(JJ)V"); - assert(calls->handle_channel_reestablish_meth != NULL); + DO_ASSERT(calls->handle_channel_reestablish_meth != NULL); calls->handle_error_meth = (*env)->GetMethodID(env, c, "handle_error", "(JJ)V"); - assert(calls->handle_error_meth != NULL); + DO_ASSERT(calls->handle_error_meth != NULL); LDKChannelMessageHandler ret = { .this_arg = (void*) calls, @@ -934,14 +1646,184 @@ static inline LDKChannelMessageHandler LDKChannelMessageHandler_init (JNIEnv * e calls->MessageSendEventsProvider = ret.MessageSendEventsProvider.this_arg; return ret; } -JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1new (JNIEnv * env, jclass _a, jobject o, jobject MessageSendEventsProvider) { - LDKChannelMessageHandler *res_ptr = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); - *res_ptr = LDKChannelMessageHandler_init(env, _a, o, MessageSendEventsProvider); - return (long)res_ptr; +JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKChannelMessageHandler_1new (JNIEnv * env, jclass _a, jobject o, jobject MessageSendEventsProvider) { + LDKChannelMessageHandler *res_ptr = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); + *res_ptr = LDKChannelMessageHandler_init(env, _a, o, MessageSendEventsProvider); + return (long)res_ptr; +} +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; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1boolLightningErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_boolLightningErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_boolLightningErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_boolLightningErrorZ*)arg)->contents.err; + } } typedef struct LDKRoutingMessageHandler_JCalls { atomic_size_t refcnt; - JNIEnv *env; + JavaVM *vm; jobject o; jmethodID handle_node_announcement_meth; jmethodID handle_channel_announcement_meth; @@ -953,51 +1835,69 @@ typedef struct LDKRoutingMessageHandler_JCalls { } LDKRoutingMessageHandler_JCalls; LDKCResult_boolLightningErrorZ handle_node_announcement_jcall(const void* this_arg, const LDKNodeAnnouncement *msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->handle_node_announcement_meth, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->handle_node_announcement_meth, msg); LDKCResult_boolLightningErrorZ res = *ret; FREE(ret); return res; } LDKCResult_boolLightningErrorZ handle_channel_announcement_jcall(const void* this_arg, const LDKChannelAnnouncement *msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->handle_channel_announcement_meth, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->handle_channel_announcement_meth, msg); LDKCResult_boolLightningErrorZ res = *ret; FREE(ret); return res; } LDKCResult_boolLightningErrorZ handle_channel_update_jcall(const void* this_arg, const LDKChannelUpdate *msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->handle_channel_update_meth, msg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->handle_channel_update_meth, msg); LDKCResult_boolLightningErrorZ res = *ret; FREE(ret); return res; } void handle_htlc_fail_channel_update_jcall(const void* this_arg, const LDKHTLCFailChannelUpdate *update) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->handle_htlc_fail_channel_update_meth, update); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_htlc_fail_channel_update_meth, update); } LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel_announcements_jcall(const void* this_arg, uint64_t starting_point, uint8_t batch_amount) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ* ret = (LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_next_channel_announcements_meth, starting_point, batch_amount); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ* ret = (LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_next_channel_announcements_meth, starting_point, batch_amount); LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ res = *ret; FREE(ret); return res; } LDKCVec_NodeAnnouncementZ get_next_node_announcements_jcall(const void* this_arg, LDKPublicKey starting_point, uint8_t batch_amount) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - LDKCVec_NodeAnnouncementZ* ret = (LDKCVec_NodeAnnouncementZ*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->get_next_node_announcements_meth, starting_point, batch_amount); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long starting_point_ref = (long)&starting_point; + LDKCVec_NodeAnnouncementZ* ret = (LDKCVec_NodeAnnouncementZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_next_node_announcements_meth, starting_point_ref, batch_amount); LDKCVec_NodeAnnouncementZ res = *ret; FREE(ret); return res; } bool should_request_full_sync_jcall(const void* this_arg, LDKPublicKey node_id) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - return (*j_calls->env)->CallBooleanMethod(j_calls->env, j_calls->o, j_calls->should_request_full_sync_meth, node_id); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long node_id_ref = (long)&node_id; + return (*env)->CallBooleanMethod(env, j_calls->o, j_calls->should_request_full_sync_meth, node_id_ref); } static void LDKRoutingMessageHandler_JCalls_free(void* this_arg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -1008,25 +1908,25 @@ static void* LDKRoutingMessageHandler_JCalls_clone(const void* this_arg) { } static inline LDKRoutingMessageHandler LDKRoutingMessageHandler_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKRoutingMessageHandler_JCalls *calls = MALLOC(sizeof(LDKRoutingMessageHandler_JCalls), "LDKRoutingMessageHandler_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->handle_node_announcement_meth = (*env)->GetMethodID(env, c, "handle_node_announcement", "(J)J"); - assert(calls->handle_node_announcement_meth != NULL); + DO_ASSERT(calls->handle_node_announcement_meth != NULL); calls->handle_channel_announcement_meth = (*env)->GetMethodID(env, c, "handle_channel_announcement", "(J)J"); - assert(calls->handle_channel_announcement_meth != NULL); + DO_ASSERT(calls->handle_channel_announcement_meth != NULL); calls->handle_channel_update_meth = (*env)->GetMethodID(env, c, "handle_channel_update", "(J)J"); - assert(calls->handle_channel_update_meth != NULL); + DO_ASSERT(calls->handle_channel_update_meth != NULL); calls->handle_htlc_fail_channel_update_meth = (*env)->GetMethodID(env, c, "handle_htlc_fail_channel_update", "(J)V"); - assert(calls->handle_htlc_fail_channel_update_meth != NULL); + DO_ASSERT(calls->handle_htlc_fail_channel_update_meth != NULL); calls->get_next_channel_announcements_meth = (*env)->GetMethodID(env, c, "get_next_channel_announcements", "(JB)J"); - assert(calls->get_next_channel_announcements_meth != NULL); + DO_ASSERT(calls->get_next_channel_announcements_meth != NULL); calls->get_next_node_announcements_meth = (*env)->GetMethodID(env, c, "get_next_node_announcements", "(JB)J"); - assert(calls->get_next_node_announcements_meth != NULL); + DO_ASSERT(calls->get_next_node_announcements_meth != NULL); calls->should_request_full_sync_meth = (*env)->GetMethodID(env, c, "should_request_full_sync", "(J)Z"); - assert(calls->should_request_full_sync_meth != NULL); + DO_ASSERT(calls->should_request_full_sync_meth != NULL); LDKRoutingMessageHandler ret = { .this_arg = (void*) calls, @@ -1046,9 +1946,65 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKRoutingMessageHandler_1new *res_ptr = LDKRoutingMessageHandler_init(env, _a, o); return (long)res_ptr; } +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; + JavaVM *vm; jobject o; jmethodID send_data_meth; jmethodID disconnect_socket_meth; @@ -1057,27 +2013,35 @@ typedef struct LDKSocketDescriptor_JCalls { } LDKSocketDescriptor_JCalls; uintptr_t send_data_jcall(void* this_arg, LDKu8slice data, bool resume_read) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; - uintptr_t* ret = (uintptr_t*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->send_data_meth, data, resume_read); - uintptr_t res = *ret; - FREE(ret); - return res; + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + long data_ref = (long)&data; + return (*env)->CallLongMethod(env, j_calls->o, j_calls->send_data_meth, data_ref, resume_read); } void disconnect_socket_jcall(void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; - return (*j_calls->env)->CallVoidMethod(j_calls->env, j_calls->o, j_calls->disconnect_socket_meth); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + return (*env)->CallVoidMethod(env, j_calls->o, j_calls->disconnect_socket_meth); } bool eq_jcall(const void* this_arg, const void *other_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; - return (*j_calls->env)->CallBooleanMethod(j_calls->env, j_calls->o, j_calls->eq_meth, other_arg); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + return (*env)->CallBooleanMethod(env, j_calls->o, j_calls->eq_meth, other_arg); } uint64_t hash_jcall(const void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; - return (*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->hash_meth); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + return (*env)->CallLongMethod(env, j_calls->o, j_calls->hash_meth); } static void LDKSocketDescriptor_JCalls_free(void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) { - (*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o); + JNIEnv *env; + DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK); + (*env)->DeleteGlobalRef(env, j_calls->o); FREE(j_calls); } } @@ -1088,19 +2052,19 @@ static void* LDKSocketDescriptor_JCalls_clone(const void* this_arg) { } static inline LDKSocketDescriptor LDKSocketDescriptor_init (JNIEnv * env, jclass _a, jobject o) { jclass c = (*env)->GetObjectClass(env, o); - assert(c != NULL); + DO_ASSERT(c != NULL); LDKSocketDescriptor_JCalls *calls = MALLOC(sizeof(LDKSocketDescriptor_JCalls), "LDKSocketDescriptor_JCalls"); atomic_init(&calls->refcnt, 1); - calls->env = env; + DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0); calls->o = (*env)->NewGlobalRef(env, o); calls->send_data_meth = (*env)->GetMethodID(env, c, "send_data", "(JZ)J"); - assert(calls->send_data_meth != NULL); + DO_ASSERT(calls->send_data_meth != NULL); calls->disconnect_socket_meth = (*env)->GetMethodID(env, c, "disconnect_socket", "()V"); - assert(calls->disconnect_socket_meth != NULL); - calls->eq_meth = (*env)->GetMethodID(env, c, "eq", "(V)Z"); - assert(calls->eq_meth != NULL); + DO_ASSERT(calls->disconnect_socket_meth != NULL); + calls->eq_meth = (*env)->GetMethodID(env, c, "eq", "(J)Z"); + DO_ASSERT(calls->eq_meth != NULL); calls->hash_meth = (*env)->GetMethodID(env, c, "hash", "()J"); - assert(calls->hash_meth != NULL); + DO_ASSERT(calls->hash_meth != NULL); LDKSocketDescriptor ret = { .this_arg = (void*) calls, @@ -1118,6 +2082,85 @@ JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_LDKSocketDescriptor_1new (JNIE *res_ptr = LDKSocketDescriptor_init(env, _a, o); return (long)res_ptr; } +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; + 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; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1CVec_1u8ZPeerHandleErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1boolPeerHandleErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_boolPeerHandleErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1boolPeerHandleErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_boolPeerHandleErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_boolPeerHandleErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_boolPeerHandleErrorZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1SecretKeySecpErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_SecretKeySecpErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1SecretKeySecpErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_SecretKeySecpErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_SecretKeySecpErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_SecretKeySecpErrorZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1PublicKeySecpErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_PublicKeySecpErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1PublicKeySecpErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_PublicKeySecpErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_PublicKeySecpErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_PublicKeySecpErrorZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1TxCreationKeysSecpErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_TxCreationKeysSecpErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1TxCreationKeysSecpErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_TxCreationKeysSecpErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_TxCreationKeysSecpErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_TxCreationKeysSecpErrorZ*)arg)->contents.err; + } +} +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1RouteLightningErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) { + return ((LDKCResult_RouteLightningErrorZ*)arg)->result_ok; +} +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCResult_1RouteLightningErrorZ_1get_1inner (JNIEnv * env, jclass _a, jlong arg) { + if (((LDKCResult_RouteLightningErrorZ*)arg)->result_ok) { + return (long)((LDKCResult_RouteLightningErrorZ*)arg)->contents.result; + } else { + return (long)((LDKCResult_RouteLightningErrorZ*)arg)->contents.err; + } +} JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1HTLCOutputInCommitmentSignatureZ_1free(JNIEnv * _env, jclass _b, jlong arg) { LDKC2Tuple_HTLCOutputInCommitmentSignatureZ arg_conv = *(LDKC2Tuple_HTLCOutputInCommitmentSignatureZ*)arg; FREE((void*)arg); @@ -1130,22 +2173,16 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1OutPointScriptZ_1free return C2Tuple_OutPointScriptZ_free(arg_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1Scriptu64Z_1free(JNIEnv * _env, jclass _b, jlong arg) { - LDKC2Tuple_Scriptu64Z arg_conv = *(LDKC2Tuple_Scriptu64Z*)arg; - FREE((void*)arg); - return C2Tuple_Scriptu64Z_free(arg_conv); -} - JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1SignatureCVec_1SignatureZZ_1free(JNIEnv * _env, jclass _b, jlong arg) { LDKC2Tuple_SignatureCVec_SignatureZZ arg_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)arg; FREE((void*)arg); return C2Tuple_SignatureCVec_SignatureZZ_free(arg_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1Txidu32Z_1free(JNIEnv * _env, jclass _b, jlong arg) { - LDKC2Tuple_Txidu32Z arg_conv = *(LDKC2Tuple_Txidu32Z*)arg; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1TxidCVec_1TxOutZZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKC2Tuple_TxidCVec_TxOutZZ arg_conv = *(LDKC2Tuple_TxidCVec_TxOutZZ*)arg; FREE((void*)arg); - return C2Tuple_Txidu32Z_free(arg_conv); + return C2Tuple_TxidCVec_TxOutZZ_free(arg_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1u64u64Z_1free(JNIEnv * _env, jclass _b, jlong arg) { @@ -1154,32 +2191,16 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1u64u64Z_1free(JNIEnv return C2Tuple_u64u64Z_free(arg_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C3Tuple_1ChannelAnnouncementChannelUpdateChannelUpdateZ_1free(JNIEnv * _env, jclass _b, jlong arg) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arg_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)arg; - FREE((void*)arg); - return C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(arg_conv); -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1C2Tuple_1Scriptu64ZChainErrorZ_1err(JNIEnv * _env, jclass _b, jlong arg) { - LDKChainError arg_conv = *(LDKChainError*)arg; - FREE((void*)arg); - LDKCResult_C2Tuple_Scriptu64ZChainErrorZ* ret = MALLOC(sizeof(LDKCResult_C2Tuple_Scriptu64ZChainErrorZ), "LDKCResult_C2Tuple_Scriptu64ZChainErrorZ"); - *ret = CResult_C2Tuple_Scriptu64ZChainErrorZ_err(arg_conv); - return (long)ret; -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1C2Tuple_1Scriptu64ZChainErrorZ_1free(JNIEnv * _env, jclass _b, jlong arg) { - LDKCResult_C2Tuple_Scriptu64ZChainErrorZ arg_conv = *(LDKCResult_C2Tuple_Scriptu64ZChainErrorZ*)arg; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C2Tuple_1usizeTransactionZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKC2Tuple_usizeTransactionZ arg_conv = *(LDKC2Tuple_usizeTransactionZ*)arg; FREE((void*)arg); - return CResult_C2Tuple_Scriptu64ZChainErrorZ_free(arg_conv); + return C2Tuple_usizeTransactionZ_free(arg_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1C2Tuple_1Scriptu64ZChainErrorZ_1ok(JNIEnv * _env, jclass _b, jlong arg) { - LDKC2Tuple_Scriptu64Z arg_conv = *(LDKC2Tuple_Scriptu64Z*)arg; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_C3Tuple_1ChannelAnnouncementChannelUpdateChannelUpdateZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arg_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)arg; FREE((void*)arg); - LDKCResult_C2Tuple_Scriptu64ZChainErrorZ* ret = MALLOC(sizeof(LDKCResult_C2Tuple_Scriptu64ZChainErrorZ), "LDKCResult_C2Tuple_Scriptu64ZChainErrorZ"); - *ret = CResult_C2Tuple_Scriptu64ZChainErrorZ_ok(arg_conv); - return (long)ret; + return C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(arg_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1C2Tuple_1SignatureCVec_1SignatureZZNoneZ_1free(JNIEnv * _env, jclass _b, jlong arg) { @@ -1246,7 +2267,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1NoneAPIErrorZ_1free(J return CResult_NoneAPIErrorZ_free(arg_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NoneChannelMonitorUpdateErrZ_1err(JNIEnv * _env, jclass _b, jlong arg) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NoneChannelMonitorUpdateErrZ_1err(JNIEnv * _env, jclass _b, jclass arg) { LDKChannelMonitorUpdateErr arg_conv = *(LDKChannelMonitorUpdateErr*)arg; FREE((void*)arg); LDKCResult_NoneChannelMonitorUpdateErrZ* ret = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); @@ -1302,6 +2323,28 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1NonePeerHandleErrorZ_ return CResult_NonePeerHandleErrorZ_free(arg_conv); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1PublicKeySecpErrorZ_1err(JNIEnv * _env, jclass _b, jclass arg) { + LDKSecp256k1Error arg_conv = *(LDKSecp256k1Error*)arg; + FREE((void*)arg); + LDKCResult_PublicKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_PublicKeySecpErrorZ), "LDKCResult_PublicKeySecpErrorZ"); + *ret = CResult_PublicKeySecpErrorZ_err(arg_conv); + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1PublicKeySecpErrorZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKCResult_PublicKeySecpErrorZ arg_conv = *(LDKCResult_PublicKeySecpErrorZ*)arg; + FREE((void*)arg); + return CResult_PublicKeySecpErrorZ_free(arg_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1PublicKeySecpErrorZ_1ok(JNIEnv * _env, jclass _b, jlong arg) { + LDKPublicKey arg_conv = *(LDKPublicKey*)arg; + FREE((void*)arg); + LDKCResult_PublicKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_PublicKeySecpErrorZ), "LDKCResult_PublicKeySecpErrorZ"); + *ret = CResult_PublicKeySecpErrorZ_ok(arg_conv); + return (long)ret; +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1RouteLightningErrorZ_1err(JNIEnv * _env, jclass _b, jlong arg) { LDKLightningError arg_conv = *(LDKLightningError*)arg; FREE((void*)arg); @@ -1324,6 +2367,28 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1RouteLightningErrorZ return (long)ret; } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1SecretKeySecpErrorZ_1err(JNIEnv * _env, jclass _b, jclass arg) { + LDKSecp256k1Error arg_conv = *(LDKSecp256k1Error*)arg; + FREE((void*)arg); + LDKCResult_SecretKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_SecretKeySecpErrorZ), "LDKCResult_SecretKeySecpErrorZ"); + *ret = CResult_SecretKeySecpErrorZ_err(arg_conv); + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1SecretKeySecpErrorZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKCResult_SecretKeySecpErrorZ arg_conv = *(LDKCResult_SecretKeySecpErrorZ*)arg; + FREE((void*)arg); + return CResult_SecretKeySecpErrorZ_free(arg_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1SecretKeySecpErrorZ_1ok(JNIEnv * _env, jclass _b, jlong arg) { + LDKSecretKey arg_conv = *(LDKSecretKey*)arg; + FREE((void*)arg); + LDKCResult_SecretKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_SecretKeySecpErrorZ), "LDKCResult_SecretKeySecpErrorZ"); + *ret = CResult_SecretKeySecpErrorZ_ok(arg_conv); + return (long)ret; +} + JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1SignatureNoneZ_1free(JNIEnv * _env, jclass _b, jlong arg) { LDKCResult_SignatureNoneZ arg_conv = *(LDKCResult_SignatureNoneZ*)arg; FREE((void*)arg); @@ -1338,7 +2403,7 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1SignatureNoneZ_1ok(J return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1TxCreationKeysSecpErrorZ_1err(JNIEnv * _env, jclass _b, jlong arg) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1TxCreationKeysSecpErrorZ_1err(JNIEnv * _env, jclass _b, jclass arg) { LDKSecp256k1Error arg_conv = *(LDKSecp256k1Error*)arg; FREE((void*)arg); LDKCResult_TxCreationKeysSecpErrorZ* ret = MALLOC(sizeof(LDKCResult_TxCreationKeysSecpErrorZ), "LDKCResult_TxCreationKeysSecpErrorZ"); @@ -1360,6 +2425,28 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1TxCreationKeysSecpEr return (long)ret; } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1TxOutAccessErrorZ_1err(JNIEnv * _env, jclass _b, jclass arg) { + LDKAccessError arg_conv = *(LDKAccessError*)arg; + FREE((void*)arg); + LDKCResult_TxOutAccessErrorZ* ret = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); + *ret = CResult_TxOutAccessErrorZ_err(arg_conv); + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CResult_1TxOutAccessErrorZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKCResult_TxOutAccessErrorZ arg_conv = *(LDKCResult_TxOutAccessErrorZ*)arg; + FREE((void*)arg); + return CResult_TxOutAccessErrorZ_free(arg_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1TxOutAccessErrorZ_1ok(JNIEnv * _env, jclass _b, jlong arg) { + LDKTxOut arg_conv = *(LDKTxOut*)arg; + FREE((void*)arg); + LDKCResult_TxOutAccessErrorZ* ret = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); + *ret = CResult_TxOutAccessErrorZ_ok(arg_conv); + return (long)ret; +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1boolLightningErrorZ_1err(JNIEnv * _env, jclass _b, jlong arg) { LDKLightningError arg_conv = *(LDKLightningError*)arg; FREE((void*)arg); @@ -1406,6 +2493,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1C2Tuple_1HTLCOutputInCom return CVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ_free(arg_conv); } +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1C2Tuple_1TxidCVec_1TxOutZZZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKCVec_C2Tuple_TxidCVec_TxOutZZZ arg_conv = *(LDKCVec_C2Tuple_TxidCVec_TxOutZZZ*)arg; + FREE((void*)arg); + return CVec_C2Tuple_TxidCVec_TxOutZZZ_free(arg_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1C2Tuple_1usizeTransactionZZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKCVec_C2Tuple_usizeTransactionZZ arg_conv = *(LDKCVec_C2Tuple_usizeTransactionZZ*)arg; + FREE((void*)arg); + return CVec_C2Tuple_usizeTransactionZZ_free(arg_conv); +} + JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1C3Tuple_1ChannelAnnouncementChannelUpdateChannelUpdateZZ_1free(JNIEnv * _env, jclass _b, jlong arg) { LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ arg_conv = *(LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ*)arg; FREE((void*)arg); @@ -1502,6 +2601,12 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1TransactionZ_1free(JNIEn return CVec_TransactionZ_free(arg_conv); } +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1TxOutZ_1free(JNIEnv * _env, jclass _b, jlong arg) { + LDKCVec_TxOutZ arg_conv = *(LDKCVec_TxOutZ*)arg; + FREE((void*)arg); + return CVec_TxOutZ_free(arg_conv); +} + JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1UpdateAddHTLCZ_1free(JNIEnv * _env, jclass _b, jlong arg) { LDKCVec_UpdateAddHTLCZ arg_conv = *(LDKCVec_UpdateAddHTLCZ*)arg; FREE((void*)arg); @@ -1538,10 +2643,10 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1u8Z_1free(JNIEnv * _env, return CVec_u8Z_free(arg_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CVec_1usizeZ_1free(JNIEnv * _env, jclass _b, jlong arg) { - LDKCVec_usizeZ arg_conv = *(LDKCVec_usizeZ*)arg; - FREE((void*)arg); - return CVec_usizeZ_free(arg_conv); +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Transaction_1free(JNIEnv * _env, jclass _b, jlong _res) { + LDKTransaction _res_conv = *(LDKTransaction*)_res; + FREE((void*)_res); + return Transaction_free(_res_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxOut_1free(JNIEnv * _env, jclass _b, jlong _res) { @@ -1550,19 +2655,44 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxOut_1free(JNIEnv * _env, jcl return TxOut_free(_res_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1Txidu32Z_1new(JNIEnv * _env, jclass _b, jlong a, jint b) { - LDKThirtyTwoBytes a_conv = *(LDKThirtyTwoBytes*)a; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1usizeTransactionZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) { + LDKTransaction b_conv = *(LDKTransaction*)b; + FREE((void*)b); + LDKC2Tuple_usizeTransactionZ* ret = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); + *ret = C2Tuple_usizeTransactionZ_new(a, b_conv); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NoneChannelMonitorUpdateErrZ_1ok(JNIEnv * _env, jclass _b) { + LDKCResult_NoneChannelMonitorUpdateErrZ* ret = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); + *ret = CResult_NoneChannelMonitorUpdateErrZ_ok(); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NoneMonitorUpdateErrorZ_1ok(JNIEnv * _env, jclass _b) { + LDKCResult_NoneMonitorUpdateErrorZ* ret = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ"); + *ret = CResult_NoneMonitorUpdateErrorZ_ok(); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1OutPointScriptZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) { + LDKOutPoint a_conv = *(LDKOutPoint*)a; FREE((void*)a); - LDKC2Tuple_Txidu32Z* ret = MALLOC(sizeof(LDKC2Tuple_Txidu32Z), "LDKC2Tuple_Txidu32Z"); - *ret = C2Tuple_Txidu32Z_new(a_conv, b); + a_conv.is_owned = true; + LDKCVec_u8Z b_conv = *(LDKCVec_u8Z*)b; + FREE((void*)b); + LDKC2Tuple_OutPointScriptZ* ret = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); + *ret = C2Tuple_OutPointScriptZ_new(a_conv, b_conv); return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1Scriptu64Z_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) { - LDKCVec_u8Z a_conv = *(LDKCVec_u8Z*)a; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1TxidCVec_1TxOutZZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) { + LDKThirtyTwoBytes a_conv = *(LDKThirtyTwoBytes*)a; FREE((void*)a); - LDKC2Tuple_Scriptu64Z* ret = MALLOC(sizeof(LDKC2Tuple_Scriptu64Z), "LDKC2Tuple_Scriptu64Z"); - *ret = C2Tuple_Scriptu64Z_new(a_conv, b); + LDKCVec_TxOutZ b_conv = *(LDKCVec_TxOutZ*)b; + FREE((void*)b); + LDKC2Tuple_TxidCVec_TxOutZZ* ret = MALLOC(sizeof(LDKC2Tuple_TxidCVec_TxOutZZ), "LDKC2Tuple_TxidCVec_TxOutZZ"); + *ret = C2Tuple_TxidCVec_TxOutZZ_new(a_conv, b_conv); return (long)ret; } @@ -1612,39 +2742,16 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NonePaymentSendFailu return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NoneChannelMonitorUpdateErrZ_1ok(JNIEnv * _env, jclass _b) { - LDKCResult_NoneChannelMonitorUpdateErrZ* ret = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); - *ret = CResult_NoneChannelMonitorUpdateErrZ_ok(); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NoneMonitorUpdateErrorZ_1ok(JNIEnv * _env, jclass _b) { - LDKCResult_NoneMonitorUpdateErrorZ* ret = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ"); - *ret = CResult_NoneMonitorUpdateErrorZ_ok(); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1OutPointScriptZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) { - LDKOutPoint a_conv = *(LDKOutPoint*)a; - FREE((void*)a); - a_conv._underlying_ref = false; - LDKCVec_u8Z b_conv = *(LDKCVec_u8Z*)b; - FREE((void*)b); - LDKC2Tuple_OutPointScriptZ* ret = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); - *ret = C2Tuple_OutPointScriptZ_new(a_conv, b_conv); - return (long)ret; -} - JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C3Tuple_1ChannelAnnouncementChannelUpdateChannelUpdateZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b, jlong c) { LDKChannelAnnouncement a_conv = *(LDKChannelAnnouncement*)a; FREE((void*)a); - a_conv._underlying_ref = false; + a_conv.is_owned = true; LDKChannelUpdate b_conv = *(LDKChannelUpdate*)b; FREE((void*)b); - b_conv._underlying_ref = false; + b_conv.is_owned = true; LDKChannelUpdate c_conv = *(LDKChannelUpdate*)c; FREE((void*)c); - c_conv._underlying_ref = false; + c_conv.is_owned = true; LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a_conv, b_conv, c_conv); return (long)ret; @@ -1659,7 +2766,7 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1NonePeerHandleErrorZ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1HTLCOutputInCommitmentSignatureZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) { LDKHTLCOutputInCommitment a_conv = *(LDKHTLCOutputInCommitment*)a; FREE((void*)a); - a_conv._underlying_ref = false; + a_conv.is_owned = true; LDKSignature b_conv = *(LDKSignature*)b; FREE((void*)b); LDKC2Tuple_HTLCOutputInCommitmentSignatureZ* ret = MALLOC(sizeof(LDKC2Tuple_HTLCOutputInCommitmentSignatureZ), "LDKC2Tuple_HTLCOutputInCommitmentSignatureZ"); @@ -1697,10 +2804,9 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_APIError_1free(JNIEnv * _env, return APIError_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Level_1max(JNIEnv * _env, jclass _b) { - LDKLevel* ret = MALLOC(sizeof(LDKLevel), "LDKLevel"); - *ret = Level_max(); - return (long)ret; +JNIEXPORT jclass JNICALL Java_org_ldk_impl_bindings_Level_1max(JNIEnv * _env, jclass _b) { + jclass ret = LDKLevel_to_java(_env, Level_max()); + return ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Logger_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -1712,7 +2818,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Logger_1free(JNIEnv * _env, jc JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelHandshakeConfig this_ptr_conv = *(LDKChannelHandshakeConfig*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelHandshakeConfig_free(this_ptr_conv); } @@ -1749,23 +2855,23 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1o JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1new(JNIEnv * _env, jclass _b, jint minimum_depth_arg, jshort our_to_self_delay_arg, jlong our_htlc_minimum_msat_arg) { LDKChannelHandshakeConfig* ret = MALLOC(sizeof(LDKChannelHandshakeConfig), "LDKChannelHandshakeConfig"); *ret = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1default(JNIEnv * _env, jclass _b) { LDKChannelHandshakeConfig* ret = MALLOC(sizeof(LDKChannelHandshakeConfig), "LDKChannelHandshakeConfig"); *ret = ChannelHandshakeConfig_default(); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelHandshakeLimits this_ptr_conv = *(LDKChannelHandshakeLimits*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelHandshakeLimits_free(this_ptr_conv); } @@ -1872,23 +2978,23 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1t JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1new(JNIEnv * _env, jclass _b, jlong min_funding_satoshis_arg, jlong max_htlc_minimum_msat_arg, jlong min_max_htlc_value_in_flight_msat_arg, jlong max_channel_reserve_satoshis_arg, jshort min_max_accepted_htlcs_arg, jlong min_dust_limit_satoshis_arg, jlong max_dust_limit_satoshis_arg, jint max_minimum_depth_arg, jboolean force_announced_channel_preference_arg, jshort their_to_self_delay_arg) { LDKChannelHandshakeLimits* ret = MALLOC(sizeof(LDKChannelHandshakeLimits), "LDKChannelHandshakeLimits"); *ret = ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_htlc_minimum_msat_arg, min_max_htlc_value_in_flight_msat_arg, max_channel_reserve_satoshis_arg, min_max_accepted_htlcs_arg, min_dust_limit_satoshis_arg, max_dust_limit_satoshis_arg, max_minimum_depth_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1default(JNIEnv * _env, jclass _b) { LDKChannelHandshakeLimits* ret = MALLOC(sizeof(LDKChannelHandshakeLimits), "LDKChannelHandshakeLimits"); *ret = ChannelHandshakeLimits_default(); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelConfig this_ptr_conv = *(LDKChannelConfig*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelConfig_free(this_ptr_conv); } @@ -1925,16 +3031,16 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1set_1commit_1up JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1new(JNIEnv * _env, jclass _b, jint fee_proportional_millionths_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg) { LDKChannelConfig* ret = MALLOC(sizeof(LDKChannelConfig), "LDKChannelConfig"); *ret = ChannelConfig_new(fee_proportional_millionths_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1default(JNIEnv * _env, jclass _b) { LDKChannelConfig* ret = MALLOC(sizeof(LDKChannelConfig), "LDKChannelConfig"); *ret = ChannelConfig_default(); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -1947,18 +3053,17 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKChannelConfig* ret = MALLOC(sizeof(LDKChannelConfig), "LDKChannelConfig"); *ret = ChannelConfig_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUserConfig this_ptr_conv = *(LDKUserConfig*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UserConfig_free(this_ptr_conv); } @@ -1966,8 +3071,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1get_1own_1channel LDKUserConfig* this_ptr_conv = (LDKUserConfig*)this_ptr; LDKChannelHandshakeConfig* ret = MALLOC(sizeof(LDKChannelHandshakeConfig), "LDKChannelHandshakeConfig"); *ret = UserConfig_get_own_channel_config(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -1975,7 +3080,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1set_1own_1channel_ LDKUserConfig* this_ptr_conv = (LDKUserConfig*)this_ptr; LDKChannelHandshakeConfig val_conv = *(LDKChannelHandshakeConfig*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return UserConfig_set_own_channel_config(this_ptr_conv, val_conv); } @@ -1983,8 +3088,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1get_1peer_1channe LDKUserConfig* this_ptr_conv = (LDKUserConfig*)this_ptr; LDKChannelHandshakeLimits* ret = MALLOC(sizeof(LDKChannelHandshakeLimits), "LDKChannelHandshakeLimits"); *ret = UserConfig_get_peer_channel_config_limits(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -1992,7 +3097,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1set_1peer_1channel LDKUserConfig* this_ptr_conv = (LDKUserConfig*)this_ptr; LDKChannelHandshakeLimits val_conv = *(LDKChannelHandshakeLimits*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return UserConfig_set_peer_channel_config_limits(this_ptr_conv, val_conv); } @@ -2000,8 +3105,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1get_1channel_1opt LDKUserConfig* this_ptr_conv = (LDKUserConfig*)this_ptr; LDKChannelConfig* ret = MALLOC(sizeof(LDKChannelConfig), "LDKChannelConfig"); *ret = UserConfig_get_channel_options(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2009,191 +3114,305 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1set_1channel_1opti LDKUserConfig* this_ptr_conv = (LDKUserConfig*)this_ptr; LDKChannelConfig val_conv = *(LDKChannelConfig*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return UserConfig_set_channel_options(this_ptr_conv, val_conv); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1new(JNIEnv * _env, jclass _b, jlong own_channel_config_arg, jlong peer_channel_config_limits_arg, jlong channel_options_arg) { LDKChannelHandshakeConfig own_channel_config_arg_conv = *(LDKChannelHandshakeConfig*)own_channel_config_arg; FREE((void*)own_channel_config_arg); - own_channel_config_arg_conv._underlying_ref = false; + own_channel_config_arg_conv.is_owned = true; LDKChannelHandshakeLimits peer_channel_config_limits_arg_conv = *(LDKChannelHandshakeLimits*)peer_channel_config_limits_arg; FREE((void*)peer_channel_config_limits_arg); - peer_channel_config_limits_arg_conv._underlying_ref = false; + peer_channel_config_limits_arg_conv.is_owned = true; LDKChannelConfig channel_options_arg_conv = *(LDKChannelConfig*)channel_options_arg; FREE((void*)channel_options_arg); - channel_options_arg_conv._underlying_ref = false; + channel_options_arg_conv.is_owned = true; LDKUserConfig* ret = MALLOC(sizeof(LDKUserConfig), "LDKUserConfig"); *ret = UserConfig_new(own_channel_config_arg_conv, peer_channel_config_limits_arg_conv, channel_options_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1default(JNIEnv * _env, jclass _b) { LDKUserConfig* ret = MALLOC(sizeof(LDKUserConfig), "LDKUserConfig"); *ret = UserConfig_default(); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Access_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKAccess this_ptr_conv = *(LDKAccess*)this_ptr; + FREE((void*)this_ptr); + return Access_free(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Watch_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKWatch this_ptr_conv = *(LDKWatch*)this_ptr; + FREE((void*)this_ptr); + return Watch_free(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Filter_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKFilter this_ptr_conv = *(LDKFilter*)this_ptr; + FREE((void*)this_ptr); + return Filter_free(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_BroadcasterInterface_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKBroadcasterInterface this_ptr_conv = *(LDKBroadcasterInterface*)this_ptr; + FREE((void*)this_ptr); + return BroadcasterInterface_free(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FeeEstimator_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKFeeEstimator this_ptr_conv = *(LDKFeeEstimator*)this_ptr; + FREE((void*)this_ptr); + return FeeEstimator_free(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChainMonitor_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKChainMonitor this_ptr_conv = *(LDKChainMonitor*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return ChainMonitor_free(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChainMonitor_1block_1connected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header, jlong txdata, jint height) { + LDKChainMonitor* this_arg_conv = (LDKChainMonitor*)this_arg; + unsigned char header_arr[80]; + (*_env)->GetByteArrayRegion (_env, header, 0, 80, header_arr); + unsigned char (*header_ref)[80] = &header_arr; + LDKCVec_C2Tuple_usizeTransactionZZ txdata_conv = *(LDKCVec_C2Tuple_usizeTransactionZZ*)txdata; + FREE((void*)txdata); + return ChainMonitor_block_connected(this_arg_conv, header_ref, txdata_conv, height); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChainMonitor_1block_1disconnected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header, jint disconnected_height) { + LDKChainMonitor* this_arg_conv = (LDKChainMonitor*)this_arg; + unsigned char header_arr[80]; + (*_env)->GetByteArrayRegion (_env, header, 0, 80, header_arr); + unsigned char (*header_ref)[80] = &header_arr; + return ChainMonitor_block_disconnected(this_arg_conv, header_ref, disconnected_height); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChainMonitor_1new(JNIEnv * _env, jclass _b, jlong chain_source, jlong broadcaster, jlong logger, jlong feeest) { + LDKFilter* chain_source_conv = (LDKFilter*)chain_source; + LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)broadcaster; + if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKBroadcasterInterface_JCalls_clone(broadcaster_conv.this_arg); + } + LDKLogger logger_conv = *(LDKLogger*)logger; + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } + LDKFeeEstimator feeest_conv = *(LDKFeeEstimator*)feeest; + if (feeest_conv.free == LDKFeeEstimator_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKFeeEstimator_JCalls_clone(feeest_conv.this_arg); + } + LDKChainMonitor* ret = MALLOC(sizeof(LDKChainMonitor), "LDKChainMonitor"); + *ret = ChainMonitor_new(chain_source_conv, broadcaster_conv, logger_conv, feeest_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChainMonitor_1as_1Watch(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKChainMonitor* this_arg_conv = (LDKChainMonitor*)this_arg; + LDKWatch* ret = MALLOC(sizeof(LDKWatch), "LDKWatch"); + *ret = ChainMonitor_as_Watch(this_arg_conv); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChainMonitor_1as_1EventsProvider(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKChainMonitor* this_arg_conv = (LDKChainMonitor*)this_arg; + LDKEventsProvider* ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); + *ret = ChainMonitor_as_EventsProvider(this_arg_conv); + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKChannelMonitorUpdate this_ptr_conv = *(LDKChannelMonitorUpdate*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return ChannelMonitorUpdate_free(this_ptr_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1get_1update_1id(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKChannelMonitorUpdate* this_ptr_conv = (LDKChannelMonitorUpdate*)this_ptr; + return ChannelMonitorUpdate_get_update_id(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1set_1update_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKChannelMonitorUpdate* this_ptr_conv = (LDKChannelMonitorUpdate*)this_ptr; + return ChannelMonitorUpdate_set_update_id(this_ptr_conv, val); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKChannelMonitorUpdate* obj_conv = (LDKChannelMonitorUpdate*)obj; + LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); + *ret = ChannelMonitorUpdate_write(obj_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChainWatchInterface_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKChainWatchInterface this_ptr_conv = *(LDKChainWatchInterface*)this_ptr; - FREE((void*)this_ptr); - return ChainWatchInterface_free(this_ptr_conv); -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_BroadcasterInterface_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKBroadcasterInterface this_ptr_conv = *(LDKBroadcasterInterface*)this_ptr; - FREE((void*)this_ptr); - return BroadcasterInterface_free(this_ptr_conv); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) { + LDKu8slice ser_conv = *(LDKu8slice*)ser; + LDKChannelMonitorUpdate* ret = MALLOC(sizeof(LDKChannelMonitorUpdate), "LDKChannelMonitorUpdate"); + *ret = ChannelMonitorUpdate_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChainListener_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKChainListener this_ptr_conv = *(LDKChainListener*)this_ptr; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MonitorUpdateError_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKMonitorUpdateError this_ptr_conv = *(LDKMonitorUpdateError*)this_ptr; FREE((void*)this_ptr); - return ChainListener_free(this_ptr_conv); + this_ptr_conv.is_owned = true; + return MonitorUpdateError_free(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FeeEstimator_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKFeeEstimator this_ptr_conv = *(LDKFeeEstimator*)this_ptr; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MonitorEvent_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKMonitorEvent this_ptr_conv = *(LDKMonitorEvent*)this_ptr; FREE((void*)this_ptr); - return FeeEstimator_free(this_ptr_conv); + this_ptr_conv.is_owned = true; + return MonitorEvent_free(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChainWatchedUtil_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKChainWatchedUtil this_ptr_conv = *(LDKChainWatchedUtil*)this_ptr; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKHTLCUpdate this_ptr_conv = *(LDKHTLCUpdate*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return ChainWatchedUtil_free(this_ptr_conv); + this_ptr_conv.is_owned = true; + return HTLCUpdate_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChainWatchedUtil_1new(JNIEnv * _env, jclass _b) { - LDKChainWatchedUtil* ret = MALLOC(sizeof(LDKChainWatchedUtil), "LDKChainWatchedUtil"); - *ret = ChainWatchedUtil_new(); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKHTLCUpdate* obj_conv = (LDKHTLCUpdate*)obj; + LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); + *ret = HTLCUpdate_write(obj_conv); return (long)ret; } -JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_ChainWatchedUtil_1register_1tx(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray txid, jlong script_pub_key) { - LDKChainWatchedUtil* this_arg_conv = (LDKChainWatchedUtil*)this_arg; - unsigned char txid_arr[32]; - (*_env)->GetByteArrayRegion (_env, txid, 0, 32, txid_arr); - unsigned char (*txid_ref)[32] = &txid_arr; - LDKu8slice script_pub_key_conv = *(LDKu8slice*)script_pub_key; - FREE((void*)script_pub_key); - return ChainWatchedUtil_register_tx(this_arg_conv, txid_ref, script_pub_key_conv); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) { + LDKu8slice ser_conv = *(LDKu8slice*)ser; + LDKHTLCUpdate* ret = MALLOC(sizeof(LDKHTLCUpdate), "LDKHTLCUpdate"); + *ret = HTLCUpdate_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; } -JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_ChainWatchedUtil_1register_1outpoint(JNIEnv * _env, jclass _b, jlong this_arg, jlong outpoint, jlong _script_pub_key) { - LDKChainWatchedUtil* this_arg_conv = (LDKChainWatchedUtil*)this_arg; - LDKC2Tuple_Txidu32Z outpoint_conv = *(LDKC2Tuple_Txidu32Z*)outpoint; - FREE((void*)outpoint); - LDKu8slice _script_pub_key_conv = *(LDKu8slice*)_script_pub_key; - FREE((void*)_script_pub_key); - return ChainWatchedUtil_register_outpoint(this_arg_conv, outpoint_conv, _script_pub_key_conv); +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKChannelMonitor this_ptr_conv = *(LDKChannelMonitor*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return ChannelMonitor_free(this_ptr_conv); } -JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_ChainWatchedUtil_1watch_1all(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKChainWatchedUtil* this_arg_conv = (LDKChainWatchedUtil*)this_arg; - return ChainWatchedUtil_watch_all(this_arg_conv); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1update_1monitor(JNIEnv * _env, jclass _b, jlong this_arg, jlong updates, jlong broadcaster, jlong logger) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; + LDKChannelMonitorUpdate updates_conv = *(LDKChannelMonitorUpdate*)updates; + FREE((void*)updates); + updates_conv.is_owned = true; + LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster; + LDKLogger* logger_conv = (LDKLogger*)logger; + LDKCResult_NoneMonitorUpdateErrorZ* ret = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ"); + *ret = ChannelMonitor_update_monitor(this_arg_conv, updates_conv, broadcaster_conv, logger_conv); + return (long)ret; } -JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_ChainWatchedUtil_1does_1match_1tx(JNIEnv * _env, jclass _b, jlong this_arg, jlong tx) { - LDKChainWatchedUtil* this_arg_conv = (LDKChainWatchedUtil*)this_arg; - LDKTransaction tx_conv = *(LDKTransaction*)tx; - FREE((void*)tx); - return ChainWatchedUtil_does_match_tx(this_arg_conv, tx_conv); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1latest_1update_1id(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; + return ChannelMonitor_get_latest_update_id(this_arg_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_BlockNotifier_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKBlockNotifier this_ptr_conv = *(LDKBlockNotifier*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return BlockNotifier_free(this_ptr_conv); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1funding_1txo(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; + LDKC2Tuple_OutPointScriptZ* ret = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); + *ret = ChannelMonitor_get_funding_txo(this_arg_conv); + return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_BlockNotifier_1new(JNIEnv * _env, jclass _b, jlong chain_monitor) { - LDKChainWatchInterface chain_monitor_conv = *(LDKChainWatchInterface*)chain_monitor; - LDKChainWatchInterface_JCalls_clone(chain_monitor_conv.this_arg); - LDKBlockNotifier* ret = MALLOC(sizeof(LDKBlockNotifier), "LDKBlockNotifier"); - *ret = BlockNotifier_new(chain_monitor_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1and_1clear_1pending_1monitor_1events(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; + LDKCVec_MonitorEventZ* ret = MALLOC(sizeof(LDKCVec_MonitorEventZ), "LDKCVec_MonitorEventZ"); + *ret = ChannelMonitor_get_and_clear_pending_monitor_events(this_arg_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_BlockNotifier_1register_1listener(JNIEnv * _env, jclass _b, jlong this_arg, jlong listener) { - LDKBlockNotifier* this_arg_conv = (LDKBlockNotifier*)this_arg; - LDKChainListener listener_conv = *(LDKChainListener*)listener; - LDKChainListener_JCalls_clone(listener_conv.this_arg); - return BlockNotifier_register_listener(this_arg_conv, listener_conv); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1and_1clear_1pending_1events(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; + LDKCVec_EventZ* ret = MALLOC(sizeof(LDKCVec_EventZ), "LDKCVec_EventZ"); + *ret = ChannelMonitor_get_and_clear_pending_events(this_arg_conv); + return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_BlockNotifier_1block_1connected(JNIEnv * _env, jclass _b, jlong this_arg, jlong block, jint height) { - LDKBlockNotifier* this_arg_conv = (LDKBlockNotifier*)this_arg; - LDKu8slice block_conv = *(LDKu8slice*)block; - FREE((void*)block); - return BlockNotifier_block_connected(this_arg_conv, block_conv, height); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1latest_1holder_1commitment_1txn(JNIEnv * _env, jclass _b, jlong this_arg, jlong logger) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; + LDKLogger* logger_conv = (LDKLogger*)logger; + LDKCVec_TransactionZ* ret = MALLOC(sizeof(LDKCVec_TransactionZ), "LDKCVec_TransactionZ"); + *ret = ChannelMonitor_get_latest_holder_commitment_txn(this_arg_conv, logger_conv); + return (long)ret; } -JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_BlockNotifier_1block_1connected_1checked(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header, jint height, jlong txn_matched, jlong indexes_of_txn_matched) { - LDKBlockNotifier* this_arg_conv = (LDKBlockNotifier*)this_arg; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1block_1connected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header, jlong txdata, jint height, jlong broadcaster, jlong fee_estimator, jlong logger) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; unsigned char header_arr[80]; (*_env)->GetByteArrayRegion (_env, header, 0, 80, header_arr); unsigned char (*header_ref)[80] = &header_arr; - LDKCVec_TransactionZ txn_matched_conv = *(LDKCVec_TransactionZ*)txn_matched; - FREE((void*)txn_matched); - LDKusizeslice indexes_of_txn_matched_conv = *(LDKusizeslice*)indexes_of_txn_matched; - FREE((void*)indexes_of_txn_matched); - return BlockNotifier_block_connected_checked(this_arg_conv, header_ref, height, txn_matched_conv, indexes_of_txn_matched_conv); + LDKCVec_C2Tuple_usizeTransactionZZ txdata_conv = *(LDKCVec_C2Tuple_usizeTransactionZZ*)txdata; + FREE((void*)txdata); + LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)broadcaster; + if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKBroadcasterInterface_JCalls_clone(broadcaster_conv.this_arg); + } + LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)fee_estimator; + if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKFeeEstimator_JCalls_clone(fee_estimator_conv.this_arg); + } + LDKLogger logger_conv = *(LDKLogger*)logger; + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } + LDKCVec_C2Tuple_TxidCVec_TxOutZZZ* ret = MALLOC(sizeof(LDKCVec_C2Tuple_TxidCVec_TxOutZZZ), "LDKCVec_C2Tuple_TxidCVec_TxOutZZZ"); + *ret = ChannelMonitor_block_connected(this_arg_conv, header_ref, txdata_conv, height, broadcaster_conv, fee_estimator_conv, logger_conv); + return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_BlockNotifier_1block_1disconnected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header, jint disconnected_height) { - LDKBlockNotifier* this_arg_conv = (LDKBlockNotifier*)this_arg; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1block_1disconnected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header, jint height, jlong broadcaster, jlong fee_estimator, jlong logger) { + LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; unsigned char header_arr[80]; (*_env)->GetByteArrayRegion (_env, header, 0, 80, header_arr); unsigned char (*header_ref)[80] = &header_arr; - return BlockNotifier_block_disconnected(this_arg_conv, header_ref, disconnected_height); -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChainWatchInterfaceUtil_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKChainWatchInterfaceUtil this_ptr_conv = *(LDKChainWatchInterfaceUtil*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return ChainWatchInterfaceUtil_free(this_ptr_conv); -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChainWatchInterfaceUtil_1as_1ChainWatchInterface(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKChainWatchInterfaceUtil* this_arg_conv = (LDKChainWatchInterfaceUtil*)this_arg; - LDKChainWatchInterface* ret = MALLOC(sizeof(LDKChainWatchInterface), "LDKChainWatchInterface"); - *ret = ChainWatchInterfaceUtil_as_ChainWatchInterface(this_arg_conv); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChainWatchInterfaceUtil_1new(JNIEnv * _env, jclass _b, jlong network) { - LDKNetwork network_conv = *(LDKNetwork*)network; - FREE((void*)network); - LDKChainWatchInterfaceUtil* ret = MALLOC(sizeof(LDKChainWatchInterfaceUtil), "LDKChainWatchInterfaceUtil"); - *ret = ChainWatchInterfaceUtil_new(network_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; - return (long)ret; -} - -JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_ChainWatchInterfaceUtil_1does_1match_1tx(JNIEnv * _env, jclass _b, jlong this_arg, jlong tx) { - LDKChainWatchInterfaceUtil* this_arg_conv = (LDKChainWatchInterfaceUtil*)this_arg; - LDKTransaction tx_conv = *(LDKTransaction*)tx; - FREE((void*)tx); - return ChainWatchInterfaceUtil_does_match_tx(this_arg_conv, tx_conv); + LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)broadcaster; + if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKBroadcasterInterface_JCalls_clone(broadcaster_conv.this_arg); + } + LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)fee_estimator; + if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKFeeEstimator_JCalls_clone(fee_estimator_conv.this_arg); + } + LDKLogger logger_conv = *(LDKLogger*)logger; + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } + return ChannelMonitor_block_disconnected(this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OutPoint_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKOutPoint this_ptr_conv = *(LDKOutPoint*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return OutPoint_free(this_ptr_conv); } @@ -2226,8 +3445,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1new(JNIEnv * _env, FREE((void*)txid_arg); LDKOutPoint* ret = MALLOC(sizeof(LDKOutPoint), "LDKOutPoint"); *ret = OutPoint_new(txid_arg_conv, index_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2247,11 +3466,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1write(JNIEnv * _env JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKOutPoint* ret = MALLOC(sizeof(LDKOutPoint), "LDKOutPoint"); *ret = OutPoint_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2276,7 +3494,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_KeysInterface_1free(JNIEnv * _ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKInMemoryChannelKeys this_ptr_conv = *(LDKInMemoryChannelKeys*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return InMemoryChannelKeys_free(this_ptr_conv); } @@ -2381,28 +3599,28 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1new(JNIE FREE((void*)key_derivation_params); LDKInMemoryChannelKeys* ret = MALLOC(sizeof(LDKInMemoryChannelKeys), "LDKInMemoryChannelKeys"); *ret = InMemoryChannelKeys_new(funding_key_conv, revocation_base_key_conv, payment_key_conv, delayed_payment_base_key_conv, htlc_base_key_conv, commitment_seed_conv, channel_value_satoshis, key_derivation_params_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1pubkeys(JNIEnv * _env, jclass _b, jlong this_arg) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1counterparty_1pubkeys(JNIEnv * _env, jclass _b, jlong this_arg) { LDKInMemoryChannelKeys* this_arg_conv = (LDKInMemoryChannelKeys*)this_arg; LDKChannelPublicKeys* ret = MALLOC(sizeof(LDKChannelPublicKeys), "LDKChannelPublicKeys"); - *ret = InMemoryChannelKeys_remote_pubkeys(this_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + *ret = InMemoryChannelKeys_counterparty_pubkeys(this_arg_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } -JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1counterparty_1selected_1contest_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { LDKInMemoryChannelKeys* this_arg_conv = (LDKInMemoryChannelKeys*)this_arg; - return InMemoryChannelKeys_remote_to_self_delay(this_arg_conv); + return InMemoryChannelKeys_counterparty_selected_contest_delay(this_arg_conv); } -JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1local_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1holder_1selected_1contest_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { LDKInMemoryChannelKeys* this_arg_conv = (LDKInMemoryChannelKeys*)this_arg; - return InMemoryChannelKeys_local_to_self_delay(this_arg_conv); + return InMemoryChannelKeys_holder_selected_contest_delay(this_arg_conv); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1as_1ChannelKeys(JNIEnv * _env, jclass _b, jlong this_arg) { @@ -2421,31 +3639,29 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1write(JN JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKInMemoryChannelKeys* ret = MALLOC(sizeof(LDKInMemoryChannelKeys), "LDKInMemoryChannelKeys"); *ret = InMemoryChannelKeys_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_KeysManager_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKKeysManager this_ptr_conv = *(LDKKeysManager*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return KeysManager_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysManager_1new(JNIEnv * _env, jclass _b, jbyteArray seed, jlong network, jlong starting_time_secs, jint starting_time_nanos) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysManager_1new(JNIEnv * _env, jclass _b, jbyteArray seed, jclass network, jlong starting_time_secs, jint starting_time_nanos) { unsigned char seed_arr[32]; (*_env)->GetByteArrayRegion (_env, seed, 0, 32, seed_arr); unsigned char (*seed_ref)[32] = &seed_arr; - LDKNetwork network_conv = *(LDKNetwork*)network; - FREE((void*)network); + LDKNetwork network_conv = LDKNetwork_from_java(_env, network); LDKKeysManager* ret = MALLOC(sizeof(LDKKeysManager), "LDKKeysManager"); *ret = KeysManager_new(seed_ref, network_conv, starting_time_secs, starting_time_nanos); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2453,8 +3669,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysManager_1derive_1channel_ LDKKeysManager* this_arg_conv = (LDKKeysManager*)this_arg; LDKInMemoryChannelKeys* ret = MALLOC(sizeof(LDKInMemoryChannelKeys), "LDKInMemoryChannelKeys"); *ret = KeysManager_derive_channel_keys(this_arg_conv, channel_value_satoshis, params_1, params_2); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2468,14 +3684,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysManager_1as_1KeysInterfac JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelManager this_ptr_conv = *(LDKChannelManager*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelManager_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelDetails this_ptr_conv = *(LDKChannelDetails*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelDetails_free(this_ptr_conv); } @@ -2511,8 +3727,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1get_1counterp LDKChannelDetails* this_ptr_conv = (LDKChannelDetails*)this_ptr; LDKInitFeatures* ret = MALLOC(sizeof(LDKInitFeatures), "LDKInitFeatures"); *ret = ChannelDetails_get_counterparty_features(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2520,7 +3736,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1set_1counterpa LDKChannelDetails* this_ptr_conv = (LDKChannelDetails*)this_ptr; LDKInitFeatures val_conv = *(LDKInitFeatures*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return ChannelDetails_set_counterparty_features(this_ptr_conv, val_conv); } @@ -2577,32 +3793,44 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1set_1is_1live( JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_PaymentSendFailure_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPaymentSendFailure this_ptr_conv = *(LDKPaymentSendFailure*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return PaymentSendFailure_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1new(JNIEnv * _env, jclass _b, jlong network, jlong fee_est, jlong monitor, jlong tx_broadcaster, jlong logger, jlong keys_manager, jlong config, jlong current_blockchain_height) { - LDKNetwork network_conv = *(LDKNetwork*)network; - FREE((void*)network); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1new(JNIEnv * _env, jclass _b, jclass network, jlong fee_est, jlong chain_monitor, jlong tx_broadcaster, jlong logger, jlong keys_manager, jlong config, jlong current_blockchain_height) { + LDKNetwork network_conv = LDKNetwork_from_java(_env, network); LDKFeeEstimator fee_est_conv = *(LDKFeeEstimator*)fee_est; - LDKFeeEstimator_JCalls_clone(fee_est_conv.this_arg); - LDKManyChannelMonitor monitor_conv = *(LDKManyChannelMonitor*)monitor; - LDKManyChannelMonitor_JCalls_clone(monitor_conv.this_arg); + if (fee_est_conv.free == LDKFeeEstimator_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKFeeEstimator_JCalls_clone(fee_est_conv.this_arg); + } + LDKWatch chain_monitor_conv = *(LDKWatch*)chain_monitor; + if (chain_monitor_conv.free == LDKWatch_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKWatch_JCalls_clone(chain_monitor_conv.this_arg); + } LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)tx_broadcaster; - LDKBroadcasterInterface_JCalls_clone(tx_broadcaster_conv.this_arg); + if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKBroadcasterInterface_JCalls_clone(tx_broadcaster_conv.this_arg); + } LDKLogger logger_conv = *(LDKLogger*)logger; - LDKLogger_JCalls_clone(logger_conv.this_arg); + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)keys_manager; - LDKKeysInterface_JCalls_clone(keys_manager_conv.this_arg); + if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKKeysInterface_JCalls_clone(keys_manager_conv.this_arg); + } LDKUserConfig config_conv = *(LDKUserConfig*)config; FREE((void*)config); - config_conv._underlying_ref = false; - uintptr_t current_blockchain_height_conv = *(uintptr_t*)current_blockchain_height; - FREE((void*)current_blockchain_height); + config_conv.is_owned = true; LDKChannelManager* ret = MALLOC(sizeof(LDKChannelManager), "LDKChannelManager"); - *ret = ChannelManager_new(network_conv, fee_est_conv, monitor_conv, tx_broadcaster_conv, logger_conv, keys_manager_conv, config_conv, current_blockchain_height_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + *ret = ChannelManager_new(network_conv, fee_est_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, keys_manager_conv, config_conv, current_blockchain_height); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2612,7 +3840,7 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1create_1chann FREE((void*)their_network_key); LDKUserConfig override_config_conv = *(LDKUserConfig*)override_config; FREE((void*)override_config); - override_config_conv._underlying_ref = false; + override_config_conv.is_owned = true; LDKCResult_NoneAPIErrorZ* ret = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret = ChannelManager_create_channel(this_arg_conv, their_network_key_conv, channel_value_satoshis, push_msat, user_id, override_config_conv); return (long)ret; @@ -2674,7 +3902,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1funding_1trans unsigned char (*temporary_channel_id_ref)[32] = &temporary_channel_id_arr; LDKOutPoint funding_txo_conv = *(LDKOutPoint*)funding_txo; FREE((void*)funding_txo); - funding_txo_conv._underlying_ref = false; + funding_txo_conv.is_owned = true; return ChannelManager_funding_transaction_generated(this_arg_conv, temporary_channel_id_ref, funding_txo_conv); } @@ -2745,11 +3973,22 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1as_1EventsPro return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1as_1ChainListener(JNIEnv * _env, jclass _b, jlong this_arg) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1block_1connected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header, jlong txdata, jint height) { LDKChannelManager* this_arg_conv = (LDKChannelManager*)this_arg; - LDKChainListener* ret = MALLOC(sizeof(LDKChainListener), "LDKChainListener"); - *ret = ChannelManager_as_ChainListener(this_arg_conv); - return (long)ret; + unsigned char header_arr[80]; + (*_env)->GetByteArrayRegion (_env, header, 0, 80, header_arr); + unsigned char (*header_ref)[80] = &header_arr; + LDKCVec_C2Tuple_usizeTransactionZZ txdata_conv = *(LDKCVec_C2Tuple_usizeTransactionZZ*)txdata; + FREE((void*)txdata); + return ChannelManager_block_connected(this_arg_conv, header_ref, txdata_conv, height); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1block_1disconnected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray header) { + LDKChannelManager* this_arg_conv = (LDKChannelManager*)this_arg; + unsigned char header_arr[80]; + (*_env)->GetByteArrayRegion (_env, header, 0, 80, header_arr); + unsigned char (*header_ref)[80] = &header_arr; + return ChannelManager_block_disconnected(this_arg_conv, header_ref); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1as_1ChannelMessageHandler(JNIEnv * _env, jclass _b, jlong this_arg) { @@ -2762,7 +4001,7 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1as_1ChannelMe JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelManagerReadArgs this_ptr_conv = *(LDKChannelManagerReadArgs*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelManagerReadArgs_free(this_ptr_conv); } @@ -2775,7 +4014,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1keys_1manager(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; LDKKeysInterface val_conv = *(LDKKeysInterface*)val; - LDKKeysInterface_JCalls_clone(val_conv.this_arg); + if (val_conv.free == LDKKeysInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKKeysInterface_JCalls_clone(val_conv.this_arg); + } return ChannelManagerReadArgs_set_keys_manager(this_ptr_conv, val_conv); } @@ -2788,21 +4030,27 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1fee_1estimator(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; LDKFeeEstimator val_conv = *(LDKFeeEstimator*)val; - LDKFeeEstimator_JCalls_clone(val_conv.this_arg); + if (val_conv.free == LDKFeeEstimator_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKFeeEstimator_JCalls_clone(val_conv.this_arg); + } return ChannelManagerReadArgs_set_fee_estimator(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1monitor(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1chain_1monitor(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; - long ret = (long)ChannelManagerReadArgs_get_monitor(this_ptr_conv); + long ret = (long)ChannelManagerReadArgs_get_chain_monitor(this_ptr_conv); return ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1monitor(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1chain_1monitor(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; - LDKManyChannelMonitor val_conv = *(LDKManyChannelMonitor*)val; - LDKManyChannelMonitor_JCalls_clone(val_conv.this_arg); - return ChannelManagerReadArgs_set_monitor(this_ptr_conv, val_conv); + LDKWatch val_conv = *(LDKWatch*)val; + if (val_conv.free == LDKWatch_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKWatch_JCalls_clone(val_conv.this_arg); + } + return ChannelManagerReadArgs_set_chain_monitor(this_ptr_conv, val_conv); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1tx_1broadcaster(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -2814,7 +4062,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1tx_1broadcaster(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)val; - LDKBroadcasterInterface_JCalls_clone(val_conv.this_arg); + if (val_conv.free == LDKBroadcasterInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKBroadcasterInterface_JCalls_clone(val_conv.this_arg); + } return ChannelManagerReadArgs_set_tx_broadcaster(this_ptr_conv, val_conv); } @@ -2827,7 +4078,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1logger(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; LDKLogger val_conv = *(LDKLogger*)val; - LDKLogger_JCalls_clone(val_conv.this_arg); + if (val_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(val_conv.this_arg); + } return ChannelManagerReadArgs_set_logger(this_ptr_conv, val_conv); } @@ -2835,8 +4089,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1get_1 LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; LDKUserConfig* ret = MALLOC(sizeof(LDKUserConfig), "LDKUserConfig"); *ret = ChannelManagerReadArgs_get_default_config(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -2844,182 +4098,66 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1d LDKChannelManagerReadArgs* this_ptr_conv = (LDKChannelManagerReadArgs*)this_ptr; LDKUserConfig val_conv = *(LDKUserConfig*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return ChannelManagerReadArgs_set_default_config(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1new(JNIEnv * _env, jclass _b, jlong keys_manager, jlong fee_estimator, jlong monitor, jlong tx_broadcaster, jlong logger, jlong default_config, jlong channel_monitors) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1new(JNIEnv * _env, jclass _b, jlong keys_manager, jlong fee_estimator, jlong chain_monitor, jlong tx_broadcaster, jlong logger, jlong default_config, jlong channel_monitors) { LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)keys_manager; - LDKKeysInterface_JCalls_clone(keys_manager_conv.this_arg); + if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKKeysInterface_JCalls_clone(keys_manager_conv.this_arg); + } LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)fee_estimator; - LDKFeeEstimator_JCalls_clone(fee_estimator_conv.this_arg); - LDKManyChannelMonitor monitor_conv = *(LDKManyChannelMonitor*)monitor; - LDKManyChannelMonitor_JCalls_clone(monitor_conv.this_arg); + if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKFeeEstimator_JCalls_clone(fee_estimator_conv.this_arg); + } + LDKWatch chain_monitor_conv = *(LDKWatch*)chain_monitor; + if (chain_monitor_conv.free == LDKWatch_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKWatch_JCalls_clone(chain_monitor_conv.this_arg); + } LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)tx_broadcaster; - LDKBroadcasterInterface_JCalls_clone(tx_broadcaster_conv.this_arg); + if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKBroadcasterInterface_JCalls_clone(tx_broadcaster_conv.this_arg); + } LDKLogger logger_conv = *(LDKLogger*)logger; - LDKLogger_JCalls_clone(logger_conv.this_arg); + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } LDKUserConfig default_config_conv = *(LDKUserConfig*)default_config; FREE((void*)default_config); - default_config_conv._underlying_ref = false; + default_config_conv.is_owned = true; LDKCVec_ChannelMonitorZ channel_monitors_conv = *(LDKCVec_ChannelMonitorZ*)channel_monitors; FREE((void*)channel_monitors); LDKChannelManagerReadArgs* ret = MALLOC(sizeof(LDKChannelManagerReadArgs), "LDKChannelManagerReadArgs"); - *ret = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; - return (long)ret; -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKChannelMonitorUpdate this_ptr_conv = *(LDKChannelMonitorUpdate*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return ChannelMonitorUpdate_free(this_ptr_conv); -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1get_1update_1id(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKChannelMonitorUpdate* this_ptr_conv = (LDKChannelMonitorUpdate*)this_ptr; - return ChannelMonitorUpdate_get_update_id(this_ptr_conv); -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1set_1update_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { - LDKChannelMonitorUpdate* this_ptr_conv = (LDKChannelMonitorUpdate*)this_ptr; - return ChannelMonitorUpdate_set_update_id(this_ptr_conv, val); -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1write(JNIEnv * _env, jclass _b, jlong obj) { - LDKChannelMonitorUpdate* obj_conv = (LDKChannelMonitorUpdate*)obj; - LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); - *ret = ChannelMonitorUpdate_write(obj_conv); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) { - LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); - LDKChannelMonitorUpdate* ret = MALLOC(sizeof(LDKChannelMonitorUpdate), "LDKChannelMonitorUpdate"); - *ret = ChannelMonitorUpdate_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; - return (long)ret; -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MonitorUpdateError_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKMonitorUpdateError this_ptr_conv = *(LDKMonitorUpdateError*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return MonitorUpdateError_free(this_ptr_conv); -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MonitorEvent_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKMonitorEvent this_ptr_conv = *(LDKMonitorEvent*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return MonitorEvent_free(this_ptr_conv); -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKHTLCUpdate this_ptr_conv = *(LDKHTLCUpdate*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return HTLCUpdate_free(this_ptr_conv); -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1write(JNIEnv * _env, jclass _b, jlong obj) { - LDKHTLCUpdate* obj_conv = (LDKHTLCUpdate*)obj; - LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); - *ret = HTLCUpdate_write(obj_conv); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) { - LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); - LDKHTLCUpdate* ret = MALLOC(sizeof(LDKHTLCUpdate), "LDKHTLCUpdate"); - *ret = HTLCUpdate_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; - return (long)ret; -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKChannelMonitor this_ptr_conv = *(LDKChannelMonitor*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return ChannelMonitor_free(this_ptr_conv); -} - -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ManyChannelMonitor_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKManyChannelMonitor this_ptr_conv = *(LDKManyChannelMonitor*)this_ptr; - FREE((void*)this_ptr); - return ManyChannelMonitor_free(this_ptr_conv); -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1update_1monitor(JNIEnv * _env, jclass _b, jlong this_arg, jlong updates, jlong broadcaster, jlong logger) { - LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; - LDKChannelMonitorUpdate updates_conv = *(LDKChannelMonitorUpdate*)updates; - FREE((void*)updates); - updates_conv._underlying_ref = false; - LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster; - LDKLogger* logger_conv = (LDKLogger*)logger; - LDKCResult_NoneMonitorUpdateErrorZ* ret = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ"); - *ret = ChannelMonitor_update_monitor(this_arg_conv, updates_conv, broadcaster_conv, logger_conv); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1latest_1update_1id(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; - return ChannelMonitor_get_latest_update_id(this_arg_conv); -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1funding_1txo(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; - LDKC2Tuple_OutPointScriptZ* ret = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); - *ret = ChannelMonitor_get_funding_txo(this_arg_conv); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1and_1clear_1pending_1monitor_1events(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; - LDKCVec_MonitorEventZ* ret = MALLOC(sizeof(LDKCVec_MonitorEventZ), "LDKCVec_MonitorEventZ"); - *ret = ChannelMonitor_get_and_clear_pending_monitor_events(this_arg_conv); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1and_1clear_1pending_1events(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; - LDKCVec_EventZ* ret = MALLOC(sizeof(LDKCVec_EventZ), "LDKCVec_EventZ"); - *ret = ChannelMonitor_get_and_clear_pending_events(this_arg_conv); - return (long)ret; -} - -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1get_1latest_1local_1commitment_1txn(JNIEnv * _env, jclass _b, jlong this_arg, jlong logger) { - LDKChannelMonitor* this_arg_conv = (LDKChannelMonitor*)this_arg; - LDKLogger* logger_conv = (LDKLogger*)logger; - LDKCVec_TransactionZ* ret = MALLOC(sizeof(LDKCVec_TransactionZ), "LDKCVec_TransactionZ"); - *ret = ChannelMonitor_get_latest_local_commitment_txn(this_arg_conv, logger_conv); + *ret = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DecodeError_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKDecodeError this_ptr_conv = *(LDKDecodeError*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return DecodeError_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Init_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKInit this_ptr_conv = *(LDKInit*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return Init_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKErrorMessage this_ptr_conv = *(LDKErrorMessage*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ErrorMessage_free(this_ptr_conv); } @@ -3058,15 +4196,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1new(JNIEnv * _e FREE((void*)data_arg); LDKErrorMessage* ret = MALLOC(sizeof(LDKErrorMessage), "LDKErrorMessage"); *ret = ErrorMessage_new(channel_id_arg_conv, data_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPing this_ptr_conv = *(LDKPing*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return Ping_free(this_ptr_conv); } @@ -3093,15 +4231,15 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1set_1byteslen(JNIEnv * _ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1new(JNIEnv * _env, jclass _b, jshort ponglen_arg, jshort byteslen_arg) { LDKPing* ret = MALLOC(sizeof(LDKPing), "LDKPing"); *ret = Ping_new(ponglen_arg, byteslen_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPong this_ptr_conv = *(LDKPong*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return Pong_free(this_ptr_conv); } @@ -3118,15 +4256,15 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1set_1byteslen(JNIEnv * _ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1new(JNIEnv * _env, jclass _b, jshort byteslen_arg) { LDKPong* ret = MALLOC(sizeof(LDKPong), "LDKPong"); *ret = Pong_new(byteslen_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKOpenChannel this_ptr_conv = *(LDKOpenChannel*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return OpenChannel_free(this_ptr_conv); } @@ -3345,7 +4483,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1channel_1fla JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKAcceptChannel this_ptr_conv = *(LDKAcceptChannel*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return AcceptChannel_free(this_ptr_conv); } @@ -3520,7 +4658,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1first_1per JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKFundingCreated this_ptr_conv = *(LDKFundingCreated*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return FundingCreated_free(this_ptr_conv); } @@ -3585,15 +4723,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1new(JNIEnv * FREE((void*)signature_arg); LDKFundingCreated* ret = MALLOC(sizeof(LDKFundingCreated), "LDKFundingCreated"); *ret = FundingCreated_new(temporary_channel_id_arg_conv, funding_txid_arg_conv, funding_output_index_arg, signature_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingSigned_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKFundingSigned this_ptr_conv = *(LDKFundingSigned*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return FundingSigned_free(this_ptr_conv); } @@ -3632,15 +4770,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1new(JNIEnv * _ FREE((void*)signature_arg); LDKFundingSigned* ret = MALLOC(sizeof(LDKFundingSigned), "LDKFundingSigned"); *ret = FundingSigned_new(channel_id_arg_conv, signature_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingLocked_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKFundingLocked this_ptr_conv = *(LDKFundingLocked*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return FundingLocked_free(this_ptr_conv); } @@ -3679,15 +4817,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1new(JNIEnv * _ FREE((void*)next_per_commitment_point_arg); LDKFundingLocked* ret = MALLOC(sizeof(LDKFundingLocked), "LDKFundingLocked"); *ret = FundingLocked_new(channel_id_arg_conv, next_per_commitment_point_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Shutdown_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKShutdown this_ptr_conv = *(LDKShutdown*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return Shutdown_free(this_ptr_conv); } @@ -3726,15 +4864,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Shutdown_1new(JNIEnv * _env, FREE((void*)scriptpubkey_arg); LDKShutdown* ret = MALLOC(sizeof(LDKShutdown), "LDKShutdown"); *ret = Shutdown_new(channel_id_arg_conv, scriptpubkey_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKClosingSigned this_ptr_conv = *(LDKClosingSigned*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ClosingSigned_free(this_ptr_conv); } @@ -3783,15 +4921,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1new(JNIEnv * _ FREE((void*)signature_arg); LDKClosingSigned* ret = MALLOC(sizeof(LDKClosingSigned), "LDKClosingSigned"); *ret = ClosingSigned_new(channel_id_arg_conv, fee_satoshis_arg, signature_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUpdateAddHTLC this_ptr_conv = *(LDKUpdateAddHTLC*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UpdateAddHTLC_free(this_ptr_conv); } @@ -3856,7 +4994,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1set_1cltv_1expi JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUpdateFulfillHTLC this_ptr_conv = *(LDKUpdateFulfillHTLC*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UpdateFulfillHTLC_free(this_ptr_conv); } @@ -3905,15 +5043,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1new(JNIEnv FREE((void*)payment_preimage_arg); LDKUpdateFulfillHTLC* ret = MALLOC(sizeof(LDKUpdateFulfillHTLC), "LDKUpdateFulfillHTLC"); *ret = UpdateFulfillHTLC_new(channel_id_arg_conv, htlc_id_arg, payment_preimage_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUpdateFailHTLC this_ptr_conv = *(LDKUpdateFailHTLC*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UpdateFailHTLC_free(this_ptr_conv); } @@ -3944,7 +5082,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1set_1htlc_1id( JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUpdateFailMalformedHTLC this_ptr_conv = *(LDKUpdateFailMalformedHTLC*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UpdateFailMalformedHTLC_free(this_ptr_conv); } @@ -3985,7 +5123,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1set_1 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKCommitmentSigned this_ptr_conv = *(LDKCommitmentSigned*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return CommitmentSigned_free(this_ptr_conv); } @@ -4033,15 +5171,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1new(JNIEnv FREE((void*)htlc_signatures_arg); LDKCommitmentSigned* ret = MALLOC(sizeof(LDKCommitmentSigned), "LDKCommitmentSigned"); *ret = CommitmentSigned_new(channel_id_arg_conv, signature_arg_conv, htlc_signatures_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRevokeAndACK this_ptr_conv = *(LDKRevokeAndACK*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return RevokeAndACK_free(this_ptr_conv); } @@ -4096,15 +5234,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1new(JNIEnv * _e FREE((void*)next_per_commitment_point_arg); LDKRevokeAndACK* ret = MALLOC(sizeof(LDKRevokeAndACK), "LDKRevokeAndACK"); *ret = RevokeAndACK_new(channel_id_arg_conv, per_commitment_secret_arg_conv, next_per_commitment_point_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFee_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUpdateFee this_ptr_conv = *(LDKUpdateFee*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UpdateFee_free(this_ptr_conv); } @@ -4137,15 +5275,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFee_1new(JNIEnv * _env, FREE((void*)channel_id_arg); LDKUpdateFee* ret = MALLOC(sizeof(LDKUpdateFee), "LDKUpdateFee"); *ret = UpdateFee_new(channel_id_arg_conv, feerate_per_kw_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKDataLossProtect this_ptr_conv = *(LDKDataLossProtect*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return DataLossProtect_free(this_ptr_conv); } @@ -4184,15 +5322,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1new(JNIEnv * FREE((void*)my_current_per_commitment_point_arg); LDKDataLossProtect* ret = MALLOC(sizeof(LDKDataLossProtect), "LDKDataLossProtect"); *ret = DataLossProtect_new(your_last_per_commitment_secret_arg_conv, my_current_per_commitment_point_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelReestablish this_ptr_conv = *(LDKChannelReestablish*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelReestablish_free(this_ptr_conv); } @@ -4233,7 +5371,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1set_1next_ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKAnnouncementSignatures this_ptr_conv = *(LDKAnnouncementSignatures*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return AnnouncementSignatures_free(this_ptr_conv); } @@ -4298,8 +5436,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1new(J FREE((void*)bitcoin_signature_arg); LDKAnnouncementSignatures* ret = MALLOC(sizeof(LDKAnnouncementSignatures), "LDKAnnouncementSignatures"); *ret = AnnouncementSignatures_new(channel_id_arg_conv, short_channel_id_arg, node_signature_arg_conv, bitcoin_signature_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4312,10 +5450,27 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NetAddress_1free(JNIEnv * _env JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUnsignedNodeAnnouncement this_ptr_conv = *(LDKUnsignedNodeAnnouncement*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UnsignedNodeAnnouncement_free(this_ptr_conv); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1get_1features(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKUnsignedNodeAnnouncement* this_ptr_conv = (LDKUnsignedNodeAnnouncement*)this_ptr; + LDKNodeFeatures* ret = MALLOC(sizeof(LDKNodeFeatures), "LDKNodeFeatures"); + *ret = UnsignedNodeAnnouncement_get_features(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKUnsignedNodeAnnouncement* this_ptr_conv = (LDKUnsignedNodeAnnouncement*)this_ptr; + LDKNodeFeatures val_conv = *(LDKNodeFeatures*)val; + FREE((void*)val); + val_conv.is_owned = true; + return UnsignedNodeAnnouncement_set_features(this_ptr_conv, val_conv); +} + JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1get_1timestamp(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUnsignedNodeAnnouncement* this_ptr_conv = (LDKUnsignedNodeAnnouncement*)this_ptr; return UnsignedNodeAnnouncement_get_timestamp(this_ptr_conv); @@ -4378,7 +5533,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1set_ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKNodeAnnouncement this_ptr_conv = *(LDKNodeAnnouncement*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return NodeAnnouncement_free(this_ptr_conv); } @@ -4400,8 +5555,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1get_1conten LDKNodeAnnouncement* this_ptr_conv = (LDKNodeAnnouncement*)this_ptr; LDKUnsignedNodeAnnouncement* ret = MALLOC(sizeof(LDKUnsignedNodeAnnouncement), "LDKUnsignedNodeAnnouncement"); *ret = NodeAnnouncement_get_contents(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4409,7 +5564,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1set_1content LDKNodeAnnouncement* this_ptr_conv = (LDKNodeAnnouncement*)this_ptr; LDKUnsignedNodeAnnouncement val_conv = *(LDKUnsignedNodeAnnouncement*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return NodeAnnouncement_set_contents(this_ptr_conv, val_conv); } @@ -4418,19 +5573,36 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1new(JNIEnv FREE((void*)signature_arg); LDKUnsignedNodeAnnouncement contents_arg_conv = *(LDKUnsignedNodeAnnouncement*)contents_arg; FREE((void*)contents_arg); - contents_arg_conv._underlying_ref = false; + contents_arg_conv.is_owned = true; LDKNodeAnnouncement* ret = MALLOC(sizeof(LDKNodeAnnouncement), "LDKNodeAnnouncement"); *ret = NodeAnnouncement_new(signature_arg_conv, contents_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKUnsignedChannelAnnouncement this_ptr_conv = *(LDKUnsignedChannelAnnouncement*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return UnsignedChannelAnnouncement_free(this_ptr_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1features(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKUnsignedChannelAnnouncement* this_ptr_conv = (LDKUnsignedChannelAnnouncement*)this_ptr; + LDKChannelFeatures* ret = MALLOC(sizeof(LDKChannelFeatures), "LDKChannelFeatures"); + *ret = UnsignedChannelAnnouncement_get_features(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKUnsignedChannelAnnouncement this_ptr_conv = *(LDKUnsignedChannelAnnouncement*)this_ptr; - FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return UnsignedChannelAnnouncement_free(this_ptr_conv); +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKUnsignedChannelAnnouncement* this_ptr_conv = (LDKUnsignedChannelAnnouncement*)this_ptr; + LDKChannelFeatures val_conv = *(LDKChannelFeatures*)val; + FREE((void*)val); + val_conv.is_owned = true; + return UnsignedChannelAnnouncement_set_features(this_ptr_conv, val_conv); } JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -4516,7 +5688,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1s JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelAnnouncement this_ptr_conv = *(LDKChannelAnnouncement*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelAnnouncement_free(this_ptr_conv); } @@ -4580,8 +5752,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1con LDKChannelAnnouncement* this_ptr_conv = (LDKChannelAnnouncement*)this_ptr; LDKUnsignedChannelAnnouncement* ret = MALLOC(sizeof(LDKUnsignedChannelAnnouncement), "LDKUnsignedChannelAnnouncement"); *ret = ChannelAnnouncement_get_contents(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4589,7 +5761,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1cont LDKChannelAnnouncement* this_ptr_conv = (LDKChannelAnnouncement*)this_ptr; LDKUnsignedChannelAnnouncement val_conv = *(LDKUnsignedChannelAnnouncement*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return ChannelAnnouncement_set_contents(this_ptr_conv, val_conv); } @@ -4604,18 +5776,18 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1new(JNIE FREE((void*)bitcoin_signature_2_arg); LDKUnsignedChannelAnnouncement contents_arg_conv = *(LDKUnsignedChannelAnnouncement*)contents_arg; FREE((void*)contents_arg); - contents_arg_conv._underlying_ref = false; + contents_arg_conv.is_owned = true; LDKChannelAnnouncement* ret = MALLOC(sizeof(LDKChannelAnnouncement), "LDKChannelAnnouncement"); *ret = ChannelAnnouncement_new(node_signature_1_arg_conv, node_signature_2_arg_conv, bitcoin_signature_1_arg_conv, bitcoin_signature_2_arg_conv, contents_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv = *(LDKUnsignedChannelUpdate*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return UnsignedChannelUpdate_free(this_ptr_conv); } @@ -4706,7 +5878,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1set_1fe JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelUpdate this_ptr_conv = *(LDKChannelUpdate*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelUpdate_free(this_ptr_conv); } @@ -4728,8 +5900,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1get_1contents( LDKChannelUpdate* this_ptr_conv = (LDKChannelUpdate*)this_ptr; LDKUnsignedChannelUpdate* ret = MALLOC(sizeof(LDKUnsignedChannelUpdate), "LDKUnsignedChannelUpdate"); *ret = ChannelUpdate_get_contents(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4737,7 +5909,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1set_1contents(J LDKChannelUpdate* this_ptr_conv = (LDKChannelUpdate*)this_ptr; LDKUnsignedChannelUpdate val_conv = *(LDKUnsignedChannelUpdate*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return ChannelUpdate_set_contents(this_ptr_conv, val_conv); } @@ -4746,11 +5918,264 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1new(JNIEnv * _ FREE((void*)signature_arg); LDKUnsignedChannelUpdate contents_arg_conv = *(LDKUnsignedChannelUpdate*)contents_arg; FREE((void*)contents_arg); - contents_arg_conv._underlying_ref = false; + contents_arg_conv.is_owned = true; LDKChannelUpdate* ret = MALLOC(sizeof(LDKChannelUpdate), "LDKChannelUpdate"); *ret = ChannelUpdate_new(signature_arg_conv, contents_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKQueryChannelRange this_ptr_conv = *(LDKQueryChannelRange*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return QueryChannelRange_free(this_ptr_conv); +} + +JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKQueryChannelRange* this_ptr_conv = (LDKQueryChannelRange*)this_ptr; + jbyteArray ret_arr = (*_env)->NewByteArray(_env, 32); + (*_env)->SetByteArrayRegion(_env, ret_arr, 0, 32, *QueryChannelRange_get_chain_hash(this_ptr_conv)); + return ret_arr; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1set_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKQueryChannelRange* this_ptr_conv = (LDKQueryChannelRange*)this_ptr; + LDKThirtyTwoBytes val_conv = *(LDKThirtyTwoBytes*)val; + FREE((void*)val); + return QueryChannelRange_set_chain_hash(this_ptr_conv, val_conv); +} + +JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1get_1first_1blocknum(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKQueryChannelRange* this_ptr_conv = (LDKQueryChannelRange*)this_ptr; + return QueryChannelRange_get_first_blocknum(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1set_1first_1blocknum(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { + LDKQueryChannelRange* this_ptr_conv = (LDKQueryChannelRange*)this_ptr; + return QueryChannelRange_set_first_blocknum(this_ptr_conv, val); +} + +JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1get_1number_1of_1blocks(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKQueryChannelRange* this_ptr_conv = (LDKQueryChannelRange*)this_ptr; + return QueryChannelRange_get_number_of_blocks(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1set_1number_1of_1blocks(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { + LDKQueryChannelRange* this_ptr_conv = (LDKQueryChannelRange*)this_ptr; + return QueryChannelRange_set_number_of_blocks(this_ptr_conv, val); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1new(JNIEnv * _env, jclass _b, jlong chain_hash_arg, jint first_blocknum_arg, jint number_of_blocks_arg) { + LDKThirtyTwoBytes chain_hash_arg_conv = *(LDKThirtyTwoBytes*)chain_hash_arg; + FREE((void*)chain_hash_arg); + LDKQueryChannelRange* ret = MALLOC(sizeof(LDKQueryChannelRange), "LDKQueryChannelRange"); + *ret = QueryChannelRange_new(chain_hash_arg_conv, first_blocknum_arg, number_of_blocks_arg); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyChannelRange this_ptr_conv = *(LDKReplyChannelRange*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return ReplyChannelRange_free(this_ptr_conv); +} + +JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + jbyteArray ret_arr = (*_env)->NewByteArray(_env, 32); + (*_env)->SetByteArrayRegion(_env, ret_arr, 0, 32, *ReplyChannelRange_get_chain_hash(this_ptr_conv)); + return ret_arr; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1set_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + LDKThirtyTwoBytes val_conv = *(LDKThirtyTwoBytes*)val; + FREE((void*)val); + return ReplyChannelRange_set_chain_hash(this_ptr_conv, val_conv); +} + +JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1get_1first_1blocknum(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + return ReplyChannelRange_get_first_blocknum(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1set_1first_1blocknum(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + return ReplyChannelRange_set_first_blocknum(this_ptr_conv, val); +} + +JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1get_1number_1of_1blocks(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + return ReplyChannelRange_get_number_of_blocks(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1set_1number_1of_1blocks(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + return ReplyChannelRange_set_number_of_blocks(this_ptr_conv, val); +} + +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1get_1full_1information(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + return ReplyChannelRange_get_full_information(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1set_1full_1information(JNIEnv * _env, jclass _b, jlong this_ptr, jboolean val) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + return ReplyChannelRange_set_full_information(this_ptr_conv, val); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1set_1short_1channel_1ids(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKReplyChannelRange* this_ptr_conv = (LDKReplyChannelRange*)this_ptr; + LDKCVec_u64Z val_conv = *(LDKCVec_u64Z*)val; + FREE((void*)val); + return ReplyChannelRange_set_short_channel_ids(this_ptr_conv, val_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1new(JNIEnv * _env, jclass _b, jlong chain_hash_arg, jint first_blocknum_arg, jint number_of_blocks_arg, jboolean full_information_arg, jlong short_channel_ids_arg) { + LDKThirtyTwoBytes chain_hash_arg_conv = *(LDKThirtyTwoBytes*)chain_hash_arg; + FREE((void*)chain_hash_arg); + LDKCVec_u64Z short_channel_ids_arg_conv = *(LDKCVec_u64Z*)short_channel_ids_arg; + FREE((void*)short_channel_ids_arg); + LDKReplyChannelRange* ret = MALLOC(sizeof(LDKReplyChannelRange), "LDKReplyChannelRange"); + *ret = ReplyChannelRange_new(chain_hash_arg_conv, first_blocknum_arg, number_of_blocks_arg, full_information_arg, short_channel_ids_arg_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKQueryShortChannelIds this_ptr_conv = *(LDKQueryShortChannelIds*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return QueryShortChannelIds_free(this_ptr_conv); +} + +JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKQueryShortChannelIds* this_ptr_conv = (LDKQueryShortChannelIds*)this_ptr; + jbyteArray ret_arr = (*_env)->NewByteArray(_env, 32); + (*_env)->SetByteArrayRegion(_env, ret_arr, 0, 32, *QueryShortChannelIds_get_chain_hash(this_ptr_conv)); + return ret_arr; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1set_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKQueryShortChannelIds* this_ptr_conv = (LDKQueryShortChannelIds*)this_ptr; + LDKThirtyTwoBytes val_conv = *(LDKThirtyTwoBytes*)val; + FREE((void*)val); + return QueryShortChannelIds_set_chain_hash(this_ptr_conv, val_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1set_1short_1channel_1ids(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKQueryShortChannelIds* this_ptr_conv = (LDKQueryShortChannelIds*)this_ptr; + LDKCVec_u64Z val_conv = *(LDKCVec_u64Z*)val; + FREE((void*)val); + return QueryShortChannelIds_set_short_channel_ids(this_ptr_conv, val_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1new(JNIEnv * _env, jclass _b, jlong chain_hash_arg, jlong short_channel_ids_arg) { + LDKThirtyTwoBytes chain_hash_arg_conv = *(LDKThirtyTwoBytes*)chain_hash_arg; + FREE((void*)chain_hash_arg); + LDKCVec_u64Z short_channel_ids_arg_conv = *(LDKCVec_u64Z*)short_channel_ids_arg; + FREE((void*)short_channel_ids_arg); + LDKQueryShortChannelIds* ret = MALLOC(sizeof(LDKQueryShortChannelIds), "LDKQueryShortChannelIds"); + *ret = QueryShortChannelIds_new(chain_hash_arg_conv, short_channel_ids_arg_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyShortChannelIdsEnd this_ptr_conv = *(LDKReplyShortChannelIdsEnd*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return ReplyShortChannelIdsEnd_free(this_ptr_conv); +} + +JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyShortChannelIdsEnd* this_ptr_conv = (LDKReplyShortChannelIdsEnd*)this_ptr; + jbyteArray ret_arr = (*_env)->NewByteArray(_env, 32); + (*_env)->SetByteArrayRegion(_env, ret_arr, 0, 32, *ReplyShortChannelIdsEnd_get_chain_hash(this_ptr_conv)); + return ret_arr; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1set_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKReplyShortChannelIdsEnd* this_ptr_conv = (LDKReplyShortChannelIdsEnd*)this_ptr; + LDKThirtyTwoBytes val_conv = *(LDKThirtyTwoBytes*)val; + FREE((void*)val); + return ReplyShortChannelIdsEnd_set_chain_hash(this_ptr_conv, val_conv); +} + +JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1get_1full_1information(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKReplyShortChannelIdsEnd* this_ptr_conv = (LDKReplyShortChannelIdsEnd*)this_ptr; + return ReplyShortChannelIdsEnd_get_full_information(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1set_1full_1information(JNIEnv * _env, jclass _b, jlong this_ptr, jboolean val) { + LDKReplyShortChannelIdsEnd* this_ptr_conv = (LDKReplyShortChannelIdsEnd*)this_ptr; + return ReplyShortChannelIdsEnd_set_full_information(this_ptr_conv, val); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1new(JNIEnv * _env, jclass _b, jlong chain_hash_arg, jboolean full_information_arg) { + LDKThirtyTwoBytes chain_hash_arg_conv = *(LDKThirtyTwoBytes*)chain_hash_arg; + FREE((void*)chain_hash_arg); + LDKReplyShortChannelIdsEnd* ret = MALLOC(sizeof(LDKReplyShortChannelIdsEnd), "LDKReplyShortChannelIdsEnd"); + *ret = ReplyShortChannelIdsEnd_new(chain_hash_arg_conv, full_information_arg); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKGossipTimestampFilter this_ptr_conv = *(LDKGossipTimestampFilter*)this_ptr; + FREE((void*)this_ptr); + this_ptr_conv.is_owned = true; + return GossipTimestampFilter_free(this_ptr_conv); +} + +JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKGossipTimestampFilter* this_ptr_conv = (LDKGossipTimestampFilter*)this_ptr; + jbyteArray ret_arr = (*_env)->NewByteArray(_env, 32); + (*_env)->SetByteArrayRegion(_env, ret_arr, 0, 32, *GossipTimestampFilter_get_chain_hash(this_ptr_conv)); + return ret_arr; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1set_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKGossipTimestampFilter* this_ptr_conv = (LDKGossipTimestampFilter*)this_ptr; + LDKThirtyTwoBytes val_conv = *(LDKThirtyTwoBytes*)val; + FREE((void*)val); + return GossipTimestampFilter_set_chain_hash(this_ptr_conv, val_conv); +} + +JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1get_1first_1timestamp(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKGossipTimestampFilter* this_ptr_conv = (LDKGossipTimestampFilter*)this_ptr; + return GossipTimestampFilter_get_first_timestamp(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1set_1first_1timestamp(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { + LDKGossipTimestampFilter* this_ptr_conv = (LDKGossipTimestampFilter*)this_ptr; + return GossipTimestampFilter_set_first_timestamp(this_ptr_conv, val); +} + +JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1get_1timestamp_1range(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKGossipTimestampFilter* this_ptr_conv = (LDKGossipTimestampFilter*)this_ptr; + return GossipTimestampFilter_get_timestamp_range(this_ptr_conv); +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1set_1timestamp_1range(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { + LDKGossipTimestampFilter* this_ptr_conv = (LDKGossipTimestampFilter*)this_ptr; + return GossipTimestampFilter_set_timestamp_range(this_ptr_conv, val); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1new(JNIEnv * _env, jclass _b, jlong chain_hash_arg, jint first_timestamp_arg, jint timestamp_range_arg) { + LDKThirtyTwoBytes chain_hash_arg_conv = *(LDKThirtyTwoBytes*)chain_hash_arg; + FREE((void*)chain_hash_arg); + LDKGossipTimestampFilter* ret = MALLOC(sizeof(LDKGossipTimestampFilter), "LDKGossipTimestampFilter"); + *ret = GossipTimestampFilter_new(chain_hash_arg_conv, first_timestamp_arg, timestamp_range_arg); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4763,7 +6188,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ErrorAction_1free(JNIEnv * _en JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LightningError_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKLightningError this_ptr_conv = *(LDKLightningError*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return LightningError_free(this_ptr_conv); } @@ -4802,15 +6227,15 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LightningError_1new(JNIEnv * FREE((void*)action_arg); LDKLightningError* ret = MALLOC(sizeof(LDKLightningError), "LDKLightningError"); *ret = LightningError_new(err_arg_conv, action_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKCommitmentUpdate this_ptr_conv = *(LDKCommitmentUpdate*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return CommitmentUpdate_free(this_ptr_conv); } @@ -4846,8 +6271,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1get_1update LDKCommitmentUpdate* this_ptr_conv = (LDKCommitmentUpdate*)this_ptr; LDKUpdateFee* ret = MALLOC(sizeof(LDKUpdateFee), "LDKUpdateFee"); *ret = CommitmentUpdate_get_update_fee(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4855,7 +6280,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1set_1update_ LDKCommitmentUpdate* this_ptr_conv = (LDKCommitmentUpdate*)this_ptr; LDKUpdateFee val_conv = *(LDKUpdateFee*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return CommitmentUpdate_set_update_fee(this_ptr_conv, val_conv); } @@ -4863,8 +6288,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1get_1commit LDKCommitmentUpdate* this_ptr_conv = (LDKCommitmentUpdate*)this_ptr; LDKCommitmentSigned* ret = MALLOC(sizeof(LDKCommitmentSigned), "LDKCommitmentSigned"); *ret = CommitmentUpdate_get_commitment_signed(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4872,7 +6297,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1set_1commitm LDKCommitmentUpdate* this_ptr_conv = (LDKCommitmentUpdate*)this_ptr; LDKCommitmentSigned val_conv = *(LDKCommitmentSigned*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return CommitmentUpdate_set_commitment_signed(this_ptr_conv, val_conv); } @@ -4887,14 +6312,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1new(JNIEnv FREE((void*)update_fail_malformed_htlcs_arg); LDKUpdateFee update_fee_arg_conv = *(LDKUpdateFee*)update_fee_arg; FREE((void*)update_fee_arg); - update_fee_arg_conv._underlying_ref = false; + update_fee_arg_conv.is_owned = true; LDKCommitmentSigned commitment_signed_arg_conv = *(LDKCommitmentSigned*)commitment_signed_arg; FREE((void*)commitment_signed_arg); - commitment_signed_arg_conv._underlying_ref = false; + commitment_signed_arg_conv.is_owned = true; LDKCommitmentUpdate* ret = MALLOC(sizeof(LDKCommitmentUpdate), "LDKCommitmentUpdate"); *ret = CommitmentUpdate_new(update_add_htlcs_arg_conv, update_fulfill_htlcs_arg_conv, update_fail_htlcs_arg_conv, update_fail_malformed_htlcs_arg_conv, update_fee_arg_conv, commitment_signed_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4925,11 +6350,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKAcceptChannel* ret = MALLOC(sizeof(LDKAcceptChannel), "LDKAcceptChannel"); *ret = AcceptChannel_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4942,11 +6366,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1write JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKAnnouncementSignatures* ret = MALLOC(sizeof(LDKAnnouncementSignatures), "LDKAnnouncementSignatures"); *ret = AnnouncementSignatures_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4959,11 +6382,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1write(JNI JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKChannelReestablish* ret = MALLOC(sizeof(LDKChannelReestablish), "LDKChannelReestablish"); *ret = ChannelReestablish_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4976,11 +6398,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKClosingSigned* ret = MALLOC(sizeof(LDKClosingSigned), "LDKClosingSigned"); *ret = ClosingSigned_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -4993,11 +6414,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1write(JNIEn JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKCommitmentSigned* ret = MALLOC(sizeof(LDKCommitmentSigned), "LDKCommitmentSigned"); *ret = CommitmentSigned_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5010,11 +6430,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1write(JNIEnv JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKFundingCreated* ret = MALLOC(sizeof(LDKFundingCreated), "LDKFundingCreated"); *ret = FundingCreated_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5027,11 +6446,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKFundingSigned* ret = MALLOC(sizeof(LDKFundingSigned), "LDKFundingSigned"); *ret = FundingSigned_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5044,11 +6462,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKFundingLocked* ret = MALLOC(sizeof(LDKFundingLocked), "LDKFundingLocked"); *ret = FundingLocked_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5061,11 +6478,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Init_1write(JNIEnv * _env, jc JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Init_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKInit* ret = MALLOC(sizeof(LDKInit), "LDKInit"); *ret = Init_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5078,11 +6494,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1write(JNIEnv * _ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKOpenChannel* ret = MALLOC(sizeof(LDKOpenChannel), "LDKOpenChannel"); *ret = OpenChannel_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5095,11 +6510,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKRevokeAndACK* ret = MALLOC(sizeof(LDKRevokeAndACK), "LDKRevokeAndACK"); *ret = RevokeAndACK_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5112,11 +6526,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Shutdown_1write(JNIEnv * _env JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Shutdown_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKShutdown* ret = MALLOC(sizeof(LDKShutdown), "LDKShutdown"); *ret = Shutdown_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5129,11 +6542,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1write(JNIEnv JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUpdateFailHTLC* ret = MALLOC(sizeof(LDKUpdateFailHTLC), "LDKUpdateFailHTLC"); *ret = UpdateFailHTLC_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5146,11 +6558,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1writ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUpdateFailMalformedHTLC* ret = MALLOC(sizeof(LDKUpdateFailMalformedHTLC), "LDKUpdateFailMalformedHTLC"); *ret = UpdateFailMalformedHTLC_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5163,11 +6574,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFee_1write(JNIEnv * _en JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFee_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUpdateFee* ret = MALLOC(sizeof(LDKUpdateFee), "LDKUpdateFee"); *ret = UpdateFee_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5180,11 +6590,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1write(JNIE JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUpdateFulfillHTLC* ret = MALLOC(sizeof(LDKUpdateFulfillHTLC), "LDKUpdateFulfillHTLC"); *ret = UpdateFulfillHTLC_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5197,11 +6606,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUpdateAddHTLC* ret = MALLOC(sizeof(LDKUpdateAddHTLC), "LDKUpdateAddHTLC"); *ret = UpdateAddHTLC_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5214,11 +6622,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1write(JNIEnv * _env, jc JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKPing* ret = MALLOC(sizeof(LDKPing), "LDKPing"); *ret = Ping_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5231,11 +6638,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1write(JNIEnv * _env, jc JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKPong* ret = MALLOC(sizeof(LDKPong), "LDKPong"); *ret = Pong_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5248,11 +6654,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1 JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUnsignedChannelAnnouncement* ret = MALLOC(sizeof(LDKUnsignedChannelAnnouncement), "LDKUnsignedChannelAnnouncement"); *ret = UnsignedChannelAnnouncement_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5265,11 +6670,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1write(JN JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKChannelAnnouncement* ret = MALLOC(sizeof(LDKChannelAnnouncement), "LDKChannelAnnouncement"); *ret = ChannelAnnouncement_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5282,11 +6686,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1write( JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUnsignedChannelUpdate* ret = MALLOC(sizeof(LDKUnsignedChannelUpdate), "LDKUnsignedChannelUpdate"); *ret = UnsignedChannelUpdate_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5299,11 +6702,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKChannelUpdate* ret = MALLOC(sizeof(LDKChannelUpdate), "LDKChannelUpdate"); *ret = ChannelUpdate_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5316,11 +6718,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKErrorMessage* ret = MALLOC(sizeof(LDKErrorMessage), "LDKErrorMessage"); *ret = ErrorMessage_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5333,11 +6734,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1wri JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKUnsignedNodeAnnouncement* ret = MALLOC(sizeof(LDKUnsignedNodeAnnouncement), "LDKUnsignedNodeAnnouncement"); *ret = UnsignedNodeAnnouncement_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5350,18 +6750,97 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1write(JNIEn JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKNodeAnnouncement* ret = MALLOC(sizeof(LDKNodeAnnouncement), "LDKNodeAnnouncement"); *ret = NodeAnnouncement_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1read(JNIEnv * _env, jclass _b, jlong ser) { + LDKu8slice ser_conv = *(LDKu8slice*)ser; + LDKQueryShortChannelIds* ret = MALLOC(sizeof(LDKQueryShortChannelIds), "LDKQueryShortChannelIds"); + *ret = QueryShortChannelIds_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKQueryShortChannelIds* obj_conv = (LDKQueryShortChannelIds*)obj; + LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); + *ret = QueryShortChannelIds_write(obj_conv); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1read(JNIEnv * _env, jclass _b, jlong ser) { + LDKu8slice ser_conv = *(LDKu8slice*)ser; + LDKReplyShortChannelIdsEnd* ret = MALLOC(sizeof(LDKReplyShortChannelIdsEnd), "LDKReplyShortChannelIdsEnd"); + *ret = ReplyShortChannelIdsEnd_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKReplyShortChannelIdsEnd* obj_conv = (LDKReplyShortChannelIdsEnd*)obj; + LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); + *ret = ReplyShortChannelIdsEnd_write(obj_conv); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1read(JNIEnv * _env, jclass _b, jlong ser) { + LDKu8slice ser_conv = *(LDKu8slice*)ser; + LDKQueryChannelRange* ret = MALLOC(sizeof(LDKQueryChannelRange), "LDKQueryChannelRange"); + *ret = QueryChannelRange_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKQueryChannelRange* obj_conv = (LDKQueryChannelRange*)obj; + LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); + *ret = QueryChannelRange_write(obj_conv); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1read(JNIEnv * _env, jclass _b, jlong ser) { + LDKu8slice ser_conv = *(LDKu8slice*)ser; + LDKReplyChannelRange* ret = MALLOC(sizeof(LDKReplyChannelRange), "LDKReplyChannelRange"); + *ret = ReplyChannelRange_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKReplyChannelRange* obj_conv = (LDKReplyChannelRange*)obj; + LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); + *ret = ReplyChannelRange_write(obj_conv); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1read(JNIEnv * _env, jclass _b, jlong ser) { + LDKu8slice ser_conv = *(LDKu8slice*)ser; + LDKGossipTimestampFilter* ret = MALLOC(sizeof(LDKGossipTimestampFilter), "LDKGossipTimestampFilter"); + *ret = GossipTimestampFilter_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKGossipTimestampFilter* obj_conv = (LDKGossipTimestampFilter*)obj; + LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); + *ret = GossipTimestampFilter_write(obj_conv); return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MessageHandler_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKMessageHandler this_ptr_conv = *(LDKMessageHandler*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return MessageHandler_free(this_ptr_conv); } @@ -5374,7 +6853,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_MessageHandler_1get_1chan_1ha JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MessageHandler_1set_1chan_1handler(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKMessageHandler* this_ptr_conv = (LDKMessageHandler*)this_ptr; LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)val; - LDKChannelMessageHandler_JCalls_clone(val_conv.this_arg); + if (val_conv.free == LDKChannelMessageHandler_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKChannelMessageHandler_JCalls_clone(val_conv.this_arg); + } return MessageHandler_set_chan_handler(this_ptr_conv, val_conv); } @@ -5387,19 +6869,28 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_MessageHandler_1get_1route_1h JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MessageHandler_1set_1route_1handler(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKMessageHandler* this_ptr_conv = (LDKMessageHandler*)this_ptr; LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)val; - LDKRoutingMessageHandler_JCalls_clone(val_conv.this_arg); + if (val_conv.free == LDKRoutingMessageHandler_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKRoutingMessageHandler_JCalls_clone(val_conv.this_arg); + } return MessageHandler_set_route_handler(this_ptr_conv, val_conv); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_MessageHandler_1new(JNIEnv * _env, jclass _b, jlong chan_handler_arg, jlong route_handler_arg) { LDKChannelMessageHandler chan_handler_arg_conv = *(LDKChannelMessageHandler*)chan_handler_arg; - LDKChannelMessageHandler_JCalls_clone(chan_handler_arg_conv.this_arg); + if (chan_handler_arg_conv.free == LDKChannelMessageHandler_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKChannelMessageHandler_JCalls_clone(chan_handler_arg_conv.this_arg); + } LDKRoutingMessageHandler route_handler_arg_conv = *(LDKRoutingMessageHandler*)route_handler_arg; - LDKRoutingMessageHandler_JCalls_clone(route_handler_arg_conv.this_arg); + if (route_handler_arg_conv.free == LDKRoutingMessageHandler_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKRoutingMessageHandler_JCalls_clone(route_handler_arg_conv.this_arg); + } LDKMessageHandler* ret = MALLOC(sizeof(LDKMessageHandler), "LDKMessageHandler"); *ret = MessageHandler_new(chan_handler_arg_conv, route_handler_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5412,7 +6903,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_SocketDescriptor_1free(JNIEnv JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_PeerHandleError_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPeerHandleError this_ptr_conv = *(LDKPeerHandleError*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return PeerHandleError_free(this_ptr_conv); } @@ -5429,33 +6920,36 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_PeerHandleError_1set_1no_1conn JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerHandleError_1new(JNIEnv * _env, jclass _b, jboolean no_connection_possible_arg) { LDKPeerHandleError* ret = MALLOC(sizeof(LDKPeerHandleError), "LDKPeerHandleError"); *ret = PeerHandleError_new(no_connection_possible_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_PeerManager_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPeerManager this_ptr_conv = *(LDKPeerManager*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return PeerManager_free(this_ptr_conv); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1new(JNIEnv * _env, jclass _b, jlong message_handler, jlong our_node_secret, jbyteArray ephemeral_random_data, jlong logger) { LDKMessageHandler message_handler_conv = *(LDKMessageHandler*)message_handler; FREE((void*)message_handler); - message_handler_conv._underlying_ref = false; + message_handler_conv.is_owned = true; LDKSecretKey our_node_secret_conv = *(LDKSecretKey*)our_node_secret; FREE((void*)our_node_secret); unsigned char ephemeral_random_data_arr[32]; (*_env)->GetByteArrayRegion (_env, ephemeral_random_data, 0, 32, ephemeral_random_data_arr); unsigned char (*ephemeral_random_data_ref)[32] = &ephemeral_random_data_arr; LDKLogger logger_conv = *(LDKLogger*)logger; - LDKLogger_JCalls_clone(logger_conv.this_arg); + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } LDKPeerManager* ret = MALLOC(sizeof(LDKPeerManager), "LDKPeerManager"); *ret = PeerManager_new(message_handler_conv, our_node_secret_conv, ephemeral_random_data_ref, logger_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5471,7 +6965,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1new_1outbound_1c LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id; FREE((void*)their_node_id); LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)descriptor; - LDKSocketDescriptor_JCalls_clone(descriptor_conv.this_arg); + if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKSocketDescriptor_JCalls_clone(descriptor_conv.this_arg); + } LDKCResult_CVec_u8ZPeerHandleErrorZ* ret = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret = PeerManager_new_outbound_connection(this_arg_conv, their_node_id_conv, descriptor_conv); return (long)ret; @@ -5480,7 +6977,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1new_1outbound_1c JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1new_1inbound_1connection(JNIEnv * _env, jclass _b, jlong this_arg, jlong descriptor) { LDKPeerManager* this_arg_conv = (LDKPeerManager*)this_arg; LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)descriptor; - LDKSocketDescriptor_JCalls_clone(descriptor_conv.this_arg); + if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKSocketDescriptor_JCalls_clone(descriptor_conv.this_arg); + } LDKCResult_NonePeerHandleErrorZ* ret = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret = PeerManager_new_inbound_connection(this_arg_conv, descriptor_conv); return (long)ret; @@ -5498,7 +6998,6 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1read_1event(JNIE LDKPeerManager* this_arg_conv = (LDKPeerManager*)this_arg; LDKSocketDescriptor* peer_descriptor_conv = (LDKSocketDescriptor*)peer_descriptor; LDKu8slice data_conv = *(LDKu8slice*)data; - FREE((void*)data); LDKCResult_boolPeerHandleErrorZ* ret = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret = PeerManager_read_event(this_arg_conv, peer_descriptor_conv, data_conv); return (long)ret; @@ -5529,10 +7028,53 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_build_1commitment_1secret(JNI return (long)ret; } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_derive_1private_1key(JNIEnv * _env, jclass _b, jlong per_commitment_point, jbyteArray base_secret) { + LDKPublicKey per_commitment_point_conv = *(LDKPublicKey*)per_commitment_point; + FREE((void*)per_commitment_point); + unsigned char base_secret_arr[32]; + (*_env)->GetByteArrayRegion (_env, base_secret, 0, 32, base_secret_arr); + unsigned char (*base_secret_ref)[32] = &base_secret_arr; + LDKCResult_SecretKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_SecretKeySecpErrorZ), "LDKCResult_SecretKeySecpErrorZ"); + *ret = derive_private_key(per_commitment_point_conv, base_secret_ref); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_derive_1public_1key(JNIEnv * _env, jclass _b, jlong per_commitment_point, jlong base_point) { + LDKPublicKey per_commitment_point_conv = *(LDKPublicKey*)per_commitment_point; + FREE((void*)per_commitment_point); + LDKPublicKey base_point_conv = *(LDKPublicKey*)base_point; + FREE((void*)base_point); + LDKCResult_PublicKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_PublicKeySecpErrorZ), "LDKCResult_PublicKeySecpErrorZ"); + *ret = derive_public_key(per_commitment_point_conv, base_point_conv); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_derive_1private_1revocation_1key(JNIEnv * _env, jclass _b, jbyteArray per_commitment_secret, jbyteArray countersignatory_revocation_base_secret) { + unsigned char per_commitment_secret_arr[32]; + (*_env)->GetByteArrayRegion (_env, per_commitment_secret, 0, 32, per_commitment_secret_arr); + unsigned char (*per_commitment_secret_ref)[32] = &per_commitment_secret_arr; + unsigned char countersignatory_revocation_base_secret_arr[32]; + (*_env)->GetByteArrayRegion (_env, countersignatory_revocation_base_secret, 0, 32, countersignatory_revocation_base_secret_arr); + unsigned char (*countersignatory_revocation_base_secret_ref)[32] = &countersignatory_revocation_base_secret_arr; + LDKCResult_SecretKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_SecretKeySecpErrorZ), "LDKCResult_SecretKeySecpErrorZ"); + *ret = derive_private_revocation_key(per_commitment_secret_ref, countersignatory_revocation_base_secret_ref); + return (long)ret; +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_derive_1public_1revocation_1key(JNIEnv * _env, jclass _b, jlong per_commitment_point, jlong countersignatory_revocation_base_point) { + LDKPublicKey per_commitment_point_conv = *(LDKPublicKey*)per_commitment_point; + FREE((void*)per_commitment_point); + LDKPublicKey countersignatory_revocation_base_point_conv = *(LDKPublicKey*)countersignatory_revocation_base_point; + FREE((void*)countersignatory_revocation_base_point); + LDKCResult_PublicKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_PublicKeySecpErrorZ), "LDKCResult_PublicKeySecpErrorZ"); + *ret = derive_public_revocation_key(per_commitment_point_conv, countersignatory_revocation_base_point_conv); + return (long)ret; +} + JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKTxCreationKeys this_ptr_conv = *(LDKTxCreationKeys*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return TxCreationKeys_free(this_ptr_conv); } @@ -5564,63 +7106,63 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1revocatio return TxCreationKeys_set_revocation_key(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1a_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1broadcaster_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKTxCreationKeys* this_ptr_conv = (LDKTxCreationKeys*)this_ptr; LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey"); - *ret = TxCreationKeys_get_a_htlc_key(this_ptr_conv); + *ret = TxCreationKeys_get_broadcaster_htlc_key(this_ptr_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1a_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1broadcaster_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKTxCreationKeys* this_ptr_conv = (LDKTxCreationKeys*)this_ptr; LDKPublicKey val_conv = *(LDKPublicKey*)val; FREE((void*)val); - return TxCreationKeys_set_a_htlc_key(this_ptr_conv, val_conv); + return TxCreationKeys_set_broadcaster_htlc_key(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1b_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1countersignatory_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKTxCreationKeys* this_ptr_conv = (LDKTxCreationKeys*)this_ptr; LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey"); - *ret = TxCreationKeys_get_b_htlc_key(this_ptr_conv); + *ret = TxCreationKeys_get_countersignatory_htlc_key(this_ptr_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1b_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1countersignatory_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKTxCreationKeys* this_ptr_conv = (LDKTxCreationKeys*)this_ptr; LDKPublicKey val_conv = *(LDKPublicKey*)val; FREE((void*)val); - return TxCreationKeys_set_b_htlc_key(this_ptr_conv, val_conv); + return TxCreationKeys_set_countersignatory_htlc_key(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1a_1delayed_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1broadcaster_1delayed_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKTxCreationKeys* this_ptr_conv = (LDKTxCreationKeys*)this_ptr; LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey"); - *ret = TxCreationKeys_get_a_delayed_payment_key(this_ptr_conv); + *ret = TxCreationKeys_get_broadcaster_delayed_payment_key(this_ptr_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1a_1delayed_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1broadcaster_1delayed_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { LDKTxCreationKeys* this_ptr_conv = (LDKTxCreationKeys*)this_ptr; LDKPublicKey val_conv = *(LDKPublicKey*)val; FREE((void*)val); - return TxCreationKeys_set_a_delayed_payment_key(this_ptr_conv, val_conv); + return TxCreationKeys_set_broadcaster_delayed_payment_key(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1new(JNIEnv * _env, jclass _b, jlong per_commitment_point_arg, jlong revocation_key_arg, jlong a_htlc_key_arg, jlong b_htlc_key_arg, jlong a_delayed_payment_key_arg) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1new(JNIEnv * _env, jclass _b, jlong per_commitment_point_arg, jlong revocation_key_arg, jlong broadcaster_htlc_key_arg, jlong countersignatory_htlc_key_arg, jlong broadcaster_delayed_payment_key_arg) { LDKPublicKey per_commitment_point_arg_conv = *(LDKPublicKey*)per_commitment_point_arg; FREE((void*)per_commitment_point_arg); LDKPublicKey revocation_key_arg_conv = *(LDKPublicKey*)revocation_key_arg; FREE((void*)revocation_key_arg); - LDKPublicKey a_htlc_key_arg_conv = *(LDKPublicKey*)a_htlc_key_arg; - FREE((void*)a_htlc_key_arg); - LDKPublicKey b_htlc_key_arg_conv = *(LDKPublicKey*)b_htlc_key_arg; - FREE((void*)b_htlc_key_arg); - LDKPublicKey a_delayed_payment_key_arg_conv = *(LDKPublicKey*)a_delayed_payment_key_arg; - FREE((void*)a_delayed_payment_key_arg); + LDKPublicKey broadcaster_htlc_key_arg_conv = *(LDKPublicKey*)broadcaster_htlc_key_arg; + FREE((void*)broadcaster_htlc_key_arg); + LDKPublicKey countersignatory_htlc_key_arg_conv = *(LDKPublicKey*)countersignatory_htlc_key_arg; + FREE((void*)countersignatory_htlc_key_arg); + LDKPublicKey broadcaster_delayed_payment_key_arg_conv = *(LDKPublicKey*)broadcaster_delayed_payment_key_arg; + FREE((void*)broadcaster_delayed_payment_key_arg); LDKTxCreationKeys* ret = MALLOC(sizeof(LDKTxCreationKeys), "LDKTxCreationKeys"); - *ret = TxCreationKeys_new(per_commitment_point_arg_conv, revocation_key_arg_conv, a_htlc_key_arg_conv, b_htlc_key_arg_conv, a_delayed_payment_key_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + *ret = TxCreationKeys_new(per_commitment_point_arg_conv, revocation_key_arg_conv, broadcaster_htlc_key_arg_conv, countersignatory_htlc_key_arg_conv, broadcaster_delayed_payment_key_arg_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5633,29 +7175,28 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1write(JNIEnv JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKTxCreationKeys* ret = MALLOC(sizeof(LDKTxCreationKeys), "LDKTxCreationKeys"); *ret = TxCreationKeys_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPreCalculatedTxCreationKeys this_ptr_conv = *(LDKPreCalculatedTxCreationKeys*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return PreCalculatedTxCreationKeys_free(this_ptr_conv); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1new(JNIEnv * _env, jclass _b, jlong keys) { LDKTxCreationKeys keys_conv = *(LDKTxCreationKeys*)keys; FREE((void*)keys); - keys_conv._underlying_ref = false; + keys_conv.is_owned = true; LDKPreCalculatedTxCreationKeys* ret = MALLOC(sizeof(LDKPreCalculatedTxCreationKeys), "LDKPreCalculatedTxCreationKeys"); *ret = PreCalculatedTxCreationKeys_new(keys_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5663,8 +7204,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1 LDKPreCalculatedTxCreationKeys* this_arg_conv = (LDKPreCalculatedTxCreationKeys*)this_arg; LDKTxCreationKeys* ret = MALLOC(sizeof(LDKTxCreationKeys), "LDKTxCreationKeys"); *ret = PreCalculatedTxCreationKeys_trust_key_derivation(this_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5678,7 +7219,7 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1 JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelPublicKeys this_ptr_conv = *(LDKChannelPublicKeys*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelPublicKeys_free(this_ptr_conv); } @@ -5765,8 +7306,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1new(JNIEnv FREE((void*)htlc_basepoint_arg); LDKChannelPublicKeys* ret = MALLOC(sizeof(LDKChannelPublicKeys), "LDKChannelPublicKeys"); *ret = ChannelPublicKeys_new(funding_pubkey_arg_conv, revocation_basepoint_arg_conv, payment_point_arg_conv, delayed_payment_basepoint_arg_conv, htlc_basepoint_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5779,44 +7320,43 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1write(JNIE JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKChannelPublicKeys* ret = MALLOC(sizeof(LDKChannelPublicKeys), "LDKChannelPublicKeys"); *ret = ChannelPublicKeys_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1derive_1new(JNIEnv * _env, jclass _b, jlong per_commitment_point, jlong a_delayed_payment_base, jlong a_htlc_base, jlong b_revocation_base, jlong b_htlc_base) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1derive_1new(JNIEnv * _env, jclass _b, jlong per_commitment_point, jlong broadcaster_delayed_payment_base, jlong broadcaster_htlc_base, jlong countersignatory_revocation_base, jlong countersignatory_htlc_base) { LDKPublicKey per_commitment_point_conv = *(LDKPublicKey*)per_commitment_point; FREE((void*)per_commitment_point); - LDKPublicKey a_delayed_payment_base_conv = *(LDKPublicKey*)a_delayed_payment_base; - FREE((void*)a_delayed_payment_base); - LDKPublicKey a_htlc_base_conv = *(LDKPublicKey*)a_htlc_base; - FREE((void*)a_htlc_base); - LDKPublicKey b_revocation_base_conv = *(LDKPublicKey*)b_revocation_base; - FREE((void*)b_revocation_base); - LDKPublicKey b_htlc_base_conv = *(LDKPublicKey*)b_htlc_base; - FREE((void*)b_htlc_base); + LDKPublicKey broadcaster_delayed_payment_base_conv = *(LDKPublicKey*)broadcaster_delayed_payment_base; + FREE((void*)broadcaster_delayed_payment_base); + LDKPublicKey broadcaster_htlc_base_conv = *(LDKPublicKey*)broadcaster_htlc_base; + FREE((void*)broadcaster_htlc_base); + LDKPublicKey countersignatory_revocation_base_conv = *(LDKPublicKey*)countersignatory_revocation_base; + FREE((void*)countersignatory_revocation_base); + LDKPublicKey countersignatory_htlc_base_conv = *(LDKPublicKey*)countersignatory_htlc_base; + FREE((void*)countersignatory_htlc_base); LDKCResult_TxCreationKeysSecpErrorZ* ret = MALLOC(sizeof(LDKCResult_TxCreationKeysSecpErrorZ), "LDKCResult_TxCreationKeysSecpErrorZ"); - *ret = TxCreationKeys_derive_new(per_commitment_point_conv, a_delayed_payment_base_conv, a_htlc_base_conv, b_revocation_base_conv, b_htlc_base_conv); + *ret = TxCreationKeys_derive_new(per_commitment_point_conv, broadcaster_delayed_payment_base_conv, broadcaster_htlc_base_conv, countersignatory_revocation_base_conv, countersignatory_htlc_base_conv); return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1revokeable_1redeemscript(JNIEnv * _env, jclass _b, jlong revocation_key, jshort to_self_delay, jlong delayed_payment_key) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1revokeable_1redeemscript(JNIEnv * _env, jclass _b, jlong revocation_key, jshort contest_delay, jlong broadcaster_delayed_payment_key) { LDKPublicKey revocation_key_conv = *(LDKPublicKey*)revocation_key; FREE((void*)revocation_key); - LDKPublicKey delayed_payment_key_conv = *(LDKPublicKey*)delayed_payment_key; - FREE((void*)delayed_payment_key); + LDKPublicKey broadcaster_delayed_payment_key_conv = *(LDKPublicKey*)broadcaster_delayed_payment_key; + FREE((void*)broadcaster_delayed_payment_key); LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); - *ret = get_revokeable_redeemscript(revocation_key_conv, to_self_delay, delayed_payment_key_conv); + *ret = get_revokeable_redeemscript(revocation_key_conv, contest_delay, broadcaster_delayed_payment_key_conv); return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HTLCOutputInCommitment_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKHTLCOutputInCommitment this_ptr_conv = *(LDKHTLCOutputInCommitment*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return HTLCOutputInCommitment_free(this_ptr_conv); } @@ -5873,11 +7413,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCOutputInCommitment_1write JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCOutputInCommitment_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKHTLCOutputInCommitment* ret = MALLOC(sizeof(LDKHTLCOutputInCommitment), "LDKHTLCOutputInCommitment"); *ret = HTLCOutputInCommitment_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -5889,183 +7428,181 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1htlc_1redeemscript(JNIEn return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_make_1funding_1redeemscript(JNIEnv * _env, jclass _b, jlong a, jlong b) { - LDKPublicKey a_conv = *(LDKPublicKey*)a; - FREE((void*)a); - LDKPublicKey b_conv = *(LDKPublicKey*)b; - FREE((void*)b); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_make_1funding_1redeemscript(JNIEnv * _env, jclass _b, jlong broadcaster, jlong countersignatory) { + LDKPublicKey broadcaster_conv = *(LDKPublicKey*)broadcaster; + FREE((void*)broadcaster); + LDKPublicKey countersignatory_conv = *(LDKPublicKey*)countersignatory; + FREE((void*)countersignatory); LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); - *ret = make_funding_redeemscript(a_conv, b_conv); + *ret = make_funding_redeemscript(broadcaster_conv, countersignatory_conv); return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_build_1htlc_1transaction(JNIEnv * _env, jclass _b, jbyteArray prev_hash, jint feerate_per_kw, jshort to_self_delay, jlong htlc, jlong a_delayed_payment_key, jlong revocation_key) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_build_1htlc_1transaction(JNIEnv * _env, jclass _b, jbyteArray prev_hash, jint feerate_per_kw, jshort contest_delay, jlong htlc, jlong broadcaster_delayed_payment_key, jlong revocation_key) { unsigned char prev_hash_arr[32]; (*_env)->GetByteArrayRegion (_env, prev_hash, 0, 32, prev_hash_arr); unsigned char (*prev_hash_ref)[32] = &prev_hash_arr; LDKHTLCOutputInCommitment* htlc_conv = (LDKHTLCOutputInCommitment*)htlc; - LDKPublicKey a_delayed_payment_key_conv = *(LDKPublicKey*)a_delayed_payment_key; - FREE((void*)a_delayed_payment_key); + LDKPublicKey broadcaster_delayed_payment_key_conv = *(LDKPublicKey*)broadcaster_delayed_payment_key; + FREE((void*)broadcaster_delayed_payment_key); LDKPublicKey revocation_key_conv = *(LDKPublicKey*)revocation_key; FREE((void*)revocation_key); - LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); - *ret = build_htlc_transaction(prev_hash_ref, feerate_per_kw, to_self_delay, htlc_conv, a_delayed_payment_key_conv, revocation_key_conv); + LDKTransaction* ret = MALLOC(sizeof(LDKTransaction), "LDKTransaction"); + *ret = build_htlc_transaction(prev_hash_ref, feerate_per_kw, contest_delay, htlc_conv, broadcaster_delayed_payment_key_conv, revocation_key_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKLocalCommitmentTransaction this_ptr_conv = *(LDKLocalCommitmentTransaction*)this_ptr; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKHolderCommitmentTransaction this_ptr_conv = *(LDKHolderCommitmentTransaction*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; - return LocalCommitmentTransaction_free(this_ptr_conv); + this_ptr_conv.is_owned = true; + return HolderCommitmentTransaction_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1unsigned_1tx(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKLocalCommitmentTransaction* this_ptr_conv = (LDKLocalCommitmentTransaction*)this_ptr; - LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); - *ret = LocalCommitmentTransaction_get_unsigned_tx(this_ptr_conv); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1unsigned_1tx(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKHolderCommitmentTransaction* this_ptr_conv = (LDKHolderCommitmentTransaction*)this_ptr; + LDKTransaction* ret = MALLOC(sizeof(LDKTransaction), "LDKTransaction"); + *ret = HolderCommitmentTransaction_get_unsigned_tx(this_ptr_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1set_1unsigned_1tx(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { - LDKLocalCommitmentTransaction* this_ptr_conv = (LDKLocalCommitmentTransaction*)this_ptr; - LDKCVec_u8Z val_conv = *(LDKCVec_u8Z*)val; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1set_1unsigned_1tx(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKHolderCommitmentTransaction* this_ptr_conv = (LDKHolderCommitmentTransaction*)this_ptr; + LDKTransaction val_conv = *(LDKTransaction*)val; FREE((void*)val); - return LocalCommitmentTransaction_set_unsigned_tx(this_ptr_conv, val_conv); + return HolderCommitmentTransaction_set_unsigned_tx(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1their_1sig(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKLocalCommitmentTransaction* this_ptr_conv = (LDKLocalCommitmentTransaction*)this_ptr; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1counterparty_1sig(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKHolderCommitmentTransaction* this_ptr_conv = (LDKHolderCommitmentTransaction*)this_ptr; LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature"); - *ret = LocalCommitmentTransaction_get_their_sig(this_ptr_conv); + *ret = HolderCommitmentTransaction_get_counterparty_sig(this_ptr_conv); return (long)ret; } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1set_1their_1sig(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { - LDKLocalCommitmentTransaction* this_ptr_conv = (LDKLocalCommitmentTransaction*)this_ptr; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1set_1counterparty_1sig(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKHolderCommitmentTransaction* this_ptr_conv = (LDKHolderCommitmentTransaction*)this_ptr; LDKSignature val_conv = *(LDKSignature*)val; FREE((void*)val); - return LocalCommitmentTransaction_set_their_sig(this_ptr_conv, val_conv); + return HolderCommitmentTransaction_set_counterparty_sig(this_ptr_conv, val_conv); } -JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1feerate_1per_1kw(JNIEnv * _env, jclass _b, jlong this_ptr) { - LDKLocalCommitmentTransaction* this_ptr_conv = (LDKLocalCommitmentTransaction*)this_ptr; - return LocalCommitmentTransaction_get_feerate_per_kw(this_ptr_conv); +JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1feerate_1per_1kw(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKHolderCommitmentTransaction* this_ptr_conv = (LDKHolderCommitmentTransaction*)this_ptr; + return HolderCommitmentTransaction_get_feerate_per_kw(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1set_1feerate_1per_1kw(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { - LDKLocalCommitmentTransaction* this_ptr_conv = (LDKLocalCommitmentTransaction*)this_ptr; - return LocalCommitmentTransaction_set_feerate_per_kw(this_ptr_conv, val); +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1set_1feerate_1per_1kw(JNIEnv * _env, jclass _b, jlong this_ptr, jint val) { + LDKHolderCommitmentTransaction* this_ptr_conv = (LDKHolderCommitmentTransaction*)this_ptr; + return HolderCommitmentTransaction_set_feerate_per_kw(this_ptr_conv, val); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1set_1per_1htlc(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { - LDKLocalCommitmentTransaction* this_ptr_conv = (LDKLocalCommitmentTransaction*)this_ptr; +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1set_1per_1htlc(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKHolderCommitmentTransaction* this_ptr_conv = (LDKHolderCommitmentTransaction*)this_ptr; LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ val_conv = *(LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ*)val; FREE((void*)val); - return LocalCommitmentTransaction_set_per_htlc(this_ptr_conv, val_conv); + return HolderCommitmentTransaction_set_per_htlc(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1new_1missing_1local_1sig(JNIEnv * _env, jclass _b, jlong unsigned_tx, jlong their_sig, jlong our_funding_key, jlong their_funding_key, jlong local_keys, jint feerate_per_kw, jlong htlc_data) { - LDKCVec_u8Z unsigned_tx_conv = *(LDKCVec_u8Z*)unsigned_tx; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1new_1missing_1holder_1sig(JNIEnv * _env, jclass _b, jlong unsigned_tx, jlong counterparty_sig, jlong holder_funding_key, jlong counterparty_funding_key, jlong keys, jint feerate_per_kw, jlong htlc_data) { + LDKTransaction unsigned_tx_conv = *(LDKTransaction*)unsigned_tx; FREE((void*)unsigned_tx); - LDKSignature their_sig_conv = *(LDKSignature*)their_sig; - FREE((void*)their_sig); - LDKPublicKey our_funding_key_conv = *(LDKPublicKey*)our_funding_key; - FREE((void*)our_funding_key); - LDKPublicKey their_funding_key_conv = *(LDKPublicKey*)their_funding_key; - FREE((void*)their_funding_key); - LDKTxCreationKeys local_keys_conv = *(LDKTxCreationKeys*)local_keys; - FREE((void*)local_keys); - local_keys_conv._underlying_ref = false; + LDKSignature counterparty_sig_conv = *(LDKSignature*)counterparty_sig; + FREE((void*)counterparty_sig); + LDKPublicKey holder_funding_key_conv = *(LDKPublicKey*)holder_funding_key; + FREE((void*)holder_funding_key); + LDKPublicKey counterparty_funding_key_conv = *(LDKPublicKey*)counterparty_funding_key; + FREE((void*)counterparty_funding_key); + LDKTxCreationKeys keys_conv = *(LDKTxCreationKeys*)keys; + FREE((void*)keys); + keys_conv.is_owned = true; LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ htlc_data_conv = *(LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ*)htlc_data; FREE((void*)htlc_data); - LDKLocalCommitmentTransaction* ret = MALLOC(sizeof(LDKLocalCommitmentTransaction), "LDKLocalCommitmentTransaction"); - *ret = LocalCommitmentTransaction_new_missing_local_sig(unsigned_tx_conv, their_sig_conv, our_funding_key_conv, their_funding_key_conv, local_keys_conv, feerate_per_kw, htlc_data_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + LDKHolderCommitmentTransaction* ret = MALLOC(sizeof(LDKHolderCommitmentTransaction), "LDKHolderCommitmentTransaction"); + *ret = HolderCommitmentTransaction_new_missing_holder_sig(unsigned_tx_conv, counterparty_sig_conv, holder_funding_key_conv, counterparty_funding_key_conv, keys_conv, feerate_per_kw, htlc_data_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1trust_1key_1derivation(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKLocalCommitmentTransaction* this_arg_conv = (LDKLocalCommitmentTransaction*)this_arg; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1trust_1key_1derivation(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKHolderCommitmentTransaction* this_arg_conv = (LDKHolderCommitmentTransaction*)this_arg; LDKTxCreationKeys* ret = MALLOC(sizeof(LDKTxCreationKeys), "LDKTxCreationKeys"); - *ret = LocalCommitmentTransaction_trust_key_derivation(this_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + *ret = HolderCommitmentTransaction_trust_key_derivation(this_arg_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1txid(JNIEnv * _env, jclass _b, jlong this_arg) { - LDKLocalCommitmentTransaction* this_arg_conv = (LDKLocalCommitmentTransaction*)this_arg; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1txid(JNIEnv * _env, jclass _b, jlong this_arg) { + LDKHolderCommitmentTransaction* this_arg_conv = (LDKHolderCommitmentTransaction*)this_arg; LDKThirtyTwoBytes* ret = MALLOC(sizeof(LDKThirtyTwoBytes), "LDKThirtyTwoBytes"); - *ret = LocalCommitmentTransaction_txid(this_arg_conv); + *ret = HolderCommitmentTransaction_txid(this_arg_conv); return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1local_1sig(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray funding_key, jlong funding_redeemscript, jlong channel_value_satoshis) { - LDKLocalCommitmentTransaction* this_arg_conv = (LDKLocalCommitmentTransaction*)this_arg; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1holder_1sig(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray funding_key, jlong funding_redeemscript, jlong channel_value_satoshis) { + LDKHolderCommitmentTransaction* this_arg_conv = (LDKHolderCommitmentTransaction*)this_arg; unsigned char funding_key_arr[32]; (*_env)->GetByteArrayRegion (_env, funding_key, 0, 32, funding_key_arr); unsigned char (*funding_key_ref)[32] = &funding_key_arr; LDKu8slice funding_redeemscript_conv = *(LDKu8slice*)funding_redeemscript; - FREE((void*)funding_redeemscript); LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature"); - *ret = LocalCommitmentTransaction_get_local_sig(this_arg_conv, funding_key_ref, funding_redeemscript_conv, channel_value_satoshis); + *ret = HolderCommitmentTransaction_get_holder_sig(this_arg_conv, funding_key_ref, funding_redeemscript_conv, channel_value_satoshis); return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1htlc_1sigs(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray htlc_base_key, jshort local_csv) { - LDKLocalCommitmentTransaction* this_arg_conv = (LDKLocalCommitmentTransaction*)this_arg; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1htlc_1sigs(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray htlc_base_key, jshort counterparty_selected_contest_delay) { + LDKHolderCommitmentTransaction* this_arg_conv = (LDKHolderCommitmentTransaction*)this_arg; unsigned char htlc_base_key_arr[32]; (*_env)->GetByteArrayRegion (_env, htlc_base_key, 0, 32, htlc_base_key_arr); unsigned char (*htlc_base_key_ref)[32] = &htlc_base_key_arr; LDKCResult_CVec_SignatureZNoneZ* ret = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); - *ret = LocalCommitmentTransaction_get_htlc_sigs(this_arg_conv, htlc_base_key_ref, local_csv); + *ret = HolderCommitmentTransaction_get_htlc_sigs(this_arg_conv, htlc_base_key_ref, counterparty_selected_contest_delay); return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1write(JNIEnv * _env, jclass _b, jlong obj) { - LDKLocalCommitmentTransaction* obj_conv = (LDKLocalCommitmentTransaction*)obj; +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1write(JNIEnv * _env, jclass _b, jlong obj) { + LDKHolderCommitmentTransaction* obj_conv = (LDKHolderCommitmentTransaction*)obj; LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); - *ret = LocalCommitmentTransaction_write(obj_conv); + *ret = HolderCommitmentTransaction_write(obj_conv); return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1read(JNIEnv * _env, jclass _b, jlong ser) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); - LDKLocalCommitmentTransaction* ret = MALLOC(sizeof(LDKLocalCommitmentTransaction), "LDKLocalCommitmentTransaction"); - *ret = LocalCommitmentTransaction_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + LDKHolderCommitmentTransaction* ret = MALLOC(sizeof(LDKHolderCommitmentTransaction), "LDKHolderCommitmentTransaction"); + *ret = HolderCommitmentTransaction_read(ser_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InitFeatures_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKInitFeatures this_ptr_conv = *(LDKInitFeatures*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return InitFeatures_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeFeatures_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKNodeFeatures this_ptr_conv = *(LDKNodeFeatures*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return NodeFeatures_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelFeatures_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelFeatures this_ptr_conv = *(LDKChannelFeatures*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelFeatures_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRouteHop this_ptr_conv = *(LDKRouteHop*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return RouteHop_free(this_ptr_conv); } @@ -6083,6 +7620,23 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1pubkey(JNIEnv * return RouteHop_set_pubkey(this_ptr_conv, val_conv); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1get_1node_1features(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKRouteHop* this_ptr_conv = (LDKRouteHop*)this_ptr; + LDKNodeFeatures* ret = MALLOC(sizeof(LDKNodeFeatures), "LDKNodeFeatures"); + *ret = RouteHop_get_node_features(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1node_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKRouteHop* this_ptr_conv = (LDKRouteHop*)this_ptr; + LDKNodeFeatures val_conv = *(LDKNodeFeatures*)val; + FREE((void*)val); + val_conv.is_owned = true; + return RouteHop_set_node_features(this_ptr_conv, val_conv); +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1get_1short_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRouteHop* this_ptr_conv = (LDKRouteHop*)this_ptr; return RouteHop_get_short_channel_id(this_ptr_conv); @@ -6093,6 +7647,23 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1short_1channel_ return RouteHop_set_short_channel_id(this_ptr_conv, val); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1get_1channel_1features(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKRouteHop* this_ptr_conv = (LDKRouteHop*)this_ptr; + LDKChannelFeatures* ret = MALLOC(sizeof(LDKChannelFeatures), "LDKChannelFeatures"); + *ret = RouteHop_get_channel_features(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1channel_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKRouteHop* this_ptr_conv = (LDKRouteHop*)this_ptr; + LDKChannelFeatures val_conv = *(LDKChannelFeatures*)val; + FREE((void*)val); + val_conv.is_owned = true; + return RouteHop_set_channel_features(this_ptr_conv, val_conv); +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1get_1fee_1msat(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRouteHop* this_ptr_conv = (LDKRouteHop*)this_ptr; return RouteHop_get_fee_msat(this_ptr_conv); @@ -6113,10 +7684,26 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1cltv_1expiry_1d return RouteHop_set_cltv_expiry_delta(this_ptr_conv, val); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1new(JNIEnv * _env, jclass _b, jlong pubkey_arg, jlong node_features_arg, jlong short_channel_id_arg, jlong channel_features_arg, jlong fee_msat_arg, jint cltv_expiry_delta_arg) { + LDKPublicKey pubkey_arg_conv = *(LDKPublicKey*)pubkey_arg; + FREE((void*)pubkey_arg); + LDKNodeFeatures node_features_arg_conv = *(LDKNodeFeatures*)node_features_arg; + FREE((void*)node_features_arg); + node_features_arg_conv.is_owned = true; + LDKChannelFeatures channel_features_arg_conv = *(LDKChannelFeatures*)channel_features_arg; + FREE((void*)channel_features_arg); + channel_features_arg_conv.is_owned = true; + LDKRouteHop* ret = MALLOC(sizeof(LDKRouteHop), "LDKRouteHop"); + *ret = RouteHop_new(pubkey_arg_conv, node_features_arg_conv, short_channel_id_arg, channel_features_arg_conv, fee_msat_arg, cltv_expiry_delta_arg); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Route_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRoute this_ptr_conv = *(LDKRoute*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return Route_free(this_ptr_conv); } @@ -6132,8 +7719,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Route_1new(JNIEnv * _env, jcl FREE((void*)paths_arg); LDKRoute* ret = MALLOC(sizeof(LDKRoute), "LDKRoute"); *ret = Route_new(paths_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6146,18 +7733,17 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Route_1write(JNIEnv * _env, j JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Route_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKRoute* ret = MALLOC(sizeof(LDKRoute), "LDKRoute"); *ret = Route_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRouteHint this_ptr_conv = *(LDKRouteHint*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return RouteHint_free(this_ptr_conv); } @@ -6189,8 +7775,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1fees(JNIEnv * LDKRouteHint* this_ptr_conv = (LDKRouteHint*)this_ptr; LDKRoutingFees* ret = MALLOC(sizeof(LDKRoutingFees), "LDKRoutingFees"); *ret = RouteHint_get_fees(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6198,7 +7784,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1fees(JNIEnv * LDKRouteHint* this_ptr_conv = (LDKRouteHint*)this_ptr; LDKRoutingFees val_conv = *(LDKRoutingFees*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return RouteHint_set_fees(this_ptr_conv, val_conv); } @@ -6227,11 +7813,11 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1new(JNIEnv * _env, FREE((void*)src_node_id_arg); LDKRoutingFees fees_arg_conv = *(LDKRoutingFees*)fees_arg; FREE((void*)fees_arg); - fees_arg_conv._underlying_ref = false; + fees_arg_conv.is_owned = true; LDKRouteHint* ret = MALLOC(sizeof(LDKRouteHint), "LDKRouteHint"); *ret = RouteHint_new(src_node_id_arg_conv, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg, htlc_minimum_msat_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6245,7 +7831,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1route(JNIEnv * _env, jcl LDKCVec_RouteHintZ last_hops_conv = *(LDKCVec_RouteHintZ*)last_hops; FREE((void*)last_hops); LDKLogger logger_conv = *(LDKLogger*)logger; - LDKLogger_JCalls_clone(logger_conv.this_arg); + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } LDKCResult_RouteLightningErrorZ* ret = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret = get_route(our_node_id_conv, network_conv, target_conv, first_hops_conv, last_hops_conv, final_value_msat, final_cltv, logger_conv); return (long)ret; @@ -6254,48 +7843,52 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1route(JNIEnv * _env, jcl JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKNetworkGraph this_ptr_conv = *(LDKNetworkGraph*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return NetworkGraph_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_LockedNetworkGraph_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKLockedNetworkGraph this_ptr_conv = *(LDKLockedNetworkGraph*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return LockedNetworkGraph_free(this_ptr_conv); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKNetGraphMsgHandler this_ptr_conv = *(LDKNetGraphMsgHandler*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return NetGraphMsgHandler_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1new(JNIEnv * _env, jclass _b, jlong chain_monitor, jlong logger) { - LDKChainWatchInterface chain_monitor_conv = *(LDKChainWatchInterface*)chain_monitor; - LDKChainWatchInterface_JCalls_clone(chain_monitor_conv.this_arg); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1new(JNIEnv * _env, jclass _b, jlong chain_access, jlong logger) { + LDKAccess* chain_access_conv = (LDKAccess*)chain_access; LDKLogger logger_conv = *(LDKLogger*)logger; - LDKLogger_JCalls_clone(logger_conv.this_arg); + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } LDKNetGraphMsgHandler* ret = MALLOC(sizeof(LDKNetGraphMsgHandler), "LDKNetGraphMsgHandler"); - *ret = NetGraphMsgHandler_new(chain_monitor_conv, logger_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + *ret = NetGraphMsgHandler_new(chain_access_conv, logger_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1from_1net_1graph(JNIEnv * _env, jclass _b, jlong chain_monitor, jlong logger, jlong network_graph) { - LDKChainWatchInterface chain_monitor_conv = *(LDKChainWatchInterface*)chain_monitor; - LDKChainWatchInterface_JCalls_clone(chain_monitor_conv.this_arg); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1from_1net_1graph(JNIEnv * _env, jclass _b, jlong chain_access, jlong logger, jlong network_graph) { + LDKAccess* chain_access_conv = (LDKAccess*)chain_access; LDKLogger logger_conv = *(LDKLogger*)logger; - LDKLogger_JCalls_clone(logger_conv.this_arg); + if (logger_conv.free == LDKLogger_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKLogger_JCalls_clone(logger_conv.this_arg); + } LDKNetworkGraph network_graph_conv = *(LDKNetworkGraph*)network_graph; FREE((void*)network_graph); - network_graph_conv._underlying_ref = false; + network_graph_conv.is_owned = true; LDKNetGraphMsgHandler* ret = MALLOC(sizeof(LDKNetGraphMsgHandler), "LDKNetGraphMsgHandler"); - *ret = NetGraphMsgHandler_from_net_graph(chain_monitor_conv, logger_conv, network_graph_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + *ret = NetGraphMsgHandler_from_net_graph(chain_access_conv, logger_conv, network_graph_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6303,8 +7896,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1read_1loc LDKNetGraphMsgHandler* this_arg_conv = (LDKNetGraphMsgHandler*)this_arg; LDKLockedNetworkGraph* ret = MALLOC(sizeof(LDKLockedNetworkGraph), "LDKLockedNetworkGraph"); *ret = NetGraphMsgHandler_read_locked_graph(this_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6312,8 +7905,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LockedNetworkGraph_1graph(JNI LDKLockedNetworkGraph* this_arg_conv = (LDKLockedNetworkGraph*)this_arg; LDKNetworkGraph* ret = MALLOC(sizeof(LDKNetworkGraph), "LDKNetworkGraph"); *ret = LockedNetworkGraph_graph(this_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6327,7 +7920,7 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1as_1Routi JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKDirectionalChannelInfo this_ptr_conv = *(LDKDirectionalChannelInfo*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return DirectionalChannelInfo_free(this_ptr_conv); } @@ -6371,6 +7964,23 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1h return DirectionalChannelInfo_set_htlc_minimum_msat(this_ptr_conv, val); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1get_1last_1update_1message(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKDirectionalChannelInfo* this_ptr_conv = (LDKDirectionalChannelInfo*)this_ptr; + LDKChannelUpdate* ret = MALLOC(sizeof(LDKChannelUpdate), "LDKChannelUpdate"); + *ret = DirectionalChannelInfo_get_last_update_message(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1last_1update_1message(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKDirectionalChannelInfo* this_ptr_conv = (LDKDirectionalChannelInfo*)this_ptr; + LDKChannelUpdate val_conv = *(LDKChannelUpdate*)val; + FREE((void*)val); + val_conv.is_owned = true; + return DirectionalChannelInfo_set_last_update_message(this_ptr_conv, val_conv); +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1write(JNIEnv * _env, jclass _b, jlong obj) { LDKDirectionalChannelInfo* obj_conv = (LDKDirectionalChannelInfo*)obj; LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); @@ -6380,21 +7990,37 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1write JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKDirectionalChannelInfo* ret = MALLOC(sizeof(LDKDirectionalChannelInfo), "LDKDirectionalChannelInfo"); *ret = DirectionalChannelInfo_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelInfo this_ptr_conv = *(LDKChannelInfo*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return ChannelInfo_free(this_ptr_conv); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1features(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; + LDKChannelFeatures* ret = MALLOC(sizeof(LDKChannelFeatures), "LDKChannelFeatures"); + *ret = ChannelInfo_get_features(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; + LDKChannelFeatures val_conv = *(LDKChannelFeatures*)val; + FREE((void*)val); + val_conv.is_owned = true; + return ChannelInfo_set_features(this_ptr_conv, val_conv); +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1node_1one(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey"); @@ -6413,8 +8039,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1one_1to_1tw LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; LDKDirectionalChannelInfo* ret = MALLOC(sizeof(LDKDirectionalChannelInfo), "LDKDirectionalChannelInfo"); *ret = ChannelInfo_get_one_to_two(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6422,7 +8048,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1one_1to_1two LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; LDKDirectionalChannelInfo val_conv = *(LDKDirectionalChannelInfo*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return ChannelInfo_set_one_to_two(this_ptr_conv, val_conv); } @@ -6444,8 +8070,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1two_1to_1on LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; LDKDirectionalChannelInfo* ret = MALLOC(sizeof(LDKDirectionalChannelInfo), "LDKDirectionalChannelInfo"); *ret = ChannelInfo_get_two_to_one(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6453,10 +8079,27 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1two_1to_1one LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; LDKDirectionalChannelInfo val_conv = *(LDKDirectionalChannelInfo*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return ChannelInfo_set_two_to_one(this_ptr_conv, val_conv); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1announcement_1message(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; + LDKChannelAnnouncement* ret = MALLOC(sizeof(LDKChannelAnnouncement), "LDKChannelAnnouncement"); + *ret = ChannelInfo_get_announcement_message(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1announcement_1message(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKChannelInfo* this_ptr_conv = (LDKChannelInfo*)this_ptr; + LDKChannelAnnouncement val_conv = *(LDKChannelAnnouncement*)val; + FREE((void*)val); + val_conv.is_owned = true; + return ChannelInfo_set_announcement_message(this_ptr_conv, val_conv); +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1write(JNIEnv * _env, jclass _b, jlong obj) { LDKChannelInfo* obj_conv = (LDKChannelInfo*)obj; LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); @@ -6466,18 +8109,17 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1write(JNIEnv * _ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKChannelInfo* ret = MALLOC(sizeof(LDKChannelInfo), "LDKChannelInfo"); *ret = ChannelInfo_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RoutingFees_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRoutingFees this_ptr_conv = *(LDKRoutingFees*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return RoutingFees_free(this_ptr_conv); } @@ -6504,18 +8146,17 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RoutingFees_1set_1proportional JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingFees_1new(JNIEnv * _env, jclass _b, jint base_msat_arg, jint proportional_millionths_arg) { LDKRoutingFees* ret = MALLOC(sizeof(LDKRoutingFees), "LDKRoutingFees"); *ret = RoutingFees_new(base_msat_arg, proportional_millionths_arg); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingFees_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKRoutingFees* ret = MALLOC(sizeof(LDKRoutingFees), "LDKRoutingFees"); *ret = RoutingFees_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6529,10 +8170,27 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingFees_1write(JNIEnv * _ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv = *(LDKNodeAnnouncementInfo*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return NodeAnnouncementInfo_free(this_ptr_conv); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1get_1features(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKNodeAnnouncementInfo* this_ptr_conv = (LDKNodeAnnouncementInfo*)this_ptr; + LDKNodeFeatures* ret = MALLOC(sizeof(LDKNodeFeatures), "LDKNodeFeatures"); + *ret = NodeAnnouncementInfo_get_features(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKNodeAnnouncementInfo* this_ptr_conv = (LDKNodeAnnouncementInfo*)this_ptr; + LDKNodeFeatures val_conv = *(LDKNodeFeatures*)val; + FREE((void*)val); + val_conv.is_owned = true; + return NodeAnnouncementInfo_set_features(this_ptr_conv, val_conv); +} + JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1get_1last_1update(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKNodeAnnouncementInfo* this_ptr_conv = (LDKNodeAnnouncementInfo*)this_ptr; return NodeAnnouncementInfo_get_last_update(this_ptr_conv); @@ -6578,6 +8236,43 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1set_1add return NodeAnnouncementInfo_set_addresses(this_ptr_conv, val_conv); } +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1get_1announcement_1message(JNIEnv * _env, jclass _b, jlong this_ptr) { + LDKNodeAnnouncementInfo* this_ptr_conv = (LDKNodeAnnouncementInfo*)this_ptr; + LDKNodeAnnouncement* ret = MALLOC(sizeof(LDKNodeAnnouncement), "LDKNodeAnnouncement"); + *ret = NodeAnnouncementInfo_get_announcement_message(this_ptr_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1set_1announcement_1message(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { + LDKNodeAnnouncementInfo* this_ptr_conv = (LDKNodeAnnouncementInfo*)this_ptr; + LDKNodeAnnouncement val_conv = *(LDKNodeAnnouncement*)val; + FREE((void*)val); + val_conv.is_owned = true; + return NodeAnnouncementInfo_set_announcement_message(this_ptr_conv, val_conv); +} + +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1new(JNIEnv * _env, jclass _b, jlong features_arg, jint last_update_arg, jlong rgb_arg, jlong alias_arg, jlong addresses_arg, jlong announcement_message_arg) { + LDKNodeFeatures features_arg_conv = *(LDKNodeFeatures*)features_arg; + FREE((void*)features_arg); + features_arg_conv.is_owned = true; + LDKThreeBytes rgb_arg_conv = *(LDKThreeBytes*)rgb_arg; + FREE((void*)rgb_arg); + LDKThirtyTwoBytes alias_arg_conv = *(LDKThirtyTwoBytes*)alias_arg; + FREE((void*)alias_arg); + LDKCVec_NetAddressZ addresses_arg_conv = *(LDKCVec_NetAddressZ*)addresses_arg; + FREE((void*)addresses_arg); + LDKNodeAnnouncement announcement_message_arg_conv = *(LDKNodeAnnouncement*)announcement_message_arg; + FREE((void*)announcement_message_arg); + announcement_message_arg_conv.is_owned = true; + LDKNodeAnnouncementInfo* ret = MALLOC(sizeof(LDKNodeAnnouncementInfo), "LDKNodeAnnouncementInfo"); + *ret = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_conv, alias_arg_conv, addresses_arg_conv, announcement_message_arg_conv); + DO_ASSERT(ret->is_owned); + ret->is_owned = false; + return (long)ret; +} + JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1write(JNIEnv * _env, jclass _b, jlong obj) { LDKNodeAnnouncementInfo* obj_conv = (LDKNodeAnnouncementInfo*)obj; LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z"); @@ -6587,18 +8282,17 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1write(J JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKNodeAnnouncementInfo* ret = MALLOC(sizeof(LDKNodeAnnouncementInfo), "LDKNodeAnnouncementInfo"); *ret = NodeAnnouncementInfo_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeInfo_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKNodeInfo this_ptr_conv = *(LDKNodeInfo*)this_ptr; FREE((void*)this_ptr); - this_ptr_conv._underlying_ref = false; + this_ptr_conv.is_owned = true; return NodeInfo_free(this_ptr_conv); } @@ -6613,8 +8307,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeInfo_1get_1lowest_1inboun LDKNodeInfo* this_ptr_conv = (LDKNodeInfo*)this_ptr; LDKRoutingFees* ret = MALLOC(sizeof(LDKRoutingFees), "LDKRoutingFees"); *ret = NodeInfo_get_lowest_inbound_channel_fees(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6622,7 +8316,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeInfo_1set_1lowest_1inbound LDKNodeInfo* this_ptr_conv = (LDKNodeInfo*)this_ptr; LDKRoutingFees val_conv = *(LDKRoutingFees*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return NodeInfo_set_lowest_inbound_channel_fees(this_ptr_conv, val_conv); } @@ -6630,8 +8324,8 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeInfo_1get_1announcement_1 LDKNodeInfo* this_ptr_conv = (LDKNodeInfo*)this_ptr; LDKNodeAnnouncementInfo* ret = MALLOC(sizeof(LDKNodeAnnouncementInfo), "LDKNodeAnnouncementInfo"); *ret = NodeInfo_get_announcement_info(this_ptr_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6639,7 +8333,7 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeInfo_1set_1announcement_1i LDKNodeInfo* this_ptr_conv = (LDKNodeInfo*)this_ptr; LDKNodeAnnouncementInfo val_conv = *(LDKNodeAnnouncementInfo*)val; FREE((void*)val); - val_conv._underlying_ref = false; + val_conv.is_owned = true; return NodeInfo_set_announcement_info(this_ptr_conv, val_conv); } @@ -6648,14 +8342,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeInfo_1new(JNIEnv * _env, FREE((void*)channels_arg); LDKRoutingFees lowest_inbound_channel_fees_arg_conv = *(LDKRoutingFees*)lowest_inbound_channel_fees_arg; FREE((void*)lowest_inbound_channel_fees_arg); - lowest_inbound_channel_fees_arg_conv._underlying_ref = false; + lowest_inbound_channel_fees_arg_conv.is_owned = true; LDKNodeAnnouncementInfo announcement_info_arg_conv = *(LDKNodeAnnouncementInfo*)announcement_info_arg; FREE((void*)announcement_info_arg); - announcement_info_arg_conv._underlying_ref = false; + announcement_info_arg_conv.is_owned = true; LDKNodeInfo* ret = MALLOC(sizeof(LDKNodeInfo), "LDKNodeInfo"); *ret = NodeInfo_new(channels_arg_conv, lowest_inbound_channel_fees_arg_conv, announcement_info_arg_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6668,11 +8362,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeInfo_1write(JNIEnv * _env JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeInfo_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKNodeInfo* ret = MALLOC(sizeof(LDKNodeInfo), "LDKNodeInfo"); *ret = NodeInfo_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } @@ -6685,19 +8378,18 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1write(JNIEnv * JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1read(JNIEnv * _env, jclass _b, jlong ser) { LDKu8slice ser_conv = *(LDKu8slice*)ser; - FREE((void*)ser); LDKNetworkGraph* ret = MALLOC(sizeof(LDKNetworkGraph), "LDKNetworkGraph"); *ret = NetworkGraph_read(ser_conv); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1new(JNIEnv * _env, jclass _b) { LDKNetworkGraph* ret = MALLOC(sizeof(LDKNetworkGraph), "LDKNetworkGraph"); *ret = NetworkGraph_new(); - assert(!ret->_underlying_ref); - ret->_underlying_ref = true; + DO_ASSERT(ret->is_owned); + ret->is_owned = false; return (long)ret; }