#include <string.h>
#include <stdatomic.h>
#include <assert.h>
+// Always run a, then assert it is true:
#define DO_ASSERT(a) do { bool _assert_val = (a); assert(_assert_val); } while(0)
+// Assert a is true or do nothing
+#define CHECK(a) DO_ASSERT(a)
// Running a leak check across all the allocations and frees of the JDK is a mess,
// so instead we implement our own naive leak checker here, relying on the -wrap
static jclass slicedef_cls = NULL;
JNIEXPORT void Java_org_ldk_impl_bindings_init(JNIEnv * env, jclass _b, jclass enum_class, jclass slicedef_class) {
ordinal_meth = (*env)->GetMethodID(env, enum_class, "ordinal", "()I");
- DO_ASSERT(ordinal_meth != NULL);
+ CHECK(ordinal_meth != NULL);
slicedef_meth = (*env)->GetMethodID(env, slicedef_class, "<init>", "(JJJ)V");
- DO_ASSERT(slicedef_meth != NULL);
+ CHECK(slicedef_meth != NULL);
slicedef_cls = (*env)->NewGlobalRef(env, slicedef_class);
- DO_ASSERT(slicedef_cls != NULL);
+ CHECK(slicedef_cls != NULL);
}
JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_deref_1bool (JNIEnv * env, jclass _a, jlong ptr) {
_Static_assert(offsetof(LDKCVec_u8Z, data) == offsetof(LDKu8slice, data), "Vec<u8> and [u8] need to have been mapped identically");
_Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKu8slice, datalen), "Vec<u8> and [u8] need to have been mapped identically");
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSecretKey_1new(JNIEnv * _env, jclass _b) {
- LDKSecretKey* key = (LDKSecretKey*)MALLOC(sizeof(LDKSecretKey), "LDKSecretKey");
- 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;
static jfieldID LDKAccessError_LDKAccessError_UnknownTx = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_LDKAccessError_init (JNIEnv * env, jclass clz) {
LDKAccessError_class = (*env)->NewGlobalRef(env, clz);
- DO_ASSERT(LDKAccessError_class != NULL);
+ CHECK(LDKAccessError_class != NULL);
LDKAccessError_LDKAccessError_UnknownChain = (*env)->GetStaticFieldID(env, LDKAccessError_class, "LDKAccessError_UnknownChain", "Lorg/ldk/enums/LDKAccessError;");
- DO_ASSERT(LDKAccessError_LDKAccessError_UnknownChain != NULL);
+ CHECK(LDKAccessError_LDKAccessError_UnknownChain != NULL);
LDKAccessError_LDKAccessError_UnknownTx = (*env)->GetStaticFieldID(env, LDKAccessError_class, "LDKAccessError_UnknownTx", "Lorg/ldk/enums/LDKAccessError;");
- DO_ASSERT(LDKAccessError_LDKAccessError_UnknownTx != NULL);
+ CHECK(LDKAccessError_LDKAccessError_UnknownTx != NULL);
}
static inline jclass LDKAccessError_to_java(JNIEnv *env, LDKAccessError val) {
switch (val) {
static jfieldID LDKChannelMonitorUpdateErr_LDKChannelMonitorUpdateErr_PermanentFailure = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_LDKChannelMonitorUpdateErr_init (JNIEnv * env, jclass clz) {
LDKChannelMonitorUpdateErr_class = (*env)->NewGlobalRef(env, clz);
- DO_ASSERT(LDKChannelMonitorUpdateErr_class != NULL);
+ CHECK(LDKChannelMonitorUpdateErr_class != NULL);
LDKChannelMonitorUpdateErr_LDKChannelMonitorUpdateErr_TemporaryFailure = (*env)->GetStaticFieldID(env, LDKChannelMonitorUpdateErr_class, "LDKChannelMonitorUpdateErr_TemporaryFailure", "Lorg/ldk/enums/LDKChannelMonitorUpdateErr;");
- DO_ASSERT(LDKChannelMonitorUpdateErr_LDKChannelMonitorUpdateErr_TemporaryFailure != NULL);
+ CHECK(LDKChannelMonitorUpdateErr_LDKChannelMonitorUpdateErr_TemporaryFailure != NULL);
LDKChannelMonitorUpdateErr_LDKChannelMonitorUpdateErr_PermanentFailure = (*env)->GetStaticFieldID(env, LDKChannelMonitorUpdateErr_class, "LDKChannelMonitorUpdateErr_PermanentFailure", "Lorg/ldk/enums/LDKChannelMonitorUpdateErr;");
- DO_ASSERT(LDKChannelMonitorUpdateErr_LDKChannelMonitorUpdateErr_PermanentFailure != NULL);
+ CHECK(LDKChannelMonitorUpdateErr_LDKChannelMonitorUpdateErr_PermanentFailure != NULL);
}
static inline jclass LDKChannelMonitorUpdateErr_to_java(JNIEnv *env, LDKChannelMonitorUpdateErr val) {
switch (val) {
static jfieldID LDKConfirmationTarget_LDKConfirmationTarget_HighPriority = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_LDKConfirmationTarget_init (JNIEnv * env, jclass clz) {
LDKConfirmationTarget_class = (*env)->NewGlobalRef(env, clz);
- DO_ASSERT(LDKConfirmationTarget_class != NULL);
+ CHECK(LDKConfirmationTarget_class != NULL);
LDKConfirmationTarget_LDKConfirmationTarget_Background = (*env)->GetStaticFieldID(env, LDKConfirmationTarget_class, "LDKConfirmationTarget_Background", "Lorg/ldk/enums/LDKConfirmationTarget;");
- DO_ASSERT(LDKConfirmationTarget_LDKConfirmationTarget_Background != NULL);
+ CHECK(LDKConfirmationTarget_LDKConfirmationTarget_Background != NULL);
LDKConfirmationTarget_LDKConfirmationTarget_Normal = (*env)->GetStaticFieldID(env, LDKConfirmationTarget_class, "LDKConfirmationTarget_Normal", "Lorg/ldk/enums/LDKConfirmationTarget;");
- DO_ASSERT(LDKConfirmationTarget_LDKConfirmationTarget_Normal != NULL);
+ CHECK(LDKConfirmationTarget_LDKConfirmationTarget_Normal != NULL);
LDKConfirmationTarget_LDKConfirmationTarget_HighPriority = (*env)->GetStaticFieldID(env, LDKConfirmationTarget_class, "LDKConfirmationTarget_HighPriority", "Lorg/ldk/enums/LDKConfirmationTarget;");
- DO_ASSERT(LDKConfirmationTarget_LDKConfirmationTarget_HighPriority != NULL);
+ CHECK(LDKConfirmationTarget_LDKConfirmationTarget_HighPriority != NULL);
}
static inline jclass LDKConfirmationTarget_to_java(JNIEnv *env, LDKConfirmationTarget val) {
switch (val) {
static jfieldID LDKLevel_LDKLevel_Trace = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_LDKLevel_init (JNIEnv * env, jclass clz) {
LDKLevel_class = (*env)->NewGlobalRef(env, clz);
- DO_ASSERT(LDKLevel_class != NULL);
+ CHECK(LDKLevel_class != NULL);
LDKLevel_LDKLevel_Off = (*env)->GetStaticFieldID(env, LDKLevel_class, "LDKLevel_Off", "Lorg/ldk/enums/LDKLevel;");
- DO_ASSERT(LDKLevel_LDKLevel_Off != NULL);
+ CHECK(LDKLevel_LDKLevel_Off != NULL);
LDKLevel_LDKLevel_Error = (*env)->GetStaticFieldID(env, LDKLevel_class, "LDKLevel_Error", "Lorg/ldk/enums/LDKLevel;");
- DO_ASSERT(LDKLevel_LDKLevel_Error != NULL);
+ CHECK(LDKLevel_LDKLevel_Error != NULL);
LDKLevel_LDKLevel_Warn = (*env)->GetStaticFieldID(env, LDKLevel_class, "LDKLevel_Warn", "Lorg/ldk/enums/LDKLevel;");
- DO_ASSERT(LDKLevel_LDKLevel_Warn != NULL);
+ CHECK(LDKLevel_LDKLevel_Warn != NULL);
LDKLevel_LDKLevel_Info = (*env)->GetStaticFieldID(env, LDKLevel_class, "LDKLevel_Info", "Lorg/ldk/enums/LDKLevel;");
- DO_ASSERT(LDKLevel_LDKLevel_Info != NULL);
+ CHECK(LDKLevel_LDKLevel_Info != NULL);
LDKLevel_LDKLevel_Debug = (*env)->GetStaticFieldID(env, LDKLevel_class, "LDKLevel_Debug", "Lorg/ldk/enums/LDKLevel;");
- DO_ASSERT(LDKLevel_LDKLevel_Debug != NULL);
+ CHECK(LDKLevel_LDKLevel_Debug != NULL);
LDKLevel_LDKLevel_Trace = (*env)->GetStaticFieldID(env, LDKLevel_class, "LDKLevel_Trace", "Lorg/ldk/enums/LDKLevel;");
- DO_ASSERT(LDKLevel_LDKLevel_Trace != NULL);
+ CHECK(LDKLevel_LDKLevel_Trace != NULL);
}
static inline jclass LDKLevel_to_java(JNIEnv *env, LDKLevel val) {
switch (val) {
static jfieldID LDKNetwork_LDKNetwork_Regtest = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_LDKNetwork_init (JNIEnv * env, jclass clz) {
LDKNetwork_class = (*env)->NewGlobalRef(env, clz);
- DO_ASSERT(LDKNetwork_class != NULL);
+ CHECK(LDKNetwork_class != NULL);
LDKNetwork_LDKNetwork_Bitcoin = (*env)->GetStaticFieldID(env, LDKNetwork_class, "LDKNetwork_Bitcoin", "Lorg/ldk/enums/LDKNetwork;");
- DO_ASSERT(LDKNetwork_LDKNetwork_Bitcoin != NULL);
+ CHECK(LDKNetwork_LDKNetwork_Bitcoin != NULL);
LDKNetwork_LDKNetwork_Testnet = (*env)->GetStaticFieldID(env, LDKNetwork_class, "LDKNetwork_Testnet", "Lorg/ldk/enums/LDKNetwork;");
- DO_ASSERT(LDKNetwork_LDKNetwork_Testnet != NULL);
+ CHECK(LDKNetwork_LDKNetwork_Testnet != NULL);
LDKNetwork_LDKNetwork_Regtest = (*env)->GetStaticFieldID(env, LDKNetwork_class, "LDKNetwork_Regtest", "Lorg/ldk/enums/LDKNetwork;");
- DO_ASSERT(LDKNetwork_LDKNetwork_Regtest != NULL);
+ CHECK(LDKNetwork_LDKNetwork_Regtest != NULL);
}
static inline jclass LDKNetwork_to_java(JNIEnv *env, LDKNetwork val) {
switch (val) {
static jfieldID LDKSecp256k1Error_LDKSecp256k1Error_CallbackPanicked = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_LDKSecp256k1Error_init (JNIEnv * env, jclass clz) {
LDKSecp256k1Error_class = (*env)->NewGlobalRef(env, clz);
- DO_ASSERT(LDKSecp256k1Error_class != NULL);
+ CHECK(LDKSecp256k1Error_class != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_IncorrectSignature = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_IncorrectSignature", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_IncorrectSignature != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_IncorrectSignature != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_InvalidMessage = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_InvalidMessage", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_InvalidMessage != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_InvalidMessage != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_InvalidPublicKey = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_InvalidPublicKey", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_InvalidPublicKey != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_InvalidPublicKey != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_InvalidSignature = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_InvalidSignature", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_InvalidSignature != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_InvalidSignature != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_InvalidSecretKey = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_InvalidSecretKey", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_InvalidSecretKey != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_InvalidSecretKey != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_InvalidRecoveryId = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_InvalidRecoveryId", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_InvalidRecoveryId != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_InvalidRecoveryId != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_InvalidTweak = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_InvalidTweak", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_InvalidTweak != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_InvalidTweak != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_NotEnoughMemory = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_NotEnoughMemory", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_NotEnoughMemory != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_NotEnoughMemory != NULL);
LDKSecp256k1Error_LDKSecp256k1Error_CallbackPanicked = (*env)->GetStaticFieldID(env, LDKSecp256k1Error_class, "LDKSecp256k1Error_CallbackPanicked", "Lorg/ldk/enums/LDKSecp256k1Error;");
- DO_ASSERT(LDKSecp256k1Error_LDKSecp256k1Error_CallbackPanicked != NULL);
+ CHECK(LDKSecp256k1Error_LDKSecp256k1Error_CallbackPanicked != NULL);
}
static inline jclass LDKSecp256k1Error_to_java(JNIEnv *env, LDKSecp256k1Error val) {
switch (val) {
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;
+ LDKCResult_NoneChannelMonitorUpdateErrZ *val = (LDKCResult_NoneChannelMonitorUpdateErrZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_NoneChannelMonitorUpdateErrZ*)arg)->contents.err;
+ return (long)val->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;
+ LDKCResult_NoneMonitorUpdateErrorZ *val = (LDKCResult_NoneMonitorUpdateErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_NoneMonitorUpdateErrorZ*)arg)->contents.err;
+ return (long)(val->contents.err->inner) | (val->contents.err->is_owned ? 1 : 0);
}
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKC2TupleTempl_1OutPoint_1_1CVec_1u8Z_1new(JNIEnv *_env, jclass _b, jlong a, jlong b) {
LDKOutPoint a_conv;
a_conv.inner = (void*)(a & (~1));
a_conv.is_owned = (a & 1) || (a == 0);
+ if (a_conv.inner != NULL)
+ a_conv = OutPoint_clone(&a_conv);
ret->a = a_conv;
LDKCVec_u8Z b_conv = *(LDKCVec_u8Z*)b;
FREE((void*)b);
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKC2TupleTempl_1ThirtyTwoBytes_1_1CVecTempl_1TxOut_1new(JNIEnv *_env, jclass _b, jbyteArray a, jlong b) {
LDKC2TupleTempl_ThirtyTwoBytes__CVecTempl_TxOut* ret = MALLOC(sizeof(LDKC2TupleTempl_ThirtyTwoBytes__CVecTempl_TxOut), "LDKC2TupleTempl_ThirtyTwoBytes__CVecTempl_TxOut");
LDKThirtyTwoBytes a_ref;
+ CHECK((*_env)->GetArrayLength (_env, a) == 32);
(*_env)->GetByteArrayRegion (_env, a, 0, 32, a_ref.data);
ret->a = a_ref;
LDKCVecTempl_TxOut b_conv = *(LDKCVecTempl_TxOut*)b;
LDKCVecTempl_Signature *vec = (LDKCVecTempl_Signature*)ptr;
return (*env)->NewObject(env, slicedef_cls, slicedef_meth, (long)vec->data, (long)vec->datalen, sizeof(LDKSignature));
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1Signature_1new(JNIEnv *env, jclass _b, jlongArray elems){
- LDKCVecTempl_Signature *ret = MALLOC(sizeof(LDKCVecTempl_Signature), "LDKCVecTempl_Signature");
- ret->datalen = (*env)->GetArrayLength(env, elems);
- if (ret->datalen == 0) {
- ret->data = NULL;
- } else {
- ret->data = MALLOC(sizeof(LDKSignature) * ret->datalen, "LDKCVecTempl_Signature Data");
- jlong *java_elems = (*env)->GetPrimitiveArrayCritical(env, elems, NULL);
- for (size_t i = 0; i < ret->datalen; i++) {
- jlong arr_elem = java_elems[i];
- LDKSignature arr_elem_conv = *(LDKSignature*)arr_elem;
- FREE((void*)arr_elem);
- ret->data[i] = arr_elem_conv;
- }
- (*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
- }
- return (long)ret;
-}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKC2TupleTempl_1Signature_1_1CVecTempl_1Signature_1new(JNIEnv *_env, jclass _b, jlong a, jlong b) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKC2TupleTempl_1Signature_1_1CVecTempl_1Signature_1new(JNIEnv *_env, jclass _b, jbyteArray a, jlong b) {
LDKC2TupleTempl_Signature__CVecTempl_Signature* ret = MALLOC(sizeof(LDKC2TupleTempl_Signature__CVecTempl_Signature), "LDKC2TupleTempl_Signature__CVecTempl_Signature");
- LDKSignature a_conv = *(LDKSignature*)a;
- FREE((void*)a);
- ret->a = a_conv;
+ LDKSignature a_ref;
+ CHECK((*_env)->GetArrayLength (_env, a) == 64);
+ (*_env)->GetByteArrayRegion (_env, a, 0, 64, a_ref.compact_form);
+ ret->a = a_ref;
LDKCVecTempl_Signature b_conv = *(LDKCVecTempl_Signature*)b;
FREE((void*)b);
ret->b = b_conv;
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;
+ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *val = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg)->contents.err;
+ return (long)val->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;
+ LDKCResult_SignatureNoneZ *val = (LDKCResult_SignatureNoneZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_SignatureNoneZ*)arg)->contents.err;
+ return (long)val->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;
+ LDKCResult_CVec_SignatureZNoneZ *val = (LDKCResult_CVec_SignatureZNoneZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_CVec_SignatureZNoneZ*)arg)->contents.err;
+ return (long)val->contents.err;
}
}
static jclass LDKAPIError_APIMisuseError_class = NULL;
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKAPIError_init (JNIEnv * env, jclass _a) {
LDKAPIError_APIMisuseError_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKAPIError$APIMisuseError;"));
- DO_ASSERT(LDKAPIError_APIMisuseError_class != NULL);
+ CHECK(LDKAPIError_APIMisuseError_class != NULL);
LDKAPIError_APIMisuseError_meth = (*env)->GetMethodID(env, LDKAPIError_APIMisuseError_class, "<init>", "(J)V");
- DO_ASSERT(LDKAPIError_APIMisuseError_meth != NULL);
+ CHECK(LDKAPIError_APIMisuseError_meth != NULL);
LDKAPIError_FeeRateTooHigh_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKAPIError$FeeRateTooHigh;"));
- DO_ASSERT(LDKAPIError_FeeRateTooHigh_class != NULL);
+ CHECK(LDKAPIError_FeeRateTooHigh_class != NULL);
LDKAPIError_FeeRateTooHigh_meth = (*env)->GetMethodID(env, LDKAPIError_FeeRateTooHigh_class, "<init>", "(JI)V");
- DO_ASSERT(LDKAPIError_FeeRateTooHigh_meth != NULL);
+ CHECK(LDKAPIError_FeeRateTooHigh_meth != NULL);
LDKAPIError_RouteError_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKAPIError$RouteError;"));
- DO_ASSERT(LDKAPIError_RouteError_class != NULL);
+ CHECK(LDKAPIError_RouteError_class != NULL);
LDKAPIError_RouteError_meth = (*env)->GetMethodID(env, LDKAPIError_RouteError_class, "<init>", "(J)V");
- DO_ASSERT(LDKAPIError_RouteError_meth != NULL);
+ CHECK(LDKAPIError_RouteError_meth != NULL);
LDKAPIError_ChannelUnavailable_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKAPIError$ChannelUnavailable;"));
- DO_ASSERT(LDKAPIError_ChannelUnavailable_class != NULL);
+ CHECK(LDKAPIError_ChannelUnavailable_class != NULL);
LDKAPIError_ChannelUnavailable_meth = (*env)->GetMethodID(env, LDKAPIError_ChannelUnavailable_class, "<init>", "(J)V");
- DO_ASSERT(LDKAPIError_ChannelUnavailable_meth != NULL);
+ CHECK(LDKAPIError_ChannelUnavailable_meth != NULL);
LDKAPIError_MonitorUpdateFailed_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKAPIError$MonitorUpdateFailed;"));
- DO_ASSERT(LDKAPIError_MonitorUpdateFailed_class != NULL);
+ CHECK(LDKAPIError_MonitorUpdateFailed_class != NULL);
LDKAPIError_MonitorUpdateFailed_meth = (*env)->GetMethodID(env, LDKAPIError_MonitorUpdateFailed_class, "<init>", "()V");
- DO_ASSERT(LDKAPIError_MonitorUpdateFailed_meth != NULL);
+ CHECK(LDKAPIError_MonitorUpdateFailed_meth != NULL);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKAPIError_1ref_1from_1ptr (JNIEnv * env, jclass _c, jlong ptr) {
LDKAPIError *obj = (LDKAPIError*)ptr;
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;
+ LDKCResult_NoneAPIErrorZ *val = (LDKCResult_NoneAPIErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_NoneAPIErrorZ*)arg)->contents.err;
+ return (long)val->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;
+ LDKCResult_NonePaymentSendFailureZ *val = (LDKCResult_NonePaymentSendFailureZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_NonePaymentSendFailureZ*)arg)->contents.err;
+ return (long)(val->contents.err->inner) | (val->contents.err->is_owned ? 1 : 0);
}
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKC3TupleTempl_1ChannelAnnouncement_1_1ChannelUpdate_1_1ChannelUpdate_1new(JNIEnv *_env, jclass _b, jlong a, jlong b, jlong c) {
LDKChannelAnnouncement a_conv;
a_conv.inner = (void*)(a & (~1));
a_conv.is_owned = (a & 1) || (a == 0);
+ if (a_conv.inner != NULL)
+ a_conv = ChannelAnnouncement_clone(&a_conv);
ret->a = a_conv;
LDKChannelUpdate b_conv;
b_conv.inner = (void*)(b & (~1));
b_conv.is_owned = (b & 1) || (b == 0);
+ if (b_conv.inner != NULL)
+ b_conv = ChannelUpdate_clone(&b_conv);
ret->b = b_conv;
LDKChannelUpdate c_conv;
c_conv.inner = (void*)(c & (~1));
c_conv.is_owned = (c & 1) || (c == 0);
+ if (c_conv.inner != NULL)
+ c_conv = ChannelUpdate_clone(&c_conv);
ret->c = c_conv;
return (long)ret;
}
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;
+ LDKCResult_NonePeerHandleErrorZ *val = (LDKCResult_NonePeerHandleErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_NonePeerHandleErrorZ*)arg)->contents.err;
+ return (long)(val->contents.err->inner) | (val->contents.err->is_owned ? 1 : 0);
}
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKC2TupleTempl_1HTLCOutputInCommitment_1_1Signature_1new(JNIEnv *_env, jclass _b, jlong a, jlong b) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKC2TupleTempl_1HTLCOutputInCommitment_1_1Signature_1new(JNIEnv *_env, jclass _b, jlong a, jbyteArray b) {
LDKC2TupleTempl_HTLCOutputInCommitment__Signature* ret = MALLOC(sizeof(LDKC2TupleTempl_HTLCOutputInCommitment__Signature), "LDKC2TupleTempl_HTLCOutputInCommitment__Signature");
LDKHTLCOutputInCommitment a_conv;
a_conv.inner = (void*)(a & (~1));
a_conv.is_owned = (a & 1) || (a == 0);
+ if (a_conv.inner != NULL)
+ a_conv = HTLCOutputInCommitment_clone(&a_conv);
ret->a = a_conv;
- LDKSignature b_conv = *(LDKSignature*)b;
- FREE((void*)b);
- ret->b = b_conv;
+ LDKSignature b_ref;
+ CHECK((*_env)->GetArrayLength (_env, b) == 64);
+ (*_env)->GetByteArrayRegion (_env, b, 0, 64, b_ref.compact_form);
+ ret->b = b_ref;
return (long)ret;
}
static jclass LDKSpendableOutputDescriptor_StaticOutput_class = NULL;
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKSpendableOutputDescriptor_init (JNIEnv * env, jclass _a) {
LDKSpendableOutputDescriptor_StaticOutput_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKSpendableOutputDescriptor$StaticOutput;"));
- DO_ASSERT(LDKSpendableOutputDescriptor_StaticOutput_class != NULL);
+ CHECK(LDKSpendableOutputDescriptor_StaticOutput_class != NULL);
LDKSpendableOutputDescriptor_StaticOutput_meth = (*env)->GetMethodID(env, LDKSpendableOutputDescriptor_StaticOutput_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKSpendableOutputDescriptor_StaticOutput_meth != NULL);
+ CHECK(LDKSpendableOutputDescriptor_StaticOutput_meth != NULL);
LDKSpendableOutputDescriptor_DynamicOutputP2WSH_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKSpendableOutputDescriptor$DynamicOutputP2WSH;"));
- DO_ASSERT(LDKSpendableOutputDescriptor_DynamicOutputP2WSH_class != NULL);
- LDKSpendableOutputDescriptor_DynamicOutputP2WSH_meth = (*env)->GetMethodID(env, LDKSpendableOutputDescriptor_DynamicOutputP2WSH_class, "<init>", "(JJSJJJ)V");
- DO_ASSERT(LDKSpendableOutputDescriptor_DynamicOutputP2WSH_meth != NULL);
+ CHECK(LDKSpendableOutputDescriptor_DynamicOutputP2WSH_class != NULL);
+ LDKSpendableOutputDescriptor_DynamicOutputP2WSH_meth = (*env)->GetMethodID(env, LDKSpendableOutputDescriptor_DynamicOutputP2WSH_class, "<init>", "(J[BSJJ[B)V");
+ CHECK(LDKSpendableOutputDescriptor_DynamicOutputP2WSH_meth != NULL);
LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKSpendableOutputDescriptor$StaticOutputCounterpartyPayment;"));
- DO_ASSERT(LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment_class != NULL);
+ CHECK(LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment_class != NULL);
LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment_meth = (*env)->GetMethodID(env, LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment_class, "<init>", "(JJJ)V");
- DO_ASSERT(LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment_meth != NULL);
+ CHECK(LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment_meth != NULL);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKSpendableOutputDescriptor_1ref_1from_1ptr (JNIEnv * env, jclass _c, jlong ptr) {
LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)ptr;
switch(obj->tag) {
case LDKSpendableOutputDescriptor_StaticOutput: {
LDKOutPoint outpoint_var = obj->static_output.outpoint;
- DO_ASSERT((((long)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long outpoint_ref;
if (outpoint_var.is_owned) {
outpoint_ref = (long)outpoint_var.inner | 1;
}
case LDKSpendableOutputDescriptor_DynamicOutputP2WSH: {
LDKOutPoint outpoint_var = obj->dynamic_output_p2wsh.outpoint;
- DO_ASSERT((((long)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long outpoint_ref;
if (outpoint_var.is_owned) {
outpoint_ref = (long)outpoint_var.inner | 1;
} else {
outpoint_ref = (long)&outpoint_var;
}
- long per_commitment_point_ref = (long)&obj->dynamic_output_p2wsh.per_commitment_point;
+ jbyteArray per_commitment_point_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, per_commitment_point_arr, 0, 33, obj->dynamic_output_p2wsh.per_commitment_point.compressed_form);
long output_ref = (long)&obj->dynamic_output_p2wsh.output;
long key_derivation_params_ref = (long)&obj->dynamic_output_p2wsh.key_derivation_params;
- long revocation_pubkey_ref = (long)&obj->dynamic_output_p2wsh.revocation_pubkey;
- return (*env)->NewObject(env, LDKSpendableOutputDescriptor_DynamicOutputP2WSH_class, LDKSpendableOutputDescriptor_DynamicOutputP2WSH_meth, outpoint_ref, per_commitment_point_ref, obj->dynamic_output_p2wsh.to_self_delay, output_ref, key_derivation_params_ref, revocation_pubkey_ref);
+ jbyteArray revocation_pubkey_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, revocation_pubkey_arr, 0, 33, obj->dynamic_output_p2wsh.revocation_pubkey.compressed_form);
+ return (*env)->NewObject(env, LDKSpendableOutputDescriptor_DynamicOutputP2WSH_class, LDKSpendableOutputDescriptor_DynamicOutputP2WSH_meth, outpoint_ref, per_commitment_point_arr, obj->dynamic_output_p2wsh.to_self_delay, output_ref, key_derivation_params_ref, revocation_pubkey_arr);
}
case LDKSpendableOutputDescriptor_StaticOutputCounterpartyPayment: {
LDKOutPoint outpoint_var = obj->static_output_counterparty_payment.outpoint;
- DO_ASSERT((((long)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long outpoint_ref;
if (outpoint_var.is_owned) {
outpoint_ref = (long)outpoint_var.inner | 1;
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKEvent_init (JNIEnv * env, jclass _a) {
LDKEvent_FundingGenerationReady_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKEvent$FundingGenerationReady;"));
- DO_ASSERT(LDKEvent_FundingGenerationReady_class != NULL);
+ CHECK(LDKEvent_FundingGenerationReady_class != NULL);
LDKEvent_FundingGenerationReady_meth = (*env)->GetMethodID(env, LDKEvent_FundingGenerationReady_class, "<init>", "([BJJJ)V");
- DO_ASSERT(LDKEvent_FundingGenerationReady_meth != NULL);
+ CHECK(LDKEvent_FundingGenerationReady_meth != NULL);
LDKEvent_FundingBroadcastSafe_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKEvent$FundingBroadcastSafe;"));
- DO_ASSERT(LDKEvent_FundingBroadcastSafe_class != NULL);
+ CHECK(LDKEvent_FundingBroadcastSafe_class != NULL);
LDKEvent_FundingBroadcastSafe_meth = (*env)->GetMethodID(env, LDKEvent_FundingBroadcastSafe_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKEvent_FundingBroadcastSafe_meth != NULL);
+ CHECK(LDKEvent_FundingBroadcastSafe_meth != NULL);
LDKEvent_PaymentReceived_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKEvent$PaymentReceived;"));
- DO_ASSERT(LDKEvent_PaymentReceived_class != NULL);
+ CHECK(LDKEvent_PaymentReceived_class != NULL);
LDKEvent_PaymentReceived_meth = (*env)->GetMethodID(env, LDKEvent_PaymentReceived_class, "<init>", "([B[BJ)V");
- DO_ASSERT(LDKEvent_PaymentReceived_meth != NULL);
+ CHECK(LDKEvent_PaymentReceived_meth != NULL);
LDKEvent_PaymentSent_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKEvent$PaymentSent;"));
- DO_ASSERT(LDKEvent_PaymentSent_class != NULL);
+ CHECK(LDKEvent_PaymentSent_class != NULL);
LDKEvent_PaymentSent_meth = (*env)->GetMethodID(env, LDKEvent_PaymentSent_class, "<init>", "([B)V");
- DO_ASSERT(LDKEvent_PaymentSent_meth != NULL);
+ CHECK(LDKEvent_PaymentSent_meth != NULL);
LDKEvent_PaymentFailed_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKEvent$PaymentFailed;"));
- DO_ASSERT(LDKEvent_PaymentFailed_class != NULL);
+ CHECK(LDKEvent_PaymentFailed_class != NULL);
LDKEvent_PaymentFailed_meth = (*env)->GetMethodID(env, LDKEvent_PaymentFailed_class, "<init>", "([BZ)V");
- DO_ASSERT(LDKEvent_PaymentFailed_meth != NULL);
+ CHECK(LDKEvent_PaymentFailed_meth != NULL);
LDKEvent_PendingHTLCsForwardable_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKEvent$PendingHTLCsForwardable;"));
- DO_ASSERT(LDKEvent_PendingHTLCsForwardable_class != NULL);
+ CHECK(LDKEvent_PendingHTLCsForwardable_class != NULL);
LDKEvent_PendingHTLCsForwardable_meth = (*env)->GetMethodID(env, LDKEvent_PendingHTLCsForwardable_class, "<init>", "(J)V");
- DO_ASSERT(LDKEvent_PendingHTLCsForwardable_meth != NULL);
+ CHECK(LDKEvent_PendingHTLCsForwardable_meth != NULL);
LDKEvent_SpendableOutputs_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKEvent$SpendableOutputs;"));
- DO_ASSERT(LDKEvent_SpendableOutputs_class != NULL);
+ CHECK(LDKEvent_SpendableOutputs_class != NULL);
LDKEvent_SpendableOutputs_meth = (*env)->GetMethodID(env, LDKEvent_SpendableOutputs_class, "<init>", "(J)V");
- DO_ASSERT(LDKEvent_SpendableOutputs_meth != NULL);
+ CHECK(LDKEvent_SpendableOutputs_meth != NULL);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKEvent_1ref_1from_1ptr (JNIEnv * env, jclass _c, jlong ptr) {
LDKEvent *obj = (LDKEvent*)ptr;
}
case LDKEvent_FundingBroadcastSafe: {
LDKOutPoint funding_txo_var = obj->funding_broadcast_safe.funding_txo;
- DO_ASSERT((((long)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long funding_txo_ref;
if (funding_txo_var.is_owned) {
funding_txo_ref = (long)funding_txo_var.inner | 1;
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKErrorAction_init (JNIEnv * env, jclass _a) {
LDKErrorAction_DisconnectPeer_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKErrorAction$DisconnectPeer;"));
- DO_ASSERT(LDKErrorAction_DisconnectPeer_class != NULL);
+ CHECK(LDKErrorAction_DisconnectPeer_class != NULL);
LDKErrorAction_DisconnectPeer_meth = (*env)->GetMethodID(env, LDKErrorAction_DisconnectPeer_class, "<init>", "(J)V");
- DO_ASSERT(LDKErrorAction_DisconnectPeer_meth != NULL);
+ CHECK(LDKErrorAction_DisconnectPeer_meth != NULL);
LDKErrorAction_IgnoreError_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKErrorAction$IgnoreError;"));
- DO_ASSERT(LDKErrorAction_IgnoreError_class != NULL);
+ CHECK(LDKErrorAction_IgnoreError_class != NULL);
LDKErrorAction_IgnoreError_meth = (*env)->GetMethodID(env, LDKErrorAction_IgnoreError_class, "<init>", "()V");
- DO_ASSERT(LDKErrorAction_IgnoreError_meth != NULL);
+ CHECK(LDKErrorAction_IgnoreError_meth != NULL);
LDKErrorAction_SendErrorMessage_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKErrorAction$SendErrorMessage;"));
- DO_ASSERT(LDKErrorAction_SendErrorMessage_class != NULL);
+ CHECK(LDKErrorAction_SendErrorMessage_class != NULL);
LDKErrorAction_SendErrorMessage_meth = (*env)->GetMethodID(env, LDKErrorAction_SendErrorMessage_class, "<init>", "(J)V");
- DO_ASSERT(LDKErrorAction_SendErrorMessage_meth != NULL);
+ CHECK(LDKErrorAction_SendErrorMessage_meth != NULL);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKErrorAction_1ref_1from_1ptr (JNIEnv * env, jclass _c, jlong ptr) {
LDKErrorAction *obj = (LDKErrorAction*)ptr;
switch(obj->tag) {
case LDKErrorAction_DisconnectPeer: {
LDKErrorMessage msg_var = obj->disconnect_peer.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
}
case LDKErrorAction_SendErrorMessage: {
LDKErrorMessage msg_var = obj->send_error_message.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKHTLCFailChannelUpdate_init (JNIEnv * env, jclass _a) {
LDKHTLCFailChannelUpdate_ChannelUpdateMessage_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKHTLCFailChannelUpdate$ChannelUpdateMessage;"));
- DO_ASSERT(LDKHTLCFailChannelUpdate_ChannelUpdateMessage_class != NULL);
+ CHECK(LDKHTLCFailChannelUpdate_ChannelUpdateMessage_class != NULL);
LDKHTLCFailChannelUpdate_ChannelUpdateMessage_meth = (*env)->GetMethodID(env, LDKHTLCFailChannelUpdate_ChannelUpdateMessage_class, "<init>", "(J)V");
- DO_ASSERT(LDKHTLCFailChannelUpdate_ChannelUpdateMessage_meth != NULL);
+ CHECK(LDKHTLCFailChannelUpdate_ChannelUpdateMessage_meth != NULL);
LDKHTLCFailChannelUpdate_ChannelClosed_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKHTLCFailChannelUpdate$ChannelClosed;"));
- DO_ASSERT(LDKHTLCFailChannelUpdate_ChannelClosed_class != NULL);
+ CHECK(LDKHTLCFailChannelUpdate_ChannelClosed_class != NULL);
LDKHTLCFailChannelUpdate_ChannelClosed_meth = (*env)->GetMethodID(env, LDKHTLCFailChannelUpdate_ChannelClosed_class, "<init>", "(JZ)V");
- DO_ASSERT(LDKHTLCFailChannelUpdate_ChannelClosed_meth != NULL);
+ CHECK(LDKHTLCFailChannelUpdate_ChannelClosed_meth != NULL);
LDKHTLCFailChannelUpdate_NodeFailure_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKHTLCFailChannelUpdate$NodeFailure;"));
- DO_ASSERT(LDKHTLCFailChannelUpdate_NodeFailure_class != NULL);
- LDKHTLCFailChannelUpdate_NodeFailure_meth = (*env)->GetMethodID(env, LDKHTLCFailChannelUpdate_NodeFailure_class, "<init>", "(JZ)V");
- DO_ASSERT(LDKHTLCFailChannelUpdate_NodeFailure_meth != NULL);
+ CHECK(LDKHTLCFailChannelUpdate_NodeFailure_class != NULL);
+ LDKHTLCFailChannelUpdate_NodeFailure_meth = (*env)->GetMethodID(env, LDKHTLCFailChannelUpdate_NodeFailure_class, "<init>", "([BZ)V");
+ CHECK(LDKHTLCFailChannelUpdate_NodeFailure_meth != NULL);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKHTLCFailChannelUpdate_1ref_1from_1ptr (JNIEnv * env, jclass _c, jlong ptr) {
LDKHTLCFailChannelUpdate *obj = (LDKHTLCFailChannelUpdate*)ptr;
switch(obj->tag) {
case LDKHTLCFailChannelUpdate_ChannelUpdateMessage: {
LDKChannelUpdate msg_var = obj->channel_update_message.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
return (*env)->NewObject(env, LDKHTLCFailChannelUpdate_ChannelClosed_class, LDKHTLCFailChannelUpdate_ChannelClosed_meth, obj->channel_closed.short_channel_id, obj->channel_closed.is_permanent);
}
case LDKHTLCFailChannelUpdate_NodeFailure: {
- long node_id_ref = (long)&obj->node_failure.node_id;
- return (*env)->NewObject(env, LDKHTLCFailChannelUpdate_NodeFailure_class, LDKHTLCFailChannelUpdate_NodeFailure_meth, node_id_ref, obj->node_failure.is_permanent);
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->node_failure.node_id.compressed_form);
+ return (*env)->NewObject(env, LDKHTLCFailChannelUpdate_NodeFailure_class, LDKHTLCFailChannelUpdate_NodeFailure_meth, node_id_arr, obj->node_failure.is_permanent);
}
default: abort();
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKMessageSendEvent_init (JNIEnv * env, jclass _a) {
LDKMessageSendEvent_SendAcceptChannel_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendAcceptChannel;"));
- DO_ASSERT(LDKMessageSendEvent_SendAcceptChannel_class != NULL);
- LDKMessageSendEvent_SendAcceptChannel_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendAcceptChannel_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendAcceptChannel_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendAcceptChannel_class != NULL);
+ LDKMessageSendEvent_SendAcceptChannel_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendAcceptChannel_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendAcceptChannel_meth != NULL);
LDKMessageSendEvent_SendOpenChannel_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendOpenChannel;"));
- DO_ASSERT(LDKMessageSendEvent_SendOpenChannel_class != NULL);
- LDKMessageSendEvent_SendOpenChannel_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendOpenChannel_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendOpenChannel_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendOpenChannel_class != NULL);
+ LDKMessageSendEvent_SendOpenChannel_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendOpenChannel_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendOpenChannel_meth != NULL);
LDKMessageSendEvent_SendFundingCreated_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendFundingCreated;"));
- DO_ASSERT(LDKMessageSendEvent_SendFundingCreated_class != NULL);
- LDKMessageSendEvent_SendFundingCreated_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendFundingCreated_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendFundingCreated_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendFundingCreated_class != NULL);
+ LDKMessageSendEvent_SendFundingCreated_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendFundingCreated_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendFundingCreated_meth != NULL);
LDKMessageSendEvent_SendFundingSigned_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendFundingSigned;"));
- DO_ASSERT(LDKMessageSendEvent_SendFundingSigned_class != NULL);
- LDKMessageSendEvent_SendFundingSigned_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendFundingSigned_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendFundingSigned_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendFundingSigned_class != NULL);
+ LDKMessageSendEvent_SendFundingSigned_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendFundingSigned_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendFundingSigned_meth != NULL);
LDKMessageSendEvent_SendFundingLocked_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendFundingLocked;"));
- DO_ASSERT(LDKMessageSendEvent_SendFundingLocked_class != NULL);
- LDKMessageSendEvent_SendFundingLocked_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendFundingLocked_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendFundingLocked_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendFundingLocked_class != NULL);
+ LDKMessageSendEvent_SendFundingLocked_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendFundingLocked_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendFundingLocked_meth != NULL);
LDKMessageSendEvent_SendAnnouncementSignatures_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendAnnouncementSignatures;"));
- DO_ASSERT(LDKMessageSendEvent_SendAnnouncementSignatures_class != NULL);
- LDKMessageSendEvent_SendAnnouncementSignatures_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendAnnouncementSignatures_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendAnnouncementSignatures_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendAnnouncementSignatures_class != NULL);
+ LDKMessageSendEvent_SendAnnouncementSignatures_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendAnnouncementSignatures_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendAnnouncementSignatures_meth != NULL);
LDKMessageSendEvent_UpdateHTLCs_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$UpdateHTLCs;"));
- DO_ASSERT(LDKMessageSendEvent_UpdateHTLCs_class != NULL);
- LDKMessageSendEvent_UpdateHTLCs_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_UpdateHTLCs_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_UpdateHTLCs_meth != NULL);
+ CHECK(LDKMessageSendEvent_UpdateHTLCs_class != NULL);
+ LDKMessageSendEvent_UpdateHTLCs_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_UpdateHTLCs_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_UpdateHTLCs_meth != NULL);
LDKMessageSendEvent_SendRevokeAndACK_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendRevokeAndACK;"));
- DO_ASSERT(LDKMessageSendEvent_SendRevokeAndACK_class != NULL);
- LDKMessageSendEvent_SendRevokeAndACK_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendRevokeAndACK_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendRevokeAndACK_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendRevokeAndACK_class != NULL);
+ LDKMessageSendEvent_SendRevokeAndACK_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendRevokeAndACK_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendRevokeAndACK_meth != NULL);
LDKMessageSendEvent_SendClosingSigned_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendClosingSigned;"));
- DO_ASSERT(LDKMessageSendEvent_SendClosingSigned_class != NULL);
- LDKMessageSendEvent_SendClosingSigned_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendClosingSigned_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendClosingSigned_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendClosingSigned_class != NULL);
+ LDKMessageSendEvent_SendClosingSigned_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendClosingSigned_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendClosingSigned_meth != NULL);
LDKMessageSendEvent_SendShutdown_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendShutdown;"));
- DO_ASSERT(LDKMessageSendEvent_SendShutdown_class != NULL);
- LDKMessageSendEvent_SendShutdown_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendShutdown_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendShutdown_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendShutdown_class != NULL);
+ LDKMessageSendEvent_SendShutdown_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendShutdown_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendShutdown_meth != NULL);
LDKMessageSendEvent_SendChannelReestablish_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$SendChannelReestablish;"));
- DO_ASSERT(LDKMessageSendEvent_SendChannelReestablish_class != NULL);
- LDKMessageSendEvent_SendChannelReestablish_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendChannelReestablish_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_SendChannelReestablish_meth != NULL);
+ CHECK(LDKMessageSendEvent_SendChannelReestablish_class != NULL);
+ LDKMessageSendEvent_SendChannelReestablish_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_SendChannelReestablish_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_SendChannelReestablish_meth != NULL);
LDKMessageSendEvent_BroadcastChannelAnnouncement_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$BroadcastChannelAnnouncement;"));
- DO_ASSERT(LDKMessageSendEvent_BroadcastChannelAnnouncement_class != NULL);
+ CHECK(LDKMessageSendEvent_BroadcastChannelAnnouncement_class != NULL);
LDKMessageSendEvent_BroadcastChannelAnnouncement_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_BroadcastChannelAnnouncement_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_BroadcastChannelAnnouncement_meth != NULL);
+ CHECK(LDKMessageSendEvent_BroadcastChannelAnnouncement_meth != NULL);
LDKMessageSendEvent_BroadcastNodeAnnouncement_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$BroadcastNodeAnnouncement;"));
- DO_ASSERT(LDKMessageSendEvent_BroadcastNodeAnnouncement_class != NULL);
+ CHECK(LDKMessageSendEvent_BroadcastNodeAnnouncement_class != NULL);
LDKMessageSendEvent_BroadcastNodeAnnouncement_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_BroadcastNodeAnnouncement_class, "<init>", "(J)V");
- DO_ASSERT(LDKMessageSendEvent_BroadcastNodeAnnouncement_meth != NULL);
+ CHECK(LDKMessageSendEvent_BroadcastNodeAnnouncement_meth != NULL);
LDKMessageSendEvent_BroadcastChannelUpdate_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$BroadcastChannelUpdate;"));
- DO_ASSERT(LDKMessageSendEvent_BroadcastChannelUpdate_class != NULL);
+ CHECK(LDKMessageSendEvent_BroadcastChannelUpdate_class != NULL);
LDKMessageSendEvent_BroadcastChannelUpdate_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_BroadcastChannelUpdate_class, "<init>", "(J)V");
- DO_ASSERT(LDKMessageSendEvent_BroadcastChannelUpdate_meth != NULL);
+ CHECK(LDKMessageSendEvent_BroadcastChannelUpdate_meth != NULL);
LDKMessageSendEvent_HandleError_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$HandleError;"));
- DO_ASSERT(LDKMessageSendEvent_HandleError_class != NULL);
- LDKMessageSendEvent_HandleError_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_HandleError_class, "<init>", "(JJ)V");
- DO_ASSERT(LDKMessageSendEvent_HandleError_meth != NULL);
+ CHECK(LDKMessageSendEvent_HandleError_class != NULL);
+ LDKMessageSendEvent_HandleError_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_HandleError_class, "<init>", "([BJ)V");
+ CHECK(LDKMessageSendEvent_HandleError_meth != NULL);
LDKMessageSendEvent_PaymentFailureNetworkUpdate_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKMessageSendEvent$PaymentFailureNetworkUpdate;"));
- DO_ASSERT(LDKMessageSendEvent_PaymentFailureNetworkUpdate_class != NULL);
+ CHECK(LDKMessageSendEvent_PaymentFailureNetworkUpdate_class != NULL);
LDKMessageSendEvent_PaymentFailureNetworkUpdate_meth = (*env)->GetMethodID(env, LDKMessageSendEvent_PaymentFailureNetworkUpdate_class, "<init>", "(J)V");
- DO_ASSERT(LDKMessageSendEvent_PaymentFailureNetworkUpdate_meth != NULL);
+ CHECK(LDKMessageSendEvent_PaymentFailureNetworkUpdate_meth != NULL);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKMessageSendEvent_1ref_1from_1ptr (JNIEnv * env, jclass _c, jlong ptr) {
LDKMessageSendEvent *obj = (LDKMessageSendEvent*)ptr;
switch(obj->tag) {
case LDKMessageSendEvent_SendAcceptChannel: {
- long node_id_ref = (long)&obj->send_accept_channel.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_accept_channel.node_id.compressed_form);
LDKAcceptChannel msg_var = obj->send_accept_channel.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendAcceptChannel_class, LDKMessageSendEvent_SendAcceptChannel_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendAcceptChannel_class, LDKMessageSendEvent_SendAcceptChannel_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendOpenChannel: {
- long node_id_ref = (long)&obj->send_open_channel.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_open_channel.node_id.compressed_form);
LDKOpenChannel msg_var = obj->send_open_channel.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendOpenChannel_class, LDKMessageSendEvent_SendOpenChannel_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendOpenChannel_class, LDKMessageSendEvent_SendOpenChannel_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendFundingCreated: {
- long node_id_ref = (long)&obj->send_funding_created.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_funding_created.node_id.compressed_form);
LDKFundingCreated msg_var = obj->send_funding_created.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendFundingCreated_class, LDKMessageSendEvent_SendFundingCreated_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendFundingCreated_class, LDKMessageSendEvent_SendFundingCreated_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendFundingSigned: {
- long node_id_ref = (long)&obj->send_funding_signed.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_funding_signed.node_id.compressed_form);
LDKFundingSigned msg_var = obj->send_funding_signed.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendFundingSigned_class, LDKMessageSendEvent_SendFundingSigned_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendFundingSigned_class, LDKMessageSendEvent_SendFundingSigned_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendFundingLocked: {
- long node_id_ref = (long)&obj->send_funding_locked.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_funding_locked.node_id.compressed_form);
LDKFundingLocked msg_var = obj->send_funding_locked.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendFundingLocked_class, LDKMessageSendEvent_SendFundingLocked_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendFundingLocked_class, LDKMessageSendEvent_SendFundingLocked_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendAnnouncementSignatures: {
- long node_id_ref = (long)&obj->send_announcement_signatures.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_announcement_signatures.node_id.compressed_form);
LDKAnnouncementSignatures msg_var = obj->send_announcement_signatures.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendAnnouncementSignatures_class, LDKMessageSendEvent_SendAnnouncementSignatures_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendAnnouncementSignatures_class, LDKMessageSendEvent_SendAnnouncementSignatures_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_UpdateHTLCs: {
- long node_id_ref = (long)&obj->update_htl_cs.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->update_htl_cs.node_id.compressed_form);
LDKCommitmentUpdate updates_var = obj->update_htl_cs.updates;
- DO_ASSERT((((long)updates_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&updates_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)updates_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&updates_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long updates_ref;
if (updates_var.is_owned) {
updates_ref = (long)updates_var.inner | 1;
} else {
updates_ref = (long)&updates_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_UpdateHTLCs_class, LDKMessageSendEvent_UpdateHTLCs_meth, node_id_ref, updates_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_UpdateHTLCs_class, LDKMessageSendEvent_UpdateHTLCs_meth, node_id_arr, updates_ref);
}
case LDKMessageSendEvent_SendRevokeAndACK: {
- long node_id_ref = (long)&obj->send_revoke_and_ack.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_revoke_and_ack.node_id.compressed_form);
LDKRevokeAndACK msg_var = obj->send_revoke_and_ack.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendRevokeAndACK_class, LDKMessageSendEvent_SendRevokeAndACK_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendRevokeAndACK_class, LDKMessageSendEvent_SendRevokeAndACK_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendClosingSigned: {
- long node_id_ref = (long)&obj->send_closing_signed.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_closing_signed.node_id.compressed_form);
LDKClosingSigned msg_var = obj->send_closing_signed.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendClosingSigned_class, LDKMessageSendEvent_SendClosingSigned_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendClosingSigned_class, LDKMessageSendEvent_SendClosingSigned_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendShutdown: {
- long node_id_ref = (long)&obj->send_shutdown.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_shutdown.node_id.compressed_form);
LDKShutdown msg_var = obj->send_shutdown.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendShutdown_class, LDKMessageSendEvent_SendShutdown_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendShutdown_class, LDKMessageSendEvent_SendShutdown_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_SendChannelReestablish: {
- long node_id_ref = (long)&obj->send_channel_reestablish.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->send_channel_reestablish.node_id.compressed_form);
LDKChannelReestablish msg_var = obj->send_channel_reestablish.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
} else {
msg_ref = (long)&msg_var;
}
- return (*env)->NewObject(env, LDKMessageSendEvent_SendChannelReestablish_class, LDKMessageSendEvent_SendChannelReestablish_meth, node_id_ref, msg_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_SendChannelReestablish_class, LDKMessageSendEvent_SendChannelReestablish_meth, node_id_arr, msg_ref);
}
case LDKMessageSendEvent_BroadcastChannelAnnouncement: {
LDKChannelAnnouncement msg_var = obj->broadcast_channel_announcement.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
msg_ref = (long)&msg_var;
}
LDKChannelUpdate update_msg_var = obj->broadcast_channel_announcement.update_msg;
- DO_ASSERT((((long)update_msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&update_msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)update_msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&update_msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long update_msg_ref;
if (update_msg_var.is_owned) {
update_msg_ref = (long)update_msg_var.inner | 1;
}
case LDKMessageSendEvent_BroadcastNodeAnnouncement: {
LDKNodeAnnouncement msg_var = obj->broadcast_node_announcement.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
}
case LDKMessageSendEvent_BroadcastChannelUpdate: {
LDKChannelUpdate msg_var = obj->broadcast_channel_update.msg;
- DO_ASSERT((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long msg_ref;
if (msg_var.is_owned) {
msg_ref = (long)msg_var.inner | 1;
return (*env)->NewObject(env, LDKMessageSendEvent_BroadcastChannelUpdate_class, LDKMessageSendEvent_BroadcastChannelUpdate_meth, msg_ref);
}
case LDKMessageSendEvent_HandleError: {
- long node_id_ref = (long)&obj->handle_error.node_id;
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, obj->handle_error.node_id.compressed_form);
long action_ref = (long)&obj->handle_error.action;
- return (*env)->NewObject(env, LDKMessageSendEvent_HandleError_class, LDKMessageSendEvent_HandleError_meth, node_id_ref, action_ref);
+ return (*env)->NewObject(env, LDKMessageSendEvent_HandleError_class, LDKMessageSendEvent_HandleError_meth, node_id_arr, action_ref);
}
case LDKMessageSendEvent_PaymentFailureNetworkUpdate: {
long update_ref = (long)&obj->payment_failure_network_update.update;
typedef struct LDKMessageSendEventsProvider_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak 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;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCVec_MessageSendEventZ* ret = (LDKCVec_MessageSendEventZ*)(*env)->CallLongMethod(env, obj, j_calls->get_and_clear_pending_msg_events_meth);
LDKCVec_MessageSendEventZ res = *ret;
FREE(ret);
return res;
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKMessageSendEventsProvider LDKMessageSendEventsProvider_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKMessageSendEventsProvider_JCalls *calls = MALLOC(sizeof(LDKMessageSendEventsProvider_JCalls), "LDKMessageSendEventsProvider_JCalls");
atomic_init(&calls->refcnt, 1);
DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);
- calls->o = (*env)->NewGlobalRef(env, o);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
calls->get_and_clear_pending_msg_events_meth = (*env)->GetMethodID(env, c, "get_and_clear_pending_msg_events", "()J");
- DO_ASSERT(calls->get_and_clear_pending_msg_events_meth != NULL);
+ CHECK(calls->get_and_clear_pending_msg_events_meth != NULL);
LDKMessageSendEventsProvider ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKMessageSendEventsProvider_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_MessageSendEventsProvider_1call_1get_1and_1clear_1pending_1msg_1events(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKMessageSendEventsProvider* this_arg_conv = (LDKMessageSendEventsProvider*)this_arg;
LDKCVec_MessageSendEventZ* ret = MALLOC(sizeof(LDKCVec_MessageSendEventZ), "LDKCVec_MessageSendEventZ");
- *ret = (arg_conv->get_and_clear_pending_msg_events)(arg_conv->this_arg);
+ *ret = (this_arg_conv->get_and_clear_pending_msg_events)(this_arg_conv->this_arg);
return (long)ret;
}
typedef struct LDKEventsProvider_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak 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;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCVec_EventZ* ret = (LDKCVec_EventZ*)(*env)->CallLongMethod(env, obj, j_calls->get_and_clear_pending_events_meth);
LDKCVec_EventZ res = *ret;
FREE(ret);
return res;
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKEventsProvider LDKEventsProvider_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKEventsProvider_JCalls *calls = MALLOC(sizeof(LDKEventsProvider_JCalls), "LDKEventsProvider_JCalls");
atomic_init(&calls->refcnt, 1);
DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);
- calls->o = (*env)->NewGlobalRef(env, o);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
calls->get_and_clear_pending_events_meth = (*env)->GetMethodID(env, c, "get_and_clear_pending_events", "()J");
- DO_ASSERT(calls->get_and_clear_pending_events_meth != NULL);
+ CHECK(calls->get_and_clear_pending_events_meth != NULL);
LDKEventsProvider ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKEventsProvider_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_EventsProvider_1call_1get_1and_1clear_1pending_1events(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKEventsProvider* this_arg_conv = (LDKEventsProvider*)this_arg;
LDKCVec_EventZ* ret = MALLOC(sizeof(LDKCVec_EventZ), "LDKCVec_EventZ");
- *ret = (arg_conv->get_and_clear_pending_events)(arg_conv->this_arg);
+ *ret = (this_arg_conv->get_and_clear_pending_events)(this_arg_conv->this_arg);
return (long)ret;
}
typedef struct LDKLogger_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID log_meth;
} LDKLogger_JCalls;
void log_jcall(const void* this_arg, const char *record) {
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, 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) {
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKLogger LDKLogger_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKLogger_JCalls *calls = MALLOC(sizeof(LDKLogger_JCalls), "LDKLogger_JCalls");
atomic_init(&calls->refcnt, 1);
DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);
- calls->o = (*env)->NewGlobalRef(env, o);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
calls->log_meth = (*env)->GetMethodID(env, c, "log", "(Ljava/lang/String;)V");
- DO_ASSERT(calls->log_meth != NULL);
+ CHECK(calls->log_meth != NULL);
LDKLogger ret = {
.this_arg = (void*) calls,
return (long)res_ptr;
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKLogger_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
- return ((LDKLogger_JCalls*)val)->o;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKLogger_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_LDKCResult_1TxOutAccessErrorZ_1result_1ok (JNIEnv * env, jclass _a, jlong arg) {
return ((LDKCResult_TxOutAccessErrorZ*)arg)->result_ok;
}
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;
+ LDKCResult_TxOutAccessErrorZ *val = (LDKCResult_TxOutAccessErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_TxOutAccessErrorZ*)arg)->contents.err;
+ return (long)val->contents.err;
}
}
typedef struct LDKAccess_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
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) {
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_TxOutAccessErrorZ* ret = (LDKCResult_TxOutAccessErrorZ*)(*env)->CallLongMethod(env, obj, j_calls->get_utxo_meth, genesis_hash_arr, short_channel_id);
LDKCResult_TxOutAccessErrorZ res = *ret;
FREE(ret);
return res;
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKAccess LDKAccess_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKAccess_JCalls *calls = MALLOC(sizeof(LDKAccess_JCalls), "LDKAccess_JCalls");
atomic_init(&calls->refcnt, 1);
DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);
- calls->o = (*env)->NewGlobalRef(env, o);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
calls->get_utxo_meth = (*env)->GetMethodID(env, c, "get_utxo", "([BJ)J");
- DO_ASSERT(calls->get_utxo_meth != NULL);
+ CHECK(calls->get_utxo_meth != NULL);
LDKAccess ret = {
.this_arg = (void*) calls,
return (long)res_ptr;
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKAccess_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
- return ((LDKAccess_JCalls*)val)->o;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKAccess_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Access_1call_1get_1utxo(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray genesis_hash, jlong short_channel_id) {
+ LDKAccess* this_arg_conv = (LDKAccess*)this_arg;
unsigned char genesis_hash_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, genesis_hash) == 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);
+ *ret = (this_arg_conv->get_utxo)(this_arg_conv->this_arg, genesis_hash_ref, short_channel_id);
return (long)ret;
}
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKHTLCOutputInCommitment arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = HTLCOutputInCommitment_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
typedef struct LDKChannelKeys_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID get_per_commitment_point_meth;
jmethodID release_commitment_secret_meth;
jmethodID key_derivation_params_meth;
LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg;
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;
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ jbyteArray jret = (*env)->CallObjectMethod(env, obj, j_calls->get_per_commitment_point_meth, idx);
+ LDKPublicKey ret;
+ CHECK((*env)->GetArrayLength(env, jret) == 33);
+ (*env)->GetByteArrayRegion(env, jret, 0, 33, ret.compressed_form);
+ return ret;
}
LDKThirtyTwoBytes release_commitment_secret_jcall(const void* this_arg, uint64_t idx) {
LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg;
JNIEnv *env;
DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);
- jbyteArray jret = (*env)->CallObjectMethod(env, j_calls->o, j_calls->release_commitment_secret_meth, idx);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ jbyteArray jret = (*env)->CallObjectMethod(env, obj, j_calls->release_commitment_secret_meth, idx);
LDKThirtyTwoBytes ret;
+ CHECK((*env)->GetArrayLength(env, jret) == 32);
(*env)->GetByteArrayRegion(env, jret, 0, 32, ret.data);
return ret;
}
LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKC2Tuple_u64u64Z* ret = (LDKC2Tuple_u64u64Z*)(*env)->CallLongMethod(env, obj, j_calls->key_derivation_params_meth);
LDKC2Tuple_u64u64Z res = *ret;
FREE(ret);
return res;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(*env)->CallLongMethod(env, obj, 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;
LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, obj, j_calls->sign_holder_commitment_meth, holder_commitment_tx);
LDKCResult_SignatureNoneZ res = *ret;
FREE(ret);
return res;
LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_CVec_SignatureZNoneZ* ret = (LDKCResult_CVec_SignatureZNoneZ*)(*env)->CallLongMethod(env, obj, j_calls->sign_holder_commitment_htlc_transactions_meth, holder_commitment_tx);
LDKCResult_CVec_SignatureZNoneZ res = *ret;
FREE(ret);
return res;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, obj, j_calls->sign_justice_transaction_meth, justice_tx_ref, input, amount, per_commitment_key_arr, htlc);
LDKCResult_SignatureNoneZ 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 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);
+ jbyteArray per_commitment_point_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, per_commitment_point_arr, 0, 33, per_commitment_point.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, obj, j_calls->sign_counterparty_htlc_transaction_meth, htlc_tx_ref, input, amount, per_commitment_point_arr, htlc);
LDKCResult_SignatureNoneZ 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 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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, obj, j_calls->sign_closing_transaction_meth, closing_tx_ref);
LDKCResult_SignatureNoneZ res = *ret;
FREE(ret);
return res;
LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)(*env)->CallLongMethod(env, obj, j_calls->sign_channel_announcement_meth, msg);
LDKCResult_SignatureNoneZ res = *ret;
FREE(ret);
return res;
LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, 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) {
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKChannelKeys LDKChannelKeys_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKChannelKeys_JCalls *calls = MALLOC(sizeof(LDKChannelKeys_JCalls), "LDKChannelKeys_JCalls");
atomic_init(&calls->refcnt, 1);
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");
- DO_ASSERT(calls->get_per_commitment_point_meth != NULL);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
+ calls->get_per_commitment_point_meth = (*env)->GetMethodID(env, c, "get_per_commitment_point", "(J)[B");
+ CHECK(calls->get_per_commitment_point_meth != NULL);
calls->release_commitment_secret_meth = (*env)->GetMethodID(env, c, "release_commitment_secret", "(J)[B");
- DO_ASSERT(calls->release_commitment_secret_meth != NULL);
+ CHECK(calls->release_commitment_secret_meth != NULL);
calls->key_derivation_params_meth = (*env)->GetMethodID(env, c, "key_derivation_params", "()J");
- DO_ASSERT(calls->key_derivation_params_meth != NULL);
+ CHECK(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);
+ CHECK(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);
+ CHECK(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);
+ CHECK(calls->sign_holder_commitment_htlc_transactions_meth != NULL);
calls->sign_justice_transaction_meth = (*env)->GetMethodID(env, c, "sign_justice_transaction", "(JJJ[BJ)J");
- 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);
+ CHECK(calls->sign_justice_transaction_meth != NULL);
+ calls->sign_counterparty_htlc_transaction_meth = (*env)->GetMethodID(env, c, "sign_counterparty_htlc_transaction", "(JJJ[BJ)J");
+ CHECK(calls->sign_counterparty_htlc_transaction_meth != NULL);
calls->sign_closing_transaction_meth = (*env)->GetMethodID(env, c, "sign_closing_transaction", "(J)J");
- DO_ASSERT(calls->sign_closing_transaction_meth != NULL);
+ CHECK(calls->sign_closing_transaction_meth != NULL);
calls->sign_channel_announcement_meth = (*env)->GetMethodID(env, c, "sign_channel_announcement", "(J)J");
- DO_ASSERT(calls->sign_channel_announcement_meth != NULL);
+ CHECK(calls->sign_channel_announcement_meth != NULL);
calls->on_accept_meth = (*env)->GetMethodID(env, c, "on_accept", "(JSS)V");
- DO_ASSERT(calls->on_accept_meth != NULL);
+ CHECK(calls->on_accept_meth != NULL);
LDKChannelKeys ret = {
.this_arg = (void*) calls,
return (long)res_ptr;
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
- return ((LDKChannelKeys_JCalls*)val)->o;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKChannelKeys_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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 jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1get_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_arg, jlong idx) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, (this_arg_conv->get_per_commitment_point)(this_arg_conv->this_arg, idx).compressed_form);
+ return arg_arr;
}
-JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1release_1commitment_1secret(JNIEnv * _env, jclass _b, jlong arg, jlong idx) {
- LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
- jbyteArray _arr = (*_env)->NewByteArray(_env, 32);
- (*_env)->SetByteArrayRegion(_env, _arr, 0, 32, (arg_conv->release_commitment_secret)(arg_conv->this_arg, idx).data);
- return _arr;
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1release_1commitment_1secret(JNIEnv * _env, jclass _b, jlong this_arg, jlong idx) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 32);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 32, (this_arg_conv->release_commitment_secret)(this_arg_conv->this_arg, idx).data);
+ return arg_arr;
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKChannelKeys_1call_1key_1derivation_1params(JNIEnv * _env, jclass _b, jlong arg) {
- LDKChannelKeys* arg_conv = (LDKChannelKeys*)arg;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1key_1derivation_1params(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
LDKC2Tuple_u64u64Z* ret = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z");
- *ret = (arg_conv->key_derivation_params)(arg_conv->this_arg);
+ *ret = (this_arg_conv->key_derivation_params)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1sign_1counterparty_1commitment(JNIEnv * _env, jclass _b, jlong this_arg, jint feerate_per_kw, jlong commitment_tx, jlong keys, jlong htlcs) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
LDKTransaction commitment_tx_conv = *(LDKTransaction*)commitment_tx;
FREE((void*)commitment_tx);
LDKPreCalculatedTxCreationKeys keys_conv;
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);
+ *ret = (this_arg_conv->sign_counterparty_commitment)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1sign_1holder_1commitment(JNIEnv * _env, jclass _b, jlong this_arg, jlong holder_commitment_tx) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
LDKHolderCommitmentTransaction holder_commitment_tx_conv;
holder_commitment_tx_conv.inner = (void*)(holder_commitment_tx & (~1));
holder_commitment_tx_conv.is_owned = (holder_commitment_tx & 1) || (holder_commitment_tx == 0);
LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
- *ret = (arg_conv->sign_holder_commitment)(arg_conv->this_arg, &holder_commitment_tx_conv);
+ *ret = (this_arg_conv->sign_holder_commitment)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1sign_1holder_1commitment_1htlc_1transactions(JNIEnv * _env, jclass _b, jlong this_arg, jlong holder_commitment_tx) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
LDKHolderCommitmentTransaction holder_commitment_tx_conv;
holder_commitment_tx_conv.inner = (void*)(holder_commitment_tx & (~1));
holder_commitment_tx_conv.is_owned = (holder_commitment_tx & 1) || (holder_commitment_tx == 0);
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);
+ *ret = (this_arg_conv->sign_holder_commitment_htlc_transactions)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1sign_1justice_1transaction(JNIEnv * _env, jclass _b, jlong this_arg, jlong justice_tx, jlong input, jlong amount, jbyteArray per_commitment_key, jlong htlc) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
LDKTransaction justice_tx_conv = *(LDKTransaction*)justice_tx;
FREE((void*)justice_tx);
unsigned char per_commitment_key_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_key) == 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;
htlc_conv.inner = (void*)(htlc & (~1));
htlc_conv.is_owned = (htlc & 1) || (htlc == 0);
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);
+ *ret = (this_arg_conv->sign_justice_transaction)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1sign_1counterparty_1htlc_1transaction(JNIEnv * _env, jclass _b, jlong this_arg, jlong htlc_tx, jlong input, jlong amount, jbyteArray per_commitment_point, jlong htlc) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_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);
+ LDKPublicKey per_commitment_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, per_commitment_point, 0, 33, per_commitment_point_ref.compressed_form);
LDKHTLCOutputInCommitment htlc_conv;
htlc_conv.inner = (void*)(htlc & (~1));
htlc_conv.is_owned = (htlc & 1) || (htlc == 0);
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);
+ *ret = (this_arg_conv->sign_counterparty_htlc_transaction)(this_arg_conv->this_arg, htlc_tx_conv, input, amount, per_commitment_point_ref, &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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1sign_1closing_1transaction(JNIEnv * _env, jclass _b, jlong this_arg, jlong closing_tx) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_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);
+ *ret = (this_arg_conv->sign_closing_transaction)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1sign_1channel_1announcement(JNIEnv * _env, jclass _b, jlong this_arg, jlong msg) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
LDKUnsignedChannelAnnouncement msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
- *ret = (arg_conv->sign_channel_announcement)(arg_conv->this_arg, &msg_conv);
+ *ret = (this_arg_conv->sign_channel_announcement)(this_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;
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelKeys_1call_1on_1accept(JNIEnv * _env, jclass _b, jlong this_arg, jlong channel_points, jshort counterparty_selected_contest_delay, jshort holder_selected_contest_delay) {
+ LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg;
LDKChannelPublicKeys channel_points_conv;
channel_points_conv.inner = (void*)(channel_points & (~1));
channel_points_conv.is_owned = (channel_points & 1) || (channel_points == 0);
- return (arg_conv->on_accept)(arg_conv->this_arg, &channel_points_conv, counterparty_selected_contest_delay, holder_selected_contest_delay);
+ return (this_arg_conv->on_accept)(this_arg_conv->this_arg, &channel_points_conv, counterparty_selected_contest_delay, holder_selected_contest_delay);
}
JNIEXPORT jlongArray JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1MonitorEvent_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKMonitorEvent arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ // Warning: we may need a move here but can't clone!
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
typedef struct LDKWatch_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID watch_channel_meth;
jmethodID update_channel_meth;
jmethodID release_pending_monitor_events_meth;
JNIEnv *env;
DO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);
LDKOutPoint funding_txo_var = funding_txo;
- DO_ASSERT((((long)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long funding_txo_ref;
if (funding_txo_var.is_owned) {
funding_txo_ref = (long)funding_txo_var.inner | 1;
funding_txo_ref = (long)&funding_txo_var;
}
LDKChannelMonitor monitor_var = monitor;
- DO_ASSERT((((long)monitor_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&monitor_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)monitor_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&monitor_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long monitor_ref;
if (monitor_var.is_owned) {
monitor_ref = (long)monitor_var.inner | 1;
} else {
monitor_ref = (long)&monitor_var;
}
- LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->watch_channel_meth, funding_txo_ref, monitor_ref);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*env)->CallLongMethod(env, obj, j_calls->watch_channel_meth, funding_txo_ref, monitor_ref);
LDKCResult_NoneChannelMonitorUpdateErrZ 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);
LDKOutPoint funding_txo_var = funding_txo;
- DO_ASSERT((((long)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long funding_txo_ref;
if (funding_txo_var.is_owned) {
funding_txo_ref = (long)funding_txo_var.inner | 1;
funding_txo_ref = (long)&funding_txo_var;
}
LDKChannelMonitorUpdate update_var = update;
- DO_ASSERT((((long)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long update_ref;
if (update_var.is_owned) {
update_ref = (long)update_var.inner | 1;
} else {
update_ref = (long)&update_var;
}
- LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*env)->CallLongMethod(env, j_calls->o, j_calls->update_channel_meth, funding_txo_ref, update_ref);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(*env)->CallLongMethod(env, obj, j_calls->update_channel_meth, funding_txo_ref, update_ref);
LDKCResult_NoneChannelMonitorUpdateErrZ res = *ret;
FREE(ret);
return res;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCVec_MonitorEventZ* ret = (LDKCVec_MonitorEventZ*)(*env)->CallLongMethod(env, obj, j_calls->release_pending_monitor_events_meth);
LDKCVec_MonitorEventZ res = *ret;
FREE(ret);
return res;
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKWatch LDKWatch_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(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->o = (*env)->NewWeakGlobalRef(env, o);
calls->watch_channel_meth = (*env)->GetMethodID(env, c, "watch_channel", "(JJ)J");
- DO_ASSERT(calls->watch_channel_meth != NULL);
+ CHECK(calls->watch_channel_meth != NULL);
calls->update_channel_meth = (*env)->GetMethodID(env, c, "update_channel", "(JJ)J");
- DO_ASSERT(calls->update_channel_meth != NULL);
+ CHECK(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);
+ CHECK(calls->release_pending_monitor_events_meth != NULL);
LDKWatch ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKWatch_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Watch_1call_1watch_1channel(JNIEnv * _env, jclass _b, jlong this_arg, jlong funding_txo, jlong monitor) {
+ LDKWatch* this_arg_conv = (LDKWatch*)this_arg;
LDKOutPoint funding_txo_conv;
funding_txo_conv.inner = (void*)(funding_txo & (~1));
funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+ if (funding_txo_conv.inner != NULL)
+ funding_txo_conv = OutPoint_clone(&funding_txo_conv);
LDKChannelMonitor monitor_conv;
monitor_conv.inner = (void*)(monitor & (~1));
monitor_conv.is_owned = (monitor & 1) || (monitor == 0);
+ // Warning: we may need a move here but can't clone!
LDKCResult_NoneChannelMonitorUpdateErrZ* ret = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
- *ret = (arg_conv->watch_channel)(arg_conv->this_arg, funding_txo_conv, monitor_conv);
+ *ret = (this_arg_conv->watch_channel)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Watch_1call_1update_1channel(JNIEnv * _env, jclass _b, jlong this_arg, jlong funding_txo, jlong update) {
+ LDKWatch* this_arg_conv = (LDKWatch*)this_arg;
LDKOutPoint funding_txo_conv;
funding_txo_conv.inner = (void*)(funding_txo & (~1));
funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+ if (funding_txo_conv.inner != NULL)
+ funding_txo_conv = OutPoint_clone(&funding_txo_conv);
LDKChannelMonitorUpdate update_conv;
update_conv.inner = (void*)(update & (~1));
update_conv.is_owned = (update & 1) || (update == 0);
+ if (update_conv.inner != NULL)
+ update_conv = ChannelMonitorUpdate_clone(&update_conv);
LDKCResult_NoneChannelMonitorUpdateErrZ* ret = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
- *ret = (arg_conv->update_channel)(arg_conv->this_arg, funding_txo_conv, update_conv);
+ *ret = (this_arg_conv->update_channel)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Watch_1call_1release_1pending_1monitor_1events(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKWatch* this_arg_conv = (LDKWatch*)this_arg;
LDKCVec_MonitorEventZ* ret = MALLOC(sizeof(LDKCVec_MonitorEventZ), "LDKCVec_MonitorEventZ");
- *ret = (arg_conv->release_pending_monitor_events)(arg_conv->this_arg);
+ *ret = (this_arg_conv->release_pending_monitor_events)(this_arg_conv->this_arg);
return (long)ret;
}
typedef struct LDKFilter_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID register_tx_meth;
jmethodID register_output_meth;
} LDKFilter_JCalls;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, 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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, 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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKFilter LDKFilter_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(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->o = (*env)->NewWeakGlobalRef(env, o);
calls->register_tx_meth = (*env)->GetMethodID(env, c, "register_tx", "([BJ)V");
- DO_ASSERT(calls->register_tx_meth != NULL);
+ CHECK(calls->register_tx_meth != NULL);
calls->register_output_meth = (*env)->GetMethodID(env, c, "register_output", "(JJ)V");
- DO_ASSERT(calls->register_output_meth != NULL);
+ CHECK(calls->register_output_meth != NULL);
LDKFilter ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKFilter_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Filter_1call_1register_1tx(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray txid, jlong script_pubkey) {
+ LDKFilter* this_arg_conv = (LDKFilter*)this_arg;
unsigned char txid_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, txid) == 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);
+ return (this_arg_conv->register_tx)(this_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;
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Filter_1call_1register_1output(JNIEnv * _env, jclass _b, jlong this_arg, jlong outpoint, jlong script_pubkey) {
+ LDKFilter* this_arg_conv = (LDKFilter*)this_arg;
LDKOutPoint outpoint_conv;
outpoint_conv.inner = (void*)(outpoint & (~1));
outpoint_conv.is_owned = (outpoint & 1) || (outpoint == 0);
LDKu8slice script_pubkey_conv = *(LDKu8slice*)script_pubkey;
- return (arg_conv->register_output)(arg_conv->this_arg, &outpoint_conv, script_pubkey_conv);
+ return (this_arg_conv->register_output)(this_arg_conv->this_arg, &outpoint_conv, script_pubkey_conv);
}
typedef struct LDKBroadcasterInterface_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID broadcast_transaction_meth;
} LDKBroadcasterInterface_JCalls;
void broadcast_transaction_jcall(const void* this_arg, LDKTransaction tx) {
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, 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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKBroadcasterInterface LDKBroadcasterInterface_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(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->o = (*env)->NewWeakGlobalRef(env, o);
calls->broadcast_transaction_meth = (*env)->GetMethodID(env, c, "broadcast_transaction", "(J)V");
- DO_ASSERT(calls->broadcast_transaction_meth != NULL);
+ CHECK(calls->broadcast_transaction_meth != NULL);
LDKBroadcasterInterface ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKBroadcasterInterface_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_BroadcasterInterface_1call_1broadcast_1transaction(JNIEnv * _env, jclass _b, jlong this_arg, jlong tx) {
+ LDKBroadcasterInterface* this_arg_conv = (LDKBroadcasterInterface*)this_arg;
LDKTransaction tx_conv = *(LDKTransaction*)tx;
FREE((void*)tx);
- return (arg_conv->broadcast_transaction)(arg_conv->this_arg, tx_conv);
+ return (this_arg_conv->broadcast_transaction)(this_arg_conv->this_arg, tx_conv);
}
typedef struct LDKFeeEstimator_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak 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) {
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallIntMethod(env, obj, 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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKFeeEstimator LDKFeeEstimator_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(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->o = (*env)->NewWeakGlobalRef(env, o);
calls->get_est_sat_per_1000_weight_meth = (*env)->GetMethodID(env, c, "get_est_sat_per_1000_weight", "(Lorg/ldk/enums/LDKConfirmationTarget;)I");
- DO_ASSERT(calls->get_est_sat_per_1000_weight_meth != NULL);
+ CHECK(calls->get_est_sat_per_1000_weight_meth != NULL);
LDKFeeEstimator ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKFeeEstimator_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_FeeEstimator_1call_1get_1est_1sat_1per_11000_1weight(JNIEnv * _env, jclass _b, jlong this_arg, jclass confirmation_target) {
+ LDKFeeEstimator* this_arg_conv = (LDKFeeEstimator*)this_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);
+ return (this_arg_conv->get_est_sat_per_1000_weight)(this_arg_conv->this_arg, confirmation_target_conv);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1C2TupleTempl_1usize_1_1Transaction_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
typedef struct LDKKeysInterface_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID get_node_secret_meth;
jmethodID get_destination_script_meth;
jmethodID get_shutdown_pubkey_meth;
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;
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ jbyteArray jret = (*env)->CallObjectMethod(env, obj, j_calls->get_node_secret_meth);
+ LDKSecretKey ret;
+ CHECK((*env)->GetArrayLength(env, jret) == 32);
+ (*env)->GetByteArrayRegion(env, jret, 0, 32, ret.bytes);
+ return ret;
}
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCVec_u8Z* ret = (LDKCVec_u8Z*)(*env)->CallLongMethod(env, obj, j_calls->get_destination_script_meth);
LDKCVec_u8Z res = *ret;
FREE(ret);
return res;
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);
- LDKPublicKey* ret = (LDKPublicKey*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_shutdown_pubkey_meth);
- LDKPublicKey res = *ret;
- FREE(ret);
- return res;
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ jbyteArray jret = (*env)->CallObjectMethod(env, obj, j_calls->get_shutdown_pubkey_meth);
+ LDKPublicKey ret;
+ CHECK((*env)->GetArrayLength(env, jret) == 33);
+ (*env)->GetByteArrayRegion(env, jret, 0, 33, ret.compressed_form);
+ return ret;
}
LDKChannelKeys get_channel_keys_jcall(const void* this_arg, bool inbound, uint64_t channel_value_satoshis) {
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);
- LDKChannelKeys* ret = (LDKChannelKeys*)(*env)->CallLongMethod(env, j_calls->o, j_calls->get_channel_keys_meth, inbound, channel_value_satoshis);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKChannelKeys* ret = (LDKChannelKeys*)(*env)->CallLongMethod(env, obj, j_calls->get_channel_keys_meth, inbound, channel_value_satoshis);
LDKChannelKeys res = *ret;
FREE(ret);
return res;
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);
- jbyteArray jret = (*env)->CallObjectMethod(env, j_calls->o, j_calls->get_secure_random_bytes_meth);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ jbyteArray jret = (*env)->CallObjectMethod(env, obj, j_calls->get_secure_random_bytes_meth);
LDKThirtyTwoBytes ret;
+ CHECK((*env)->GetArrayLength(env, jret) == 32);
(*env)->GetByteArrayRegion(env, jret, 0, 32, ret.data);
return ret;
}
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKKeysInterface LDKKeysInterface_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKKeysInterface_JCalls *calls = MALLOC(sizeof(LDKKeysInterface_JCalls), "LDKKeysInterface_JCalls");
atomic_init(&calls->refcnt, 1);
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");
- DO_ASSERT(calls->get_node_secret_meth != NULL);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
+ calls->get_node_secret_meth = (*env)->GetMethodID(env, c, "get_node_secret", "()[B");
+ CHECK(calls->get_node_secret_meth != NULL);
calls->get_destination_script_meth = (*env)->GetMethodID(env, c, "get_destination_script", "()J");
- DO_ASSERT(calls->get_destination_script_meth != NULL);
- calls->get_shutdown_pubkey_meth = (*env)->GetMethodID(env, c, "get_shutdown_pubkey", "()J");
- DO_ASSERT(calls->get_shutdown_pubkey_meth != NULL);
+ CHECK(calls->get_destination_script_meth != NULL);
+ calls->get_shutdown_pubkey_meth = (*env)->GetMethodID(env, c, "get_shutdown_pubkey", "()[B");
+ CHECK(calls->get_shutdown_pubkey_meth != NULL);
calls->get_channel_keys_meth = (*env)->GetMethodID(env, c, "get_channel_keys", "(ZJ)J");
- DO_ASSERT(calls->get_channel_keys_meth != NULL);
+ CHECK(calls->get_channel_keys_meth != NULL);
calls->get_secure_random_bytes_meth = (*env)->GetMethodID(env, c, "get_secure_random_bytes", "()[B");
- DO_ASSERT(calls->get_secure_random_bytes_meth != NULL);
+ CHECK(calls->get_secure_random_bytes_meth != NULL);
LDKKeysInterface ret = {
.this_arg = (void*) calls,
return (long)res_ptr;
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1get_1obj_1from_1jcalls (JNIEnv * env, jclass _a, jlong val) {
- return ((LDKKeysInterface_JCalls*)val)->o;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKKeysInterface_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1node_1secret(JNIEnv * _env, jclass _b, jlong arg) {
- LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
- LDKSecretKey* ret = MALLOC(sizeof(LDKSecretKey), "LDKSecretKey");
- *ret = (arg_conv->get_node_secret)(arg_conv->this_arg);
- return (long)ret;
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_KeysInterface_1call_1get_1node_1secret(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 32);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 32, (this_arg_conv->get_node_secret)(this_arg_conv->this_arg).bytes);
+ return arg_arr;
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1destination_1script(JNIEnv * _env, jclass _b, jlong arg) {
- LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysInterface_1call_1get_1destination_1script(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg;
LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z");
- *ret = (arg_conv->get_destination_script)(arg_conv->this_arg);
+ *ret = (this_arg_conv->get_destination_script)(this_arg_conv->this_arg);
return (long)ret;
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1shutdown_1pubkey(JNIEnv * _env, jclass _b, jlong arg) {
- LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = (arg_conv->get_shutdown_pubkey)(arg_conv->this_arg);
- return (long)ret;
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_KeysInterface_1call_1get_1shutdown_1pubkey(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, (this_arg_conv->get_shutdown_pubkey)(this_arg_conv->this_arg).compressed_form);
+ return arg_arr;
}
-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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysInterface_1call_1get_1channel_1keys(JNIEnv * _env, jclass _b, jlong this_arg, jboolean inbound, jlong channel_value_satoshis) {
+ LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg;
LDKChannelKeys* ret = MALLOC(sizeof(LDKChannelKeys), "LDKChannelKeys");
- *ret = (arg_conv->get_channel_keys)(arg_conv->this_arg, inbound, channel_value_satoshis);
+ *ret = (this_arg_conv->get_channel_keys)(this_arg_conv->this_arg, inbound, channel_value_satoshis);
return (long)ret;
}
-JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_LDKKeysInterface_1call_1get_1secure_1random_1bytes(JNIEnv * _env, jclass _b, jlong arg) {
- LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg;
- jbyteArray _arr = (*_env)->NewByteArray(_env, 32);
- (*_env)->SetByteArrayRegion(_env, _arr, 0, 32, (arg_conv->get_secure_random_bytes)(arg_conv->this_arg).data);
- return _arr;
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_KeysInterface_1call_1get_1secure_1random_1bytes(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 32);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 32, (this_arg_conv->get_secure_random_bytes)(this_arg_conv->this_arg).data);
+ return arg_arr;
}
JNIEXPORT jlongArray JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1ChannelDetails_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKChannelDetails arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = ChannelDetails_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_00024LDKNetAddress_init (JNIEnv * env, jclass _a) {
LDKNetAddress_IPv4_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKNetAddress$IPv4;"));
- DO_ASSERT(LDKNetAddress_IPv4_class != NULL);
+ CHECK(LDKNetAddress_IPv4_class != NULL);
LDKNetAddress_IPv4_meth = (*env)->GetMethodID(env, LDKNetAddress_IPv4_class, "<init>", "(JS)V");
- DO_ASSERT(LDKNetAddress_IPv4_meth != NULL);
+ CHECK(LDKNetAddress_IPv4_meth != NULL);
LDKNetAddress_IPv6_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKNetAddress$IPv6;"));
- DO_ASSERT(LDKNetAddress_IPv6_class != NULL);
+ CHECK(LDKNetAddress_IPv6_class != NULL);
LDKNetAddress_IPv6_meth = (*env)->GetMethodID(env, LDKNetAddress_IPv6_class, "<init>", "(JS)V");
- DO_ASSERT(LDKNetAddress_IPv6_meth != NULL);
+ CHECK(LDKNetAddress_IPv6_meth != NULL);
LDKNetAddress_OnionV2_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKNetAddress$OnionV2;"));
- DO_ASSERT(LDKNetAddress_OnionV2_class != NULL);
+ CHECK(LDKNetAddress_OnionV2_class != NULL);
LDKNetAddress_OnionV2_meth = (*env)->GetMethodID(env, LDKNetAddress_OnionV2_class, "<init>", "(JS)V");
- DO_ASSERT(LDKNetAddress_OnionV2_meth != NULL);
+ CHECK(LDKNetAddress_OnionV2_meth != NULL);
LDKNetAddress_OnionV3_class =
(*env)->NewGlobalRef(env, (*env)->FindClass(env, "Lorg/ldk/impl/bindings$LDKNetAddress$OnionV3;"));
- DO_ASSERT(LDKNetAddress_OnionV3_class != NULL);
+ CHECK(LDKNetAddress_OnionV3_class != NULL);
LDKNetAddress_OnionV3_meth = (*env)->GetMethodID(env, LDKNetAddress_OnionV3_class, "<init>", "([BSBS)V");
- DO_ASSERT(LDKNetAddress_OnionV3_meth != NULL);
+ CHECK(LDKNetAddress_OnionV3_meth != NULL);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKNetAddress_1ref_1from_1ptr (JNIEnv * env, jclass _c, jlong ptr) {
LDKNetAddress *obj = (LDKNetAddress*)ptr;
typedef struct LDKChannelMessageHandler_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
LDKMessageSendEventsProvider_JCalls* MessageSendEventsProvider;
jmethodID handle_open_channel_meth;
jmethodID handle_accept_channel_meth;
LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
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;
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
LDKInitFeatures their_features_var = their_features;
- DO_ASSERT((((long)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long their_features_ref;
if (their_features_var.is_owned) {
their_features_ref = (long)their_features_var.inner | 1;
} else {
their_features_ref = (long)&their_features_var;
}
- return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_open_channel_meth, their_node_id_ref, their_features_ref, msg);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_open_channel_meth, their_node_id_arr, 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;
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;
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
LDKInitFeatures their_features_var = their_features;
- DO_ASSERT((((long)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
- DO_ASSERT((((long)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+ CHECK((((long)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+ CHECK((((long)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
long their_features_ref;
if (their_features_var.is_owned) {
their_features_ref = (long)their_features_var.inner | 1;
} else {
their_features_ref = (long)&their_features_var;
}
- return (*env)->CallVoidMethod(env, j_calls->o, j_calls->handle_accept_channel_meth, their_node_id_ref, their_features_ref, msg);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_accept_channel_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_funding_created_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_funding_signed_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_funding_locked_meth, their_node_id_arr, msg);
}
void handle_shutdown_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKShutdown *msg) {
LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_shutdown_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_closing_signed_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_update_add_htlc_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_update_fulfill_htlc_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_update_fail_htlc_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_update_fail_malformed_htlc_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_commitment_signed_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_revoke_and_ack_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_update_fee_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_announcement_signatures_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->peer_disconnected_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->peer_connected_meth, their_node_id_arr, 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;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_channel_reestablish_meth, their_node_id_arr, msg);
}
void handle_error_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKErrorMessage *msg) {
LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
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);
+ jbyteArray their_node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, their_node_id_arr, 0, 33, their_node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->handle_error_meth, their_node_id_arr, 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) {
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKChannelMessageHandler LDKChannelMessageHandler_init (JNIEnv * env, jclass _a, jobject o, jobject MessageSendEventsProvider) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKChannelMessageHandler_JCalls *calls = MALLOC(sizeof(LDKChannelMessageHandler_JCalls), "LDKChannelMessageHandler_JCalls");
atomic_init(&calls->refcnt, 1);
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");
- DO_ASSERT(calls->handle_open_channel_meth != NULL);
- calls->handle_accept_channel_meth = (*env)->GetMethodID(env, c, "handle_accept_channel", "(JJJ)V");
- DO_ASSERT(calls->handle_accept_channel_meth != NULL);
- calls->handle_funding_created_meth = (*env)->GetMethodID(env, c, "handle_funding_created", "(JJ)V");
- DO_ASSERT(calls->handle_funding_created_meth != NULL);
- calls->handle_funding_signed_meth = (*env)->GetMethodID(env, c, "handle_funding_signed", "(JJ)V");
- DO_ASSERT(calls->handle_funding_signed_meth != NULL);
- calls->handle_funding_locked_meth = (*env)->GetMethodID(env, c, "handle_funding_locked", "(JJ)V");
- DO_ASSERT(calls->handle_funding_locked_meth != NULL);
- calls->handle_shutdown_meth = (*env)->GetMethodID(env, c, "handle_shutdown", "(JJ)V");
- DO_ASSERT(calls->handle_shutdown_meth != NULL);
- calls->handle_closing_signed_meth = (*env)->GetMethodID(env, c, "handle_closing_signed", "(JJ)V");
- DO_ASSERT(calls->handle_closing_signed_meth != NULL);
- calls->handle_update_add_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_add_htlc", "(JJ)V");
- 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");
- 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");
- 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");
- DO_ASSERT(calls->handle_update_fail_malformed_htlc_meth != NULL);
- calls->handle_commitment_signed_meth = (*env)->GetMethodID(env, c, "handle_commitment_signed", "(JJ)V");
- DO_ASSERT(calls->handle_commitment_signed_meth != NULL);
- calls->handle_revoke_and_ack_meth = (*env)->GetMethodID(env, c, "handle_revoke_and_ack", "(JJ)V");
- DO_ASSERT(calls->handle_revoke_and_ack_meth != NULL);
- calls->handle_update_fee_meth = (*env)->GetMethodID(env, c, "handle_update_fee", "(JJ)V");
- DO_ASSERT(calls->handle_update_fee_meth != NULL);
- calls->handle_announcement_signatures_meth = (*env)->GetMethodID(env, c, "handle_announcement_signatures", "(JJ)V");
- DO_ASSERT(calls->handle_announcement_signatures_meth != NULL);
- calls->peer_disconnected_meth = (*env)->GetMethodID(env, c, "peer_disconnected", "(JZ)V");
- DO_ASSERT(calls->peer_disconnected_meth != NULL);
- calls->peer_connected_meth = (*env)->GetMethodID(env, c, "peer_connected", "(JJ)V");
- DO_ASSERT(calls->peer_connected_meth != NULL);
- calls->handle_channel_reestablish_meth = (*env)->GetMethodID(env, c, "handle_channel_reestablish", "(JJ)V");
- DO_ASSERT(calls->handle_channel_reestablish_meth != NULL);
- calls->handle_error_meth = (*env)->GetMethodID(env, c, "handle_error", "(JJ)V");
- DO_ASSERT(calls->handle_error_meth != NULL);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
+ calls->handle_open_channel_meth = (*env)->GetMethodID(env, c, "handle_open_channel", "([BJJ)V");
+ CHECK(calls->handle_open_channel_meth != NULL);
+ calls->handle_accept_channel_meth = (*env)->GetMethodID(env, c, "handle_accept_channel", "([BJJ)V");
+ CHECK(calls->handle_accept_channel_meth != NULL);
+ calls->handle_funding_created_meth = (*env)->GetMethodID(env, c, "handle_funding_created", "([BJ)V");
+ CHECK(calls->handle_funding_created_meth != NULL);
+ calls->handle_funding_signed_meth = (*env)->GetMethodID(env, c, "handle_funding_signed", "([BJ)V");
+ CHECK(calls->handle_funding_signed_meth != NULL);
+ calls->handle_funding_locked_meth = (*env)->GetMethodID(env, c, "handle_funding_locked", "([BJ)V");
+ CHECK(calls->handle_funding_locked_meth != NULL);
+ calls->handle_shutdown_meth = (*env)->GetMethodID(env, c, "handle_shutdown", "([BJ)V");
+ CHECK(calls->handle_shutdown_meth != NULL);
+ calls->handle_closing_signed_meth = (*env)->GetMethodID(env, c, "handle_closing_signed", "([BJ)V");
+ CHECK(calls->handle_closing_signed_meth != NULL);
+ calls->handle_update_add_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_add_htlc", "([BJ)V");
+ CHECK(calls->handle_update_add_htlc_meth != NULL);
+ calls->handle_update_fulfill_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_fulfill_htlc", "([BJ)V");
+ CHECK(calls->handle_update_fulfill_htlc_meth != NULL);
+ calls->handle_update_fail_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_fail_htlc", "([BJ)V");
+ CHECK(calls->handle_update_fail_htlc_meth != NULL);
+ calls->handle_update_fail_malformed_htlc_meth = (*env)->GetMethodID(env, c, "handle_update_fail_malformed_htlc", "([BJ)V");
+ CHECK(calls->handle_update_fail_malformed_htlc_meth != NULL);
+ calls->handle_commitment_signed_meth = (*env)->GetMethodID(env, c, "handle_commitment_signed", "([BJ)V");
+ CHECK(calls->handle_commitment_signed_meth != NULL);
+ calls->handle_revoke_and_ack_meth = (*env)->GetMethodID(env, c, "handle_revoke_and_ack", "([BJ)V");
+ CHECK(calls->handle_revoke_and_ack_meth != NULL);
+ calls->handle_update_fee_meth = (*env)->GetMethodID(env, c, "handle_update_fee", "([BJ)V");
+ CHECK(calls->handle_update_fee_meth != NULL);
+ calls->handle_announcement_signatures_meth = (*env)->GetMethodID(env, c, "handle_announcement_signatures", "([BJ)V");
+ CHECK(calls->handle_announcement_signatures_meth != NULL);
+ calls->peer_disconnected_meth = (*env)->GetMethodID(env, c, "peer_disconnected", "([BZ)V");
+ CHECK(calls->peer_disconnected_meth != NULL);
+ calls->peer_connected_meth = (*env)->GetMethodID(env, c, "peer_connected", "([BJ)V");
+ CHECK(calls->peer_connected_meth != NULL);
+ calls->handle_channel_reestablish_meth = (*env)->GetMethodID(env, c, "handle_channel_reestablish", "([BJ)V");
+ CHECK(calls->handle_channel_reestablish_meth != NULL);
+ calls->handle_error_meth = (*env)->GetMethodID(env, c, "handle_error", "([BJ)V");
+ CHECK(calls->handle_error_meth != NULL);
LDKChannelMessageHandler ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKChannelMessageHandler_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1open_1channel(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong their_features, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKInitFeatures their_features_conv;
their_features_conv.inner = (void*)(their_features & (~1));
their_features_conv.is_owned = (their_features & 1) || (their_features == 0);
+ // Warning: we may need a move here but can't clone!
LDKOpenChannel msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_open_channel)(arg_conv->this_arg, their_node_id_conv, their_features_conv, &msg_conv);
+ return (this_arg_conv->handle_open_channel)(this_arg_conv->this_arg, their_node_id_ref, 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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1accept_1channel(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong their_features, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKInitFeatures their_features_conv;
their_features_conv.inner = (void*)(their_features & (~1));
their_features_conv.is_owned = (their_features & 1) || (their_features == 0);
+ // Warning: we may need a move here but can't clone!
LDKAcceptChannel msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_accept_channel)(arg_conv->this_arg, their_node_id_conv, their_features_conv, &msg_conv);
+ return (this_arg_conv->handle_accept_channel)(this_arg_conv->this_arg, their_node_id_ref, 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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1funding_1created(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKFundingCreated msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_funding_created)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_funding_created)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1funding_1signed(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKFundingSigned msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_funding_signed)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_funding_signed)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1funding_1locked(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKFundingLocked msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_funding_locked)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_funding_locked)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1shutdown(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKShutdown msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_shutdown)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_shutdown)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1closing_1signed(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKClosingSigned msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_closing_signed)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_closing_signed)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1update_1add_1htlc(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKUpdateAddHTLC msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_update_add_htlc)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_update_add_htlc)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1update_1fulfill_1htlc(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKUpdateFulfillHTLC msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_update_fulfill_htlc)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_update_fulfill_htlc)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1update_1fail_1htlc(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKUpdateFailHTLC msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_update_fail_htlc)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_update_fail_htlc)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1update_1fail_1malformed_1htlc(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKUpdateFailMalformedHTLC msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_update_fail_malformed_htlc)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_update_fail_malformed_htlc)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1commitment_1signed(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKCommitmentSigned msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_commitment_signed)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_commitment_signed)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1revoke_1and_1ack(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKRevokeAndACK msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_revoke_and_ack)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_revoke_and_ack)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1update_1fee(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKUpdateFee msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_update_fee)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_update_fee)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1announcement_1signatures(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKAnnouncementSignatures msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_announcement_signatures)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_announcement_signatures)(this_arg_conv->this_arg, their_node_id_ref, &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_ChannelMessageHandler_1call_1peer_1disconnected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jboolean no_connection_possible) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
+ return (this_arg_conv->peer_disconnected)(this_arg_conv->this_arg, their_node_id_ref, 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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1peer_1connected(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKInit msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->peer_connected)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->peer_connected)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1channel_1reestablish(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKChannelReestablish msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_channel_reestablish)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_channel_reestablish)(this_arg_conv->this_arg, their_node_id_ref, &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);
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMessageHandler_1call_1handle_1error(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong msg) {
+ LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg;
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKErrorMessage msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
- return (arg_conv->handle_error)(arg_conv->this_arg, their_node_id_conv, &msg_conv);
+ return (this_arg_conv->handle_error)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
}
JNIEXPORT jlongArray JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1ChannelMonitor_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKChannelMonitor arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ // Warning: we may need a move here but can't clone!
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKUpdateAddHTLC arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = UpdateAddHTLC_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKUpdateFulfillHTLC arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = UpdateFulfillHTLC_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKUpdateFailHTLC arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = UpdateFailHTLC_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKUpdateFailMalformedHTLC arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = UpdateFailMalformedHTLC_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
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;
+ LDKCResult_boolLightningErrorZ *val = (LDKCResult_boolLightningErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_boolLightningErrorZ*)arg)->contents.err;
+ return (long)(val->contents.err->inner) | (val->contents.err->is_owned ? 1 : 0);
}
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1C3TupleTempl_1ChannelAnnouncement_1_1ChannelUpdate_1_1ChannelUpdate_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKNodeAnnouncement arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = NodeAnnouncement_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
typedef struct LDKRoutingMessageHandler_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID handle_node_announcement_meth;
jmethodID handle_channel_announcement_meth;
jmethodID handle_channel_update_meth;
LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*env)->CallLongMethod(env, obj, j_calls->handle_node_announcement_meth, msg);
LDKCResult_boolLightningErrorZ res = *ret;
FREE(ret);
return res;
LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*env)->CallLongMethod(env, obj, j_calls->handle_channel_announcement_meth, msg);
LDKCResult_boolLightningErrorZ res = *ret;
FREE(ret);
return res;
LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)(*env)->CallLongMethod(env, obj, j_calls->handle_channel_update_meth, msg);
LDKCResult_boolLightningErrorZ res = *ret;
FREE(ret);
return res;
LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, 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;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ* ret = (LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ*)(*env)->CallLongMethod(env, obj, j_calls->get_next_channel_announcements_meth, starting_point, batch_amount);
LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ res = *ret;
FREE(ret);
return res;
LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
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);
+ jbyteArray starting_point_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, starting_point_arr, 0, 33, starting_point.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ LDKCVec_NodeAnnouncementZ* ret = (LDKCVec_NodeAnnouncementZ*)(*env)->CallLongMethod(env, obj, j_calls->get_next_node_announcements_meth, starting_point_arr, batch_amount);
LDKCVec_NodeAnnouncementZ res = *ret;
FREE(ret);
return res;
LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
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);
+ jbyteArray node_id_arr = (*env)->NewByteArray(env, 33);
+ (*env)->SetByteArrayRegion(env, node_id_arr, 0, 33, node_id.compressed_form);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallBooleanMethod(env, obj, j_calls->should_request_full_sync_meth, node_id_arr);
}
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) {
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKRoutingMessageHandler LDKRoutingMessageHandler_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKRoutingMessageHandler_JCalls *calls = MALLOC(sizeof(LDKRoutingMessageHandler_JCalls), "LDKRoutingMessageHandler_JCalls");
atomic_init(&calls->refcnt, 1);
DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);
- calls->o = (*env)->NewGlobalRef(env, o);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
calls->handle_node_announcement_meth = (*env)->GetMethodID(env, c, "handle_node_announcement", "(J)J");
- DO_ASSERT(calls->handle_node_announcement_meth != NULL);
+ CHECK(calls->handle_node_announcement_meth != NULL);
calls->handle_channel_announcement_meth = (*env)->GetMethodID(env, c, "handle_channel_announcement", "(J)J");
- DO_ASSERT(calls->handle_channel_announcement_meth != NULL);
+ CHECK(calls->handle_channel_announcement_meth != NULL);
calls->handle_channel_update_meth = (*env)->GetMethodID(env, c, "handle_channel_update", "(J)J");
- DO_ASSERT(calls->handle_channel_update_meth != NULL);
+ CHECK(calls->handle_channel_update_meth != NULL);
calls->handle_htlc_fail_channel_update_meth = (*env)->GetMethodID(env, c, "handle_htlc_fail_channel_update", "(J)V");
- DO_ASSERT(calls->handle_htlc_fail_channel_update_meth != NULL);
+ CHECK(calls->handle_htlc_fail_channel_update_meth != NULL);
calls->get_next_channel_announcements_meth = (*env)->GetMethodID(env, c, "get_next_channel_announcements", "(JB)J");
- 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");
- 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");
- DO_ASSERT(calls->should_request_full_sync_meth != NULL);
+ CHECK(calls->get_next_channel_announcements_meth != NULL);
+ calls->get_next_node_announcements_meth = (*env)->GetMethodID(env, c, "get_next_node_announcements", "([BB)J");
+ CHECK(calls->get_next_node_announcements_meth != NULL);
+ calls->should_request_full_sync_meth = (*env)->GetMethodID(env, c, "should_request_full_sync", "([B)Z");
+ CHECK(calls->should_request_full_sync_meth != NULL);
LDKRoutingMessageHandler ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKRoutingMessageHandler_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingMessageHandler_1call_1handle_1node_1announcement(JNIEnv * _env, jclass _b, jlong this_arg, jlong msg) {
+ LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg;
LDKNodeAnnouncement msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
LDKCResult_boolLightningErrorZ* ret = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
- *ret = (arg_conv->handle_node_announcement)(arg_conv->this_arg, &msg_conv);
+ *ret = (this_arg_conv->handle_node_announcement)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingMessageHandler_1call_1handle_1channel_1announcement(JNIEnv * _env, jclass _b, jlong this_arg, jlong msg) {
+ LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg;
LDKChannelAnnouncement msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
LDKCResult_boolLightningErrorZ* ret = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
- *ret = (arg_conv->handle_channel_announcement)(arg_conv->this_arg, &msg_conv);
+ *ret = (this_arg_conv->handle_channel_announcement)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingMessageHandler_1call_1handle_1channel_1update(JNIEnv * _env, jclass _b, jlong this_arg, jlong msg) {
+ LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg;
LDKChannelUpdate msg_conv;
msg_conv.inner = (void*)(msg & (~1));
msg_conv.is_owned = (msg & 1) || (msg == 0);
LDKCResult_boolLightningErrorZ* ret = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
- *ret = (arg_conv->handle_channel_update)(arg_conv->this_arg, &msg_conv);
+ *ret = (this_arg_conv->handle_channel_update)(this_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;
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RoutingMessageHandler_1call_1handle_1htlc_1fail_1channel_1update(JNIEnv * _env, jclass _b, jlong this_arg, jlong update) {
+ LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg;
LDKHTLCFailChannelUpdate* update_conv = (LDKHTLCFailChannelUpdate*)update;
- return (arg_conv->handle_htlc_fail_channel_update)(arg_conv->this_arg, update_conv);
+ return (this_arg_conv->handle_htlc_fail_channel_update)(this_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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingMessageHandler_1call_1get_1next_1channel_1announcements(JNIEnv * _env, jclass _b, jlong this_arg, jlong starting_point, jbyte batch_amount) {
+ LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_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);
+ *ret = (this_arg_conv->get_next_channel_announcements)(this_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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingMessageHandler_1call_1get_1next_1node_1announcements(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray starting_point, jbyte batch_amount) {
+ LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg;
+ LDKPublicKey starting_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, starting_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, starting_point, 0, 33, starting_point_ref.compressed_form);
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);
+ *ret = (this_arg_conv->get_next_node_announcements)(this_arg_conv->this_arg, starting_point_ref, 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);
+JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_RoutingMessageHandler_1call_1should_1request_1full_1sync(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray node_id) {
+ LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg;
+ LDKPublicKey node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, node_id, 0, 33, node_id_ref.compressed_form);
+ return (this_arg_conv->should_request_full_sync)(this_arg_conv->this_arg, node_id_ref);
}
typedef struct LDKSocketDescriptor_JCalls {
atomic_size_t refcnt;
JavaVM *vm;
- jobject o;
+ jweak o;
jmethodID send_data_meth;
jmethodID disconnect_socket_meth;
jmethodID eq_meth;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallLongMethod(env, obj, j_calls->send_data_meth, data_ref, resume_read);
}
void disconnect_socket_jcall(void* this_arg) {
LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallVoidMethod(env, obj, j_calls->disconnect_socket_meth);
}
bool eq_jcall(const void* this_arg, const void *other_arg) {
LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallBooleanMethod(env, obj, j_calls->eq_meth, other_arg);
}
uint64_t hash_jcall(const void* this_arg) {
LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg;
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);
+ jobject obj = (*env)->NewLocalRef(env, j_calls->o);
+ CHECK(obj != NULL);
+ return (*env)->CallLongMethod(env, obj, 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) {
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);
+ (*env)->DeleteWeakGlobalRef(env, j_calls->o);
FREE(j_calls);
}
}
}
static inline LDKSocketDescriptor LDKSocketDescriptor_init (JNIEnv * env, jclass _a, jobject o) {
jclass c = (*env)->GetObjectClass(env, o);
- DO_ASSERT(c != NULL);
+ CHECK(c != NULL);
LDKSocketDescriptor_JCalls *calls = MALLOC(sizeof(LDKSocketDescriptor_JCalls), "LDKSocketDescriptor_JCalls");
atomic_init(&calls->refcnt, 1);
DO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);
- calls->o = (*env)->NewGlobalRef(env, o);
+ calls->o = (*env)->NewWeakGlobalRef(env, o);
calls->send_data_meth = (*env)->GetMethodID(env, c, "send_data", "(JZ)J");
- DO_ASSERT(calls->send_data_meth != NULL);
+ CHECK(calls->send_data_meth != NULL);
calls->disconnect_socket_meth = (*env)->GetMethodID(env, c, "disconnect_socket", "()V");
- DO_ASSERT(calls->disconnect_socket_meth != NULL);
+ CHECK(calls->disconnect_socket_meth != NULL);
calls->eq_meth = (*env)->GetMethodID(env, c, "eq", "(J)Z");
- DO_ASSERT(calls->eq_meth != NULL);
+ CHECK(calls->eq_meth != NULL);
calls->hash_meth = (*env)->GetMethodID(env, c, "hash", "()J");
- DO_ASSERT(calls->hash_meth != NULL);
+ CHECK(calls->hash_meth != NULL);
LDKSocketDescriptor ret = {
.this_arg = (void*) calls,
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;
+ jobject ret = (*env)->NewLocalRef(env, ((LDKSocketDescriptor_JCalls*)val)->o);
+ CHECK(ret != NULL);
+ return ret;
}
-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;
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_SocketDescriptor_1call_1send_1data(JNIEnv * _env, jclass _b, jlong this_arg, jlong data, jboolean resume_read) {
+ LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg;
LDKu8slice data_conv = *(LDKu8slice*)data;
- return (arg_conv->send_data)(arg_conv->this_arg, data_conv, resume_read);
+ return (this_arg_conv->send_data)(this_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 void JNICALL Java_org_ldk_impl_bindings_SocketDescriptor_1call_1disconnect_1socket(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg;
+ return (this_arg_conv->disconnect_socket)(this_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 jlong JNICALL Java_org_ldk_impl_bindings_SocketDescriptor_1call_1hash(JNIEnv * _env, jclass _b, jlong this_arg) {
+ LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg;
+ return (this_arg_conv->hash)(this_arg_conv->this_arg);
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1PublicKey_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
LDKCVecTempl_PublicKey *vec = (LDKCVecTempl_PublicKey*)ptr;
return (*env)->NewObject(env, slicedef_cls, slicedef_meth, (long)vec->data, (long)vec->datalen, sizeof(LDKPublicKey));
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1PublicKey_1new(JNIEnv *env, jclass _b, jlongArray elems){
- LDKCVecTempl_PublicKey *ret = MALLOC(sizeof(LDKCVecTempl_PublicKey), "LDKCVecTempl_PublicKey");
- ret->datalen = (*env)->GetArrayLength(env, elems);
- if (ret->datalen == 0) {
- ret->data = NULL;
- } else {
- ret->data = MALLOC(sizeof(LDKPublicKey) * ret->datalen, "LDKCVecTempl_PublicKey Data");
- jlong *java_elems = (*env)->GetPrimitiveArrayCritical(env, elems, NULL);
- for (size_t i = 0; i < ret->datalen; i++) {
- jlong arr_elem = java_elems[i];
- LDKPublicKey arr_elem_conv = *(LDKPublicKey*)arr_elem;
- FREE((void*)arr_elem);
- ret->data[i] = arr_elem_conv;
- }
- (*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
- }
- return (long)ret;
-}
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;
+ LDKCResult_CVec_u8ZPeerHandleErrorZ *val = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg)->contents.err;
+ return (long)(val->contents.err->inner) | (val->contents.err->is_owned ? 1 : 0);
}
}
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;
+ LDKCResult_boolPeerHandleErrorZ *val = (LDKCResult_boolPeerHandleErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_boolPeerHandleErrorZ*)arg)->contents.err;
+ return (long)(val->contents.err->inner) | (val->contents.err->is_owned ? 1 : 0);
}
}
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;
+ LDKCResult_SecretKeySecpErrorZ *val = (LDKCResult_SecretKeySecpErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_SecretKeySecpErrorZ*)arg)->contents.err;
+ return (long)val->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;
+ LDKCResult_PublicKeySecpErrorZ *val = (LDKCResult_PublicKeySecpErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)val->contents.result;
} else {
- return (long)((LDKCResult_PublicKeySecpErrorZ*)arg)->contents.err;
+ return (long)val->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;
+ LDKCResult_TxCreationKeysSecpErrorZ *val = (LDKCResult_TxCreationKeysSecpErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)(val->contents.result->inner) | (val->contents.result->is_owned ? 1 : 0);
} else {
- return (long)((LDKCResult_TxCreationKeysSecpErrorZ*)arg)->contents.err;
+ return (long)val->contents.err;
}
}
JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1C2TupleTempl_1HTLCOutputInCommitment_1_1Signature_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKRouteHop arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = RouteHop_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
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;
+ LDKCResult_RouteLightningErrorZ *val = (LDKCResult_RouteLightningErrorZ*)arg;
+ if (val->result_ok) {
+ return (long)(val->contents.result->inner) | (val->contents.result->is_owned ? 1 : 0);
} else {
- return (long)((LDKCResult_RouteLightningErrorZ*)arg)->contents.err;
+ return (long)(val->contents.err->inner) | (val->contents.err->is_owned ? 1 : 0);
}
}
JNIEXPORT jlongArray JNICALL Java_org_ldk_impl_bindings_LDKCVecTempl_1RouteHint_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {
jlongArray ret = (*env)->NewLongArray(env, vec->datalen);
jlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);
for (size_t i = 0; i < vec->datalen; i++) {
- DO_ASSERT((((long)vec->data[i].inner) & 1) == 0);
+ CHECK((((long)vec->data[i].inner) & 1) == 0);
ret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);
}
(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);
LDKRouteHint arr_elem_conv;
arr_elem_conv.inner = (void*)(arr_elem & (~1));
arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
+ if (arr_elem_conv.inner != NULL)
+ arr_elem_conv = RouteHint_clone(&arr_elem_conv);
ret->data[i] = arr_elem_conv;
}
(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);
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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1PublicKeySecpErrorZ_1ok(JNIEnv * _env, jclass _b, jbyteArray arg) {
+ LDKPublicKey arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, arg, 0, 33, arg_ref.compressed_form);
LDKCResult_PublicKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_PublicKeySecpErrorZ), "LDKCResult_PublicKeySecpErrorZ");
- *ret = CResult_PublicKeySecpErrorZ_ok(arg_conv);
+ *ret = CResult_PublicKeySecpErrorZ_ok(arg_ref);
return (long)ret;
}
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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1SecretKeySecpErrorZ_1ok(JNIEnv * _env, jclass _b, jbyteArray arg) {
+ LDKSecretKey arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, arg) == 32);
+ (*_env)->GetByteArrayRegion (_env, arg, 0, 32, arg_ref.bytes);
LDKCResult_SecretKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_SecretKeySecpErrorZ), "LDKCResult_SecretKeySecpErrorZ");
- *ret = CResult_SecretKeySecpErrorZ_ok(arg_conv);
+ *ret = CResult_SecretKeySecpErrorZ_ok(arg_ref);
return (long)ret;
}
return CResult_SignatureNoneZ_free(arg_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1SignatureNoneZ_1ok(JNIEnv * _env, jclass _b, jlong arg) {
- LDKSignature arg_conv = *(LDKSignature*)arg;
- FREE((void*)arg);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CResult_1SignatureNoneZ_1ok(JNIEnv * _env, jclass _b, jbyteArray arg) {
+ LDKSignature arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, arg, 0, 64, arg_ref.compact_form);
LDKCResult_SignatureNoneZ* ret = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
- *ret = CResult_SignatureNoneZ_ok(arg_conv);
+ *ret = CResult_SignatureNoneZ_ok(arg_ref);
return (long)ret;
}
LDKOutPoint a_conv;
a_conv.inner = (void*)(a & (~1));
a_conv.is_owned = (a & 1) || (a == 0);
+ if (a_conv.inner != NULL)
+ a_conv = OutPoint_clone(&a_conv);
LDKCVec_u8Z b_conv = *(LDKCVec_u8Z*)b;
FREE((void*)b);
LDKC2Tuple_OutPointScriptZ* ret = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1TxidCVec_1TxOutZZ_1new(JNIEnv * _env, jclass _b, jbyteArray a, jlong b) {
LDKThirtyTwoBytes a_ref;
+ CHECK((*_env)->GetArrayLength (_env, a) == 32);
(*_env)->GetByteArrayRegion (_env, a, 0, 32, a_ref.data);
LDKCVec_TxOutZ b_conv = *(LDKCVec_TxOutZ*)b;
FREE((void*)b);
return (long)ret;
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1SignatureCVec_1SignatureZZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) {
- LDKSignature a_conv = *(LDKSignature*)a;
- FREE((void*)a);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1SignatureCVec_1SignatureZZ_1new(JNIEnv * _env, jclass _b, jbyteArray a, jlong b) {
+ LDKSignature a_ref;
+ CHECK((*_env)->GetArrayLength (_env, a) == 64);
+ (*_env)->GetByteArrayRegion (_env, a, 0, 64, a_ref.compact_form);
LDKCVec_SignatureZ b_conv = *(LDKCVec_SignatureZ*)b;
FREE((void*)b);
LDKC2Tuple_SignatureCVec_SignatureZZ* ret = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
- *ret = C2Tuple_SignatureCVec_SignatureZZ_new(a_conv, b_conv);
+ *ret = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_conv);
return (long)ret;
}
LDKChannelAnnouncement a_conv;
a_conv.inner = (void*)(a & (~1));
a_conv.is_owned = (a & 1) || (a == 0);
+ if (a_conv.inner != NULL)
+ a_conv = ChannelAnnouncement_clone(&a_conv);
LDKChannelUpdate b_conv;
b_conv.inner = (void*)(b & (~1));
b_conv.is_owned = (b & 1) || (b == 0);
+ if (b_conv.inner != NULL)
+ b_conv = ChannelUpdate_clone(&b_conv);
LDKChannelUpdate c_conv;
c_conv.inner = (void*)(c & (~1));
c_conv.is_owned = (c & 1) || (c == 0);
+ if (c_conv.inner != NULL)
+ c_conv = ChannelUpdate_clone(&c_conv);
LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ");
*ret = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a_conv, b_conv, c_conv);
return (long)ret;
return (long)ret;
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1HTLCOutputInCommitmentSignatureZ_1new(JNIEnv * _env, jclass _b, jlong a, jlong b) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_C2Tuple_1HTLCOutputInCommitmentSignatureZ_1new(JNIEnv * _env, jclass _b, jlong a, jbyteArray b) {
LDKHTLCOutputInCommitment a_conv;
a_conv.inner = (void*)(a & (~1));
a_conv.is_owned = (a & 1) || (a == 0);
- LDKSignature b_conv = *(LDKSignature*)b;
- FREE((void*)b);
+ if (a_conv.inner != NULL)
+ a_conv = HTLCOutputInCommitment_clone(&a_conv);
+ LDKSignature b_ref;
+ CHECK((*_env)->GetArrayLength (_env, b) == 64);
+ (*_env)->GetByteArrayRegion (_env, b, 0, 64, b_ref.compact_form);
LDKC2Tuple_HTLCOutputInCommitmentSignatureZ* ret = MALLOC(sizeof(LDKC2Tuple_HTLCOutputInCommitmentSignatureZ), "LDKC2Tuple_HTLCOutputInCommitmentSignatureZ");
- *ret = C2Tuple_HTLCOutputInCommitmentSignatureZ_new(a_conv, b_conv);
+ *ret = C2Tuple_HTLCOutputInCommitmentSignatureZ_new(a_conv, b_ref);
return (long)ret;
}
return ChannelHandshakeConfig_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelHandshakeConfig orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelHandshakeConfig ret = ChannelHandshakeConfig_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1get_1minimum_1depth(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelHandshakeConfig this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
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 = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1default(JNIEnv * _env, jclass _b) {
LDKChannelHandshakeConfig ret = ChannelHandshakeConfig_default();
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ChannelHandshakeLimits_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelHandshakeLimits orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelHandshakeLimits ret = ChannelHandshakeLimits_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1min_1funding_1satoshis(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelHandshakeLimits this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
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 = 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);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1default(JNIEnv * _env, jclass _b) {
LDKChannelHandshakeLimits ret = ChannelHandshakeLimits_default();
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ChannelConfig_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelConfig orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelConfig ret = ChannelConfig_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1get_1fee_1proportional_1millionths(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelConfig this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
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 = ChannelConfig_new(fee_proportional_millionths_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1default(JNIEnv * _env, jclass _b) {
LDKChannelConfig ret = ChannelConfig_default();
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelConfig_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKChannelConfig ret = ChannelConfig_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return UserConfig_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUserConfig orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUserConfig ret = UserConfig_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1get_1own_1channel_1config(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUserConfig this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelHandshakeConfig ret = UserConfig_get_own_channel_config(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1set_1own_1channel_1config(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelHandshakeConfig val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = ChannelHandshakeConfig_clone(&val_conv);
return UserConfig_set_own_channel_config(&this_ptr_conv, val_conv);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelHandshakeLimits ret = UserConfig_get_peer_channel_config_limits(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1set_1peer_1channel_1config_1limits(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelHandshakeLimits val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = ChannelHandshakeLimits_clone(&val_conv);
return UserConfig_set_peer_channel_config_limits(&this_ptr_conv, val_conv);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelConfig ret = UserConfig_get_channel_options(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UserConfig_1set_1channel_1options(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelConfig val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = ChannelConfig_clone(&val_conv);
return UserConfig_set_channel_options(&this_ptr_conv, val_conv);
}
LDKChannelHandshakeConfig own_channel_config_arg_conv;
own_channel_config_arg_conv.inner = (void*)(own_channel_config_arg & (~1));
own_channel_config_arg_conv.is_owned = (own_channel_config_arg & 1) || (own_channel_config_arg == 0);
+ if (own_channel_config_arg_conv.inner != NULL)
+ own_channel_config_arg_conv = ChannelHandshakeConfig_clone(&own_channel_config_arg_conv);
LDKChannelHandshakeLimits peer_channel_config_limits_arg_conv;
peer_channel_config_limits_arg_conv.inner = (void*)(peer_channel_config_limits_arg & (~1));
peer_channel_config_limits_arg_conv.is_owned = (peer_channel_config_limits_arg & 1) || (peer_channel_config_limits_arg == 0);
+ if (peer_channel_config_limits_arg_conv.inner != NULL)
+ peer_channel_config_limits_arg_conv = ChannelHandshakeLimits_clone(&peer_channel_config_limits_arg_conv);
LDKChannelConfig channel_options_arg_conv;
channel_options_arg_conv.inner = (void*)(channel_options_arg & (~1));
channel_options_arg_conv.is_owned = (channel_options_arg & 1) || (channel_options_arg == 0);
+ if (channel_options_arg_conv.inner != NULL)
+ channel_options_arg_conv = ChannelConfig_clone(&channel_options_arg_conv);
LDKUserConfig ret = UserConfig_new(own_channel_config_arg_conv, peer_channel_config_limits_arg_conv, channel_options_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UserConfig_1default(JNIEnv * _env, jclass _b) {
LDKUserConfig ret = UserConfig_default();
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Access_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char header_arr[80];
+ CHECK((*_env)->GetArrayLength (_env, header) == 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;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char header_arr[80];
+ CHECK((*_env)->GetArrayLength (_env, header) == 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);
LDKFeeEstimator_JCalls_clone(feeest_conv.this_arg);
}
LDKChainMonitor ret = ChainMonitor_new(chain_source_conv, broadcaster_conv, logger_conv, feeest_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChainMonitor_1as_1Watch(JNIEnv * _env, jclass _b, jlong this_arg) {
return ChannelMonitorUpdate_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelMonitorUpdate orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelMonitorUpdate ret = ChannelMonitorUpdate_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1get_1update_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelMonitorUpdate this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelMonitorUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKChannelMonitorUpdate ret = ChannelMonitorUpdate_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_MonitorUpdateError_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return HTLCUpdate_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKHTLCUpdate orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKHTLCUpdate ret = HTLCUpdate_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1write(JNIEnv * _env, jclass _b, jlong obj) {
LDKHTLCUpdate obj_conv;
obj_conv.inner = (void*)(obj & (~1));
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKHTLCUpdate ret = HTLCUpdate_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelMonitor_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelMonitorUpdate updates_conv;
updates_conv.inner = (void*)(updates & (~1));
updates_conv.is_owned = (updates & 1) || (updates == 0);
+ if (updates_conv.inner != NULL)
+ updates_conv = ChannelMonitorUpdate_clone(&updates_conv);
LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster;
LDKLogger* logger_conv = (LDKLogger*)logger;
LDKCResult_NoneMonitorUpdateErrorZ* ret = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ");
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char header_arr[80];
+ CHECK((*_env)->GetArrayLength (_env, header) == 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;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char header_arr[80];
+ CHECK((*_env)->GetArrayLength (_env, header) == 80);
(*_env)->GetByteArrayRegion (_env, header, 0, 80, header_arr);
unsigned char (*header_ref)[80] = &header_arr;
LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)broadcaster;
return OutPoint_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKOutPoint orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKOutPoint ret = OutPoint_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OutPoint_1get_1txid(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOutPoint this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return OutPoint_set_txid(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1new(JNIEnv * _env, jclass _b, jbyteArray txid_arg, jshort index_arg) {
LDKThirtyTwoBytes txid_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, txid_arg) == 32);
(*_env)->GetByteArrayRegion (_env, txid_arg, 0, 32, txid_arg_ref.data);
LDKOutPoint ret = OutPoint_new(txid_arg_ref, index_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OutPoint_1to_1channel_1id(JNIEnv * _env, jclass _b, jlong this_arg) {
LDKOutPoint this_arg_conv;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
- jbyteArray _arr = (*_env)->NewByteArray(_env, 32);
- (*_env)->SetByteArrayRegion(_env, _arr, 0, 32, OutPoint_to_channel_id(&this_arg_conv).data);
- return _arr;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 32);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 32, OutPoint_to_channel_id(&this_arg_conv).data);
+ return arg_arr;
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKOutPoint ret = OutPoint_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_SpendableOutputDescriptor_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return InMemoryChannelKeys_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKInMemoryChannelKeys orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKInMemoryChannelKeys ret = InMemoryChannelKeys_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1get_1funding_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKInMemoryChannelKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
return ret_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1funding_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1funding_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKInMemoryChannelKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSecretKey val_conv = *(LDKSecretKey*)val;
- FREE((void*)val);
- return InMemoryChannelKeys_set_funding_key(&this_ptr_conv, val_conv);
+ LDKSecretKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.bytes);
+ return InMemoryChannelKeys_set_funding_key(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1get_1revocation_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ret_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1revocation_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1revocation_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKInMemoryChannelKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSecretKey val_conv = *(LDKSecretKey*)val;
- FREE((void*)val);
- return InMemoryChannelKeys_set_revocation_base_key(&this_ptr_conv, val_conv);
+ LDKSecretKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.bytes);
+ return InMemoryChannelKeys_set_revocation_base_key(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1get_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ret_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKInMemoryChannelKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSecretKey val_conv = *(LDKSecretKey*)val;
- FREE((void*)val);
- return InMemoryChannelKeys_set_payment_key(&this_ptr_conv, val_conv);
+ LDKSecretKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.bytes);
+ return InMemoryChannelKeys_set_payment_key(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1get_1delayed_1payment_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ret_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1delayed_1payment_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1delayed_1payment_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKInMemoryChannelKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSecretKey val_conv = *(LDKSecretKey*)val;
- FREE((void*)val);
- return InMemoryChannelKeys_set_delayed_payment_base_key(&this_ptr_conv, val_conv);
+ LDKSecretKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.bytes);
+ return InMemoryChannelKeys_set_delayed_payment_base_key(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1get_1htlc_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ret_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1htlc_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1set_1htlc_1base_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKInMemoryChannelKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSecretKey val_conv = *(LDKSecretKey*)val;
- FREE((void*)val);
- return InMemoryChannelKeys_set_htlc_base_key(&this_ptr_conv, val_conv);
+ LDKSecretKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.bytes);
+ return InMemoryChannelKeys_set_htlc_base_key(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1get_1commitment_1seed(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return InMemoryChannelKeys_set_commitment_seed(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1new(JNIEnv * _env, jclass _b, jlong funding_key, jlong revocation_base_key, jlong payment_key, jlong delayed_payment_base_key, jlong htlc_base_key, jbyteArray commitment_seed, jlong channel_value_satoshis, jlong key_derivation_params) {
- LDKSecretKey funding_key_conv = *(LDKSecretKey*)funding_key;
- FREE((void*)funding_key);
- LDKSecretKey revocation_base_key_conv = *(LDKSecretKey*)revocation_base_key;
- FREE((void*)revocation_base_key);
- LDKSecretKey payment_key_conv = *(LDKSecretKey*)payment_key;
- FREE((void*)payment_key);
- LDKSecretKey delayed_payment_base_key_conv = *(LDKSecretKey*)delayed_payment_base_key;
- FREE((void*)delayed_payment_base_key);
- LDKSecretKey htlc_base_key_conv = *(LDKSecretKey*)htlc_base_key;
- FREE((void*)htlc_base_key);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1new(JNIEnv * _env, jclass _b, jbyteArray funding_key, jbyteArray revocation_base_key, jbyteArray payment_key, jbyteArray delayed_payment_base_key, jbyteArray htlc_base_key, jbyteArray commitment_seed, jlong channel_value_satoshis, jlong key_derivation_params) {
+ LDKSecretKey funding_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, funding_key) == 32);
+ (*_env)->GetByteArrayRegion (_env, funding_key, 0, 32, funding_key_ref.bytes);
+ LDKSecretKey revocation_base_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, revocation_base_key) == 32);
+ (*_env)->GetByteArrayRegion (_env, revocation_base_key, 0, 32, revocation_base_key_ref.bytes);
+ LDKSecretKey payment_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_key) == 32);
+ (*_env)->GetByteArrayRegion (_env, payment_key, 0, 32, payment_key_ref.bytes);
+ LDKSecretKey delayed_payment_base_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, delayed_payment_base_key) == 32);
+ (*_env)->GetByteArrayRegion (_env, delayed_payment_base_key, 0, 32, delayed_payment_base_key_ref.bytes);
+ LDKSecretKey htlc_base_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, htlc_base_key) == 32);
+ (*_env)->GetByteArrayRegion (_env, htlc_base_key, 0, 32, htlc_base_key_ref.bytes);
LDKThirtyTwoBytes commitment_seed_ref;
+ CHECK((*_env)->GetArrayLength (_env, commitment_seed) == 32);
(*_env)->GetByteArrayRegion (_env, commitment_seed, 0, 32, commitment_seed_ref.data);
LDKC2Tuple_u64u64Z key_derivation_params_conv = *(LDKC2Tuple_u64u64Z*)key_derivation_params;
FREE((void*)key_derivation_params);
- 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_ref, channel_value_satoshis, key_derivation_params_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKInMemoryChannelKeys ret = InMemoryChannelKeys_new(funding_key_ref, revocation_base_key_ref, payment_key_ref, delayed_payment_base_key_ref, htlc_base_key_ref, commitment_seed_ref, channel_value_satoshis, key_derivation_params_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1counterparty_1pubkeys(JNIEnv * _env, jclass _b, jlong this_arg) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
LDKChannelPublicKeys ret = InMemoryChannelKeys_counterparty_pubkeys(&this_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1counterparty_1selected_1contest_1delay(JNIEnv * _env, jclass _b, jlong this_arg) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKInMemoryChannelKeys ret = InMemoryChannelKeys_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_KeysManager_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
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];
+ CHECK((*_env)->GetArrayLength (_env, seed) == 32);
(*_env)->GetByteArrayRegion (_env, seed, 0, 32, seed_arr);
unsigned char (*seed_ref)[32] = &seed_arr;
LDKNetwork network_conv = LDKNetwork_from_java(_env, network);
LDKKeysManager ret = KeysManager_new(seed_ref, network_conv, starting_time_secs, starting_time_nanos);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysManager_1derive_1channel_1keys(JNIEnv * _env, jclass _b, jlong this_arg, jlong channel_value_satoshis, jlong params_1, jlong params_2) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
LDKInMemoryChannelKeys ret = KeysManager_derive_channel_keys(&this_arg_conv, channel_value_satoshis, params_1, params_2);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_KeysManager_1as_1KeysInterface(JNIEnv * _env, jclass _b, jlong this_arg) {
return ChannelDetails_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelDetails orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelDetails ret = ChannelDetails_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelDetails this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return ChannelDetails_set_channel_id(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1get_1remote_1network_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1get_1remote_1network_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelDetails this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelDetails_get_remote_network_id(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelDetails_get_remote_network_id(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1set_1remote_1network_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1set_1remote_1network_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelDetails this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelDetails_set_remote_network_id(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelDetails_set_remote_network_id(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1get_1counterparty_1features(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKInitFeatures ret = ChannelDetails_get_counterparty_features(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelDetails_1set_1counterparty_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKInitFeatures val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return ChannelDetails_set_counterparty_features(&this_ptr_conv, val_conv);
}
LDKUserConfig config_conv;
config_conv.inner = (void*)(config & (~1));
config_conv.is_owned = (config & 1) || (config == 0);
+ if (config_conv.inner != NULL)
+ config_conv = UserConfig_clone(&config_conv);
LDKChannelManager 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);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1create_1channel(JNIEnv * _env, jclass _b, jlong this_arg, jlong their_network_key, jlong channel_value_satoshis, jlong push_msat, jlong user_id, jlong override_config) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1create_1channel(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_network_key, jlong channel_value_satoshis, jlong push_msat, jlong user_id, jlong override_config) {
LDKChannelManager this_arg_conv;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
- LDKPublicKey their_network_key_conv = *(LDKPublicKey*)their_network_key;
- FREE((void*)their_network_key);
+ LDKPublicKey their_network_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_network_key) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_network_key, 0, 33, their_network_key_ref.compressed_form);
LDKUserConfig override_config_conv;
override_config_conv.inner = (void*)(override_config & (~1));
override_config_conv.is_owned = (override_config & 1) || (override_config == 0);
+ if (override_config_conv.inner != NULL)
+ override_config_conv = UserConfig_clone(&override_config_conv);
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);
+ *ret = ChannelManager_create_channel(&this_arg_conv, their_network_key_ref, channel_value_satoshis, push_msat, user_id, override_config_conv);
return (long)ret;
}
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char channel_id_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, channel_id) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id, 0, 32, channel_id_arr);
unsigned char (*channel_id_ref)[32] = &channel_id_arr;
LDKCResult_NoneAPIErrorZ* ret = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char channel_id_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, channel_id) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id, 0, 32, channel_id_arr);
unsigned char (*channel_id_ref)[32] = &channel_id_arr;
return ChannelManager_force_close_channel(&this_arg_conv, channel_id_ref);
route_conv.inner = (void*)(route & (~1));
route_conv.is_owned = (route & 1) || (route == 0);
LDKThirtyTwoBytes payment_hash_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_hash) == 32);
(*_env)->GetByteArrayRegion (_env, payment_hash, 0, 32, payment_hash_ref.data);
LDKThirtyTwoBytes payment_secret_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_secret) == 32);
(*_env)->GetByteArrayRegion (_env, payment_secret, 0, 32, payment_secret_ref.data);
LDKCResult_NonePaymentSendFailureZ* ret = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
*ret = ChannelManager_send_payment(&this_arg_conv, &route_conv, payment_hash_ref, payment_secret_ref);
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char temporary_channel_id_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, temporary_channel_id) == 32);
(*_env)->GetByteArrayRegion (_env, temporary_channel_id, 0, 32, temporary_channel_id_arr);
unsigned char (*temporary_channel_id_ref)[32] = &temporary_channel_id_arr;
LDKOutPoint funding_txo_conv;
funding_txo_conv.inner = (void*)(funding_txo & (~1));
funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+ if (funding_txo_conv.inner != NULL)
+ funding_txo_conv = OutPoint_clone(&funding_txo_conv);
return ChannelManager_funding_transaction_generated(&this_arg_conv, temporary_channel_id_ref, funding_txo_conv);
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1broadcast_1node_1announcement(JNIEnv * _env, jclass _b, jlong this_arg, jlong rgb, jbyteArray alias, jlong addresses) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1broadcast_1node_1announcement(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray rgb, jbyteArray alias, jlong addresses) {
LDKChannelManager this_arg_conv;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
- LDKThreeBytes rgb_conv = *(LDKThreeBytes*)rgb;
- FREE((void*)rgb);
+ LDKThreeBytes rgb_ref;
+ CHECK((*_env)->GetArrayLength (_env, rgb) == 3);
+ (*_env)->GetByteArrayRegion (_env, rgb, 0, 3, rgb_ref.data);
LDKThirtyTwoBytes alias_ref;
+ CHECK((*_env)->GetArrayLength (_env, alias) == 32);
(*_env)->GetByteArrayRegion (_env, alias, 0, 32, alias_ref.data);
LDKCVec_NetAddressZ addresses_conv = *(LDKCVec_NetAddressZ*)addresses;
FREE((void*)addresses);
- return ChannelManager_broadcast_node_announcement(&this_arg_conv, rgb_conv, alias_ref, addresses_conv);
+ return ChannelManager_broadcast_node_announcement(&this_arg_conv, rgb_ref, alias_ref, addresses_conv);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1process_1pending_1htlc_1forwards(JNIEnv * _env, jclass _b, jlong this_arg) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char payment_hash_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, payment_hash) == 32);
(*_env)->GetByteArrayRegion (_env, payment_hash, 0, 32, payment_hash_arr);
unsigned char (*payment_hash_ref)[32] = &payment_hash_arr;
LDKThirtyTwoBytes payment_secret_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_secret) == 32);
(*_env)->GetByteArrayRegion (_env, payment_secret, 0, 32, payment_secret_ref.data);
return ChannelManager_fail_htlc_backwards(&this_arg_conv, payment_hash_ref, payment_secret_ref);
}
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
LDKThirtyTwoBytes payment_preimage_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_preimage) == 32);
(*_env)->GetByteArrayRegion (_env, payment_preimage, 0, 32, payment_preimage_ref.data);
LDKThirtyTwoBytes payment_secret_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_secret) == 32);
(*_env)->GetByteArrayRegion (_env, payment_secret, 0, 32, payment_secret_ref.data);
return ChannelManager_claim_funds(&this_arg_conv, payment_preimage_ref, payment_secret_ref, expected_amount);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelManager_1get_1our_1node_1id(JNIEnv * _env, jclass _b, jlong this_arg) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelManager_1get_1our_1node_1id(JNIEnv * _env, jclass _b, jlong this_arg) {
LDKChannelManager this_arg_conv;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelManager_get_our_node_id(&this_arg_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelManager_get_our_node_id(&this_arg_conv).compressed_form);
+ return arg_arr;
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManager_1channel_1monitor_1updated(JNIEnv * _env, jclass _b, jlong this_arg, jlong funding_txo, jlong highest_applied_update_id) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char header_arr[80];
+ CHECK((*_env)->GetArrayLength (_env, header) == 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;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char header_arr[80];
+ CHECK((*_env)->GetArrayLength (_env, header) == 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);
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKUserConfig ret = ChannelManagerReadArgs_get_default_config(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelManagerReadArgs_1set_1default_1config(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKUserConfig val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = UserConfig_clone(&val_conv);
return ChannelManagerReadArgs_set_default_config(&this_ptr_conv, val_conv);
}
LDKUserConfig default_config_conv;
default_config_conv.inner = (void*)(default_config & (~1));
default_config_conv.is_owned = (default_config & 1) || (default_config == 0);
+ if (default_config_conv.inner != NULL)
+ default_config_conv = UserConfig_clone(&default_config_conv);
LDKCVec_ChannelMonitorZ channel_monitors_conv = *(LDKCVec_ChannelMonitorZ*)channel_monitors;
FREE((void*)channel_monitors);
LDKChannelManagerReadArgs 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);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DecodeError_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return Init_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Init_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKInit orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKInit ret = Init_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKErrorMessage this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
return ErrorMessage_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKErrorMessage orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKErrorMessage ret = ErrorMessage_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKErrorMessage this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return ErrorMessage_set_channel_id(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong data_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
LDKCVec_u8Z data_arg_conv = *(LDKCVec_u8Z*)data_arg;
FREE((void*)data_arg);
LDKErrorMessage ret = ErrorMessage_new(channel_id_arg_ref, data_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return Ping_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKPing orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKPing ret = Ping_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Ping_1get_1ponglen(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKPing this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1new(JNIEnv * _env, jclass _b, jshort ponglen_arg, jshort byteslen_arg) {
LDKPing ret = Ping_new(ponglen_arg, byteslen_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return Pong_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKPong orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKPong ret = Pong_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Pong_1get_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKPong this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1new(JNIEnv * _env, jclass _b, jshort byteslen_arg) {
LDKPong ret = Pong_new(byteslen_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return OpenChannel_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKOpenChannel orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKOpenChannel ret = OpenChannel_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return OpenChannel_set_chain_hash(&this_ptr_conv, val_ref);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return OpenChannel_set_temporary_channel_id(&this_ptr_conv, val_ref);
}
return OpenChannel_set_max_accepted_htlcs(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = OpenChannel_get_funding_pubkey(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, OpenChannel_get_funding_pubkey(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return OpenChannel_set_funding_pubkey(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return OpenChannel_set_funding_pubkey(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = OpenChannel_get_revocation_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, OpenChannel_get_revocation_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return OpenChannel_set_revocation_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return OpenChannel_set_revocation_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = OpenChannel_get_payment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, OpenChannel_get_payment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return OpenChannel_set_payment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return OpenChannel_set_payment_point(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = OpenChannel_get_delayed_payment_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, OpenChannel_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return OpenChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return OpenChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = OpenChannel_get_htlc_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, OpenChannel_get_htlc_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return OpenChannel_set_htlc_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return OpenChannel_set_htlc_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = OpenChannel_get_first_per_commitment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, OpenChannel_get_first_per_commitment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKOpenChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return OpenChannel_set_first_per_commitment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return OpenChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyte JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1channel_1flags(JNIEnv * _env, jclass _b, jlong this_ptr) {
return AcceptChannel_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKAcceptChannel orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKAcceptChannel ret = AcceptChannel_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1temporary_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return AcceptChannel_set_temporary_channel_id(&this_ptr_conv, val_ref);
}
return AcceptChannel_set_max_accepted_htlcs(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = AcceptChannel_get_funding_pubkey(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, AcceptChannel_get_funding_pubkey(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return AcceptChannel_set_funding_pubkey(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return AcceptChannel_set_funding_pubkey(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = AcceptChannel_get_revocation_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, AcceptChannel_get_revocation_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return AcceptChannel_set_revocation_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return AcceptChannel_set_revocation_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = AcceptChannel_get_payment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, AcceptChannel_get_payment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return AcceptChannel_set_payment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return AcceptChannel_set_payment_point(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = AcceptChannel_get_delayed_payment_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, AcceptChannel_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return AcceptChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return AcceptChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = AcceptChannel_get_htlc_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, AcceptChannel_get_htlc_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return AcceptChannel_set_htlc_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return AcceptChannel_set_htlc_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = AcceptChannel_get_first_per_commitment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, AcceptChannel_get_first_per_commitment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1first_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAcceptChannel this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return AcceptChannel_set_first_per_commitment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return AcceptChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return FundingCreated_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKFundingCreated orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKFundingCreated ret = FundingCreated_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1temporary_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKFundingCreated this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return FundingCreated_set_temporary_channel_id(&this_ptr_conv, val_ref);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return FundingCreated_set_funding_txid(&this_ptr_conv, val_ref);
}
return FundingCreated_set_funding_output_index(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKFundingCreated this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = FundingCreated_get_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, FundingCreated_get_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKFundingCreated this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return FundingCreated_set_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return FundingCreated_set_signature(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1new(JNIEnv * _env, jclass _b, jbyteArray temporary_channel_id_arg, jbyteArray funding_txid_arg, jshort funding_output_index_arg, jlong signature_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1new(JNIEnv * _env, jclass _b, jbyteArray temporary_channel_id_arg, jbyteArray funding_txid_arg, jshort funding_output_index_arg, jbyteArray signature_arg) {
LDKThirtyTwoBytes temporary_channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, temporary_channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, temporary_channel_id_arg, 0, 32, temporary_channel_id_arg_ref.data);
LDKThirtyTwoBytes funding_txid_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, funding_txid_arg) == 32);
(*_env)->GetByteArrayRegion (_env, funding_txid_arg, 0, 32, funding_txid_arg_ref.data);
- LDKSignature signature_arg_conv = *(LDKSignature*)signature_arg;
- FREE((void*)signature_arg);
- LDKFundingCreated ret = FundingCreated_new(temporary_channel_id_arg_ref, funding_txid_arg_ref, funding_output_index_arg, signature_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKSignature signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, signature_arg, 0, 64, signature_arg_ref.compact_form);
+ LDKFundingCreated ret = FundingCreated_new(temporary_channel_id_arg_ref, funding_txid_arg_ref, funding_output_index_arg, signature_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingSigned_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return FundingSigned_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKFundingSigned orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKFundingSigned ret = FundingSigned_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_FundingSigned_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKFundingSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return FundingSigned_set_channel_id(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_FundingSigned_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKFundingSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = FundingSigned_get_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, FundingSigned_get_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingSigned_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingSigned_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKFundingSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return FundingSigned_set_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return FundingSigned_set_signature(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong signature_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jbyteArray signature_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
- LDKSignature signature_arg_conv = *(LDKSignature*)signature_arg;
- FREE((void*)signature_arg);
- LDKFundingSigned ret = FundingSigned_new(channel_id_arg_ref, signature_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKSignature signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, signature_arg, 0, 64, signature_arg_ref.compact_form);
+ LDKFundingSigned ret = FundingSigned_new(channel_id_arg_ref, signature_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingLocked_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return FundingLocked_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKFundingLocked orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKFundingLocked ret = FundingLocked_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_FundingLocked_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKFundingLocked this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return FundingLocked_set_channel_id(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1get_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_FundingLocked_1get_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKFundingLocked this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = FundingLocked_get_next_per_commitment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, FundingLocked_get_next_per_commitment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingLocked_1set_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingLocked_1set_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKFundingLocked this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return FundingLocked_set_next_per_commitment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return FundingLocked_set_next_per_commitment_point(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong next_per_commitment_point_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jbyteArray next_per_commitment_point_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
- LDKPublicKey next_per_commitment_point_arg_conv = *(LDKPublicKey*)next_per_commitment_point_arg;
- FREE((void*)next_per_commitment_point_arg);
- LDKFundingLocked ret = FundingLocked_new(channel_id_arg_ref, next_per_commitment_point_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKPublicKey next_per_commitment_point_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, next_per_commitment_point_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, next_per_commitment_point_arg, 0, 33, next_per_commitment_point_arg_ref.compressed_form);
+ LDKFundingLocked ret = FundingLocked_new(channel_id_arg_ref, next_per_commitment_point_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Shutdown_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return Shutdown_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Shutdown_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKShutdown orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKShutdown ret = Shutdown_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_Shutdown_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKShutdown this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return Shutdown_set_channel_id(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Shutdown_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong scriptpubkey_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
LDKCVec_u8Z scriptpubkey_arg_conv = *(LDKCVec_u8Z*)scriptpubkey_arg;
FREE((void*)scriptpubkey_arg);
LDKShutdown ret = Shutdown_new(channel_id_arg_ref, scriptpubkey_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ClosingSigned_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKClosingSigned orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKClosingSigned ret = ClosingSigned_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKClosingSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return ClosingSigned_set_channel_id(&this_ptr_conv, val_ref);
}
return ClosingSigned_set_fee_satoshis(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKClosingSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = ClosingSigned_get_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, ClosingSigned_get_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKClosingSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return ClosingSigned_set_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return ClosingSigned_set_signature(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong fee_satoshis_arg, jlong signature_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong fee_satoshis_arg, jbyteArray signature_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
- LDKSignature signature_arg_conv = *(LDKSignature*)signature_arg;
- FREE((void*)signature_arg);
- LDKClosingSigned ret = ClosingSigned_new(channel_id_arg_ref, fee_satoshis_arg, signature_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKSignature signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, signature_arg, 0, 64, signature_arg_ref.compact_form);
+ LDKClosingSigned ret = ClosingSigned_new(channel_id_arg_ref, fee_satoshis_arg, signature_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return UpdateAddHTLC_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUpdateAddHTLC orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUpdateAddHTLC ret = UpdateAddHTLC_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUpdateAddHTLC this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UpdateAddHTLC_set_channel_id(&this_ptr_conv, val_ref);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UpdateAddHTLC_set_payment_hash(&this_ptr_conv, val_ref);
}
return UpdateFulfillHTLC_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUpdateFulfillHTLC orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUpdateFulfillHTLC ret = UpdateFulfillHTLC_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUpdateFulfillHTLC this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UpdateFulfillHTLC_set_channel_id(&this_ptr_conv, val_ref);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UpdateFulfillHTLC_set_payment_preimage(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong htlc_id_arg, jbyteArray payment_preimage_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
LDKThirtyTwoBytes payment_preimage_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_preimage_arg) == 32);
(*_env)->GetByteArrayRegion (_env, payment_preimage_arg, 0, 32, payment_preimage_arg_ref.data);
LDKUpdateFulfillHTLC ret = UpdateFulfillHTLC_new(channel_id_arg_ref, htlc_id_arg, payment_preimage_arg_ref);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return UpdateFailHTLC_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUpdateFailHTLC orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUpdateFailHTLC ret = UpdateFailHTLC_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUpdateFailHTLC this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UpdateFailHTLC_set_channel_id(&this_ptr_conv, val_ref);
}
return UpdateFailMalformedHTLC_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUpdateFailMalformedHTLC orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUpdateFailMalformedHTLC ret = UpdateFailMalformedHTLC_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUpdateFailMalformedHTLC this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UpdateFailMalformedHTLC_set_channel_id(&this_ptr_conv, val_ref);
}
return CommitmentSigned_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKCommitmentSigned orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKCommitmentSigned ret = CommitmentSigned_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKCommitmentSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return CommitmentSigned_set_channel_id(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKCommitmentSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = CommitmentSigned_get_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, CommitmentSigned_get_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKCommitmentSigned this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return CommitmentSigned_set_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return CommitmentSigned_set_signature(&this_ptr_conv, val_ref);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1set_1htlc_1signatures(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
return CommitmentSigned_set_htlc_signatures(&this_ptr_conv, val_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong signature_arg, jlong htlc_signatures_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jbyteArray signature_arg, jlong htlc_signatures_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
- LDKSignature signature_arg_conv = *(LDKSignature*)signature_arg;
- FREE((void*)signature_arg);
+ LDKSignature signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, signature_arg, 0, 64, signature_arg_ref.compact_form);
LDKCVec_SignatureZ htlc_signatures_arg_conv = *(LDKCVec_SignatureZ*)htlc_signatures_arg;
FREE((void*)htlc_signatures_arg);
- LDKCommitmentSigned ret = CommitmentSigned_new(channel_id_arg_ref, signature_arg_conv, htlc_signatures_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKCommitmentSigned ret = CommitmentSigned_new(channel_id_arg_ref, signature_arg_ref, htlc_signatures_arg_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return RevokeAndACK_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKRevokeAndACK orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKRevokeAndACK ret = RevokeAndACK_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKRevokeAndACK this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return RevokeAndACK_set_channel_id(&this_ptr_conv, val_ref);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return RevokeAndACK_set_per_commitment_secret(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1get_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1get_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKRevokeAndACK this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = RevokeAndACK_get_next_per_commitment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, RevokeAndACK_get_next_per_commitment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1set_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1set_1next_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKRevokeAndACK this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return RevokeAndACK_set_next_per_commitment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return RevokeAndACK_set_next_per_commitment_point(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jbyteArray per_commitment_secret_arg, jlong next_per_commitment_point_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jbyteArray per_commitment_secret_arg, jbyteArray next_per_commitment_point_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
LDKThirtyTwoBytes per_commitment_secret_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_secret_arg) == 32);
(*_env)->GetByteArrayRegion (_env, per_commitment_secret_arg, 0, 32, per_commitment_secret_arg_ref.data);
- LDKPublicKey next_per_commitment_point_arg_conv = *(LDKPublicKey*)next_per_commitment_point_arg;
- FREE((void*)next_per_commitment_point_arg);
- LDKRevokeAndACK ret = RevokeAndACK_new(channel_id_arg_ref, per_commitment_secret_arg_ref, next_per_commitment_point_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKPublicKey next_per_commitment_point_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, next_per_commitment_point_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, next_per_commitment_point_arg, 0, 33, next_per_commitment_point_arg_ref.compressed_form);
+ LDKRevokeAndACK ret = RevokeAndACK_new(channel_id_arg_ref, per_commitment_secret_arg_ref, next_per_commitment_point_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFee_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return UpdateFee_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFee_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUpdateFee orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUpdateFee ret = UpdateFee_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UpdateFee_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUpdateFee this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UpdateFee_set_channel_id(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFee_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jint feerate_per_kw_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
LDKUpdateFee ret = UpdateFee_new(channel_id_arg_ref, feerate_per_kw_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return DataLossProtect_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKDataLossProtect orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKDataLossProtect ret = DataLossProtect_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1get_1your_1last_1per_1commitment_1secret(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKDataLossProtect this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return DataLossProtect_set_your_last_per_commitment_secret(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1get_1my_1current_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1get_1my_1current_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKDataLossProtect this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = DataLossProtect_get_my_current_per_commitment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, DataLossProtect_get_my_current_per_commitment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1set_1my_1current_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1set_1my_1current_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKDataLossProtect this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return DataLossProtect_set_my_current_per_commitment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return DataLossProtect_set_my_current_per_commitment_point(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1new(JNIEnv * _env, jclass _b, jbyteArray your_last_per_commitment_secret_arg, jlong my_current_per_commitment_point_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DataLossProtect_1new(JNIEnv * _env, jclass _b, jbyteArray your_last_per_commitment_secret_arg, jbyteArray my_current_per_commitment_point_arg) {
LDKThirtyTwoBytes your_last_per_commitment_secret_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, your_last_per_commitment_secret_arg) == 32);
(*_env)->GetByteArrayRegion (_env, your_last_per_commitment_secret_arg, 0, 32, your_last_per_commitment_secret_arg_ref.data);
- LDKPublicKey my_current_per_commitment_point_arg_conv = *(LDKPublicKey*)my_current_per_commitment_point_arg;
- FREE((void*)my_current_per_commitment_point_arg);
- LDKDataLossProtect ret = DataLossProtect_new(your_last_per_commitment_secret_arg_ref, my_current_per_commitment_point_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKPublicKey my_current_per_commitment_point_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, my_current_per_commitment_point_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, my_current_per_commitment_point_arg, 0, 33, my_current_per_commitment_point_arg_ref.compressed_form);
+ LDKDataLossProtect ret = DataLossProtect_new(your_last_per_commitment_secret_arg_ref, my_current_per_commitment_point_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ChannelReestablish_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelReestablish orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelReestablish ret = ChannelReestablish_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelReestablish this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return ChannelReestablish_set_channel_id(&this_ptr_conv, val_ref);
}
return AnnouncementSignatures_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKAnnouncementSignatures orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKAnnouncementSignatures ret = AnnouncementSignatures_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1get_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAnnouncementSignatures this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return AnnouncementSignatures_set_channel_id(&this_ptr_conv, val_ref);
}
return AnnouncementSignatures_set_short_channel_id(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1get_1node_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1get_1node_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAnnouncementSignatures this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = AnnouncementSignatures_get_node_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, AnnouncementSignatures_get_node_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1set_1node_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1set_1node_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAnnouncementSignatures this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return AnnouncementSignatures_set_node_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return AnnouncementSignatures_set_node_signature(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1get_1bitcoin_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1get_1bitcoin_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKAnnouncementSignatures this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = AnnouncementSignatures_get_bitcoin_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, AnnouncementSignatures_get_bitcoin_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1set_1bitcoin_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1set_1bitcoin_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKAnnouncementSignatures this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return AnnouncementSignatures_set_bitcoin_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return AnnouncementSignatures_set_bitcoin_signature(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong short_channel_id_arg, jlong node_signature_arg, jlong bitcoin_signature_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1new(JNIEnv * _env, jclass _b, jbyteArray channel_id_arg, jlong short_channel_id_arg, jbyteArray node_signature_arg, jbyteArray bitcoin_signature_arg) {
LDKThirtyTwoBytes channel_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, channel_id_arg) == 32);
(*_env)->GetByteArrayRegion (_env, channel_id_arg, 0, 32, channel_id_arg_ref.data);
- LDKSignature node_signature_arg_conv = *(LDKSignature*)node_signature_arg;
- FREE((void*)node_signature_arg);
- LDKSignature bitcoin_signature_arg_conv = *(LDKSignature*)bitcoin_signature_arg;
- FREE((void*)bitcoin_signature_arg);
- LDKAnnouncementSignatures ret = AnnouncementSignatures_new(channel_id_arg_ref, short_channel_id_arg, node_signature_arg_conv, bitcoin_signature_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKSignature node_signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, node_signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, node_signature_arg, 0, 64, node_signature_arg_ref.compact_form);
+ LDKSignature bitcoin_signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, bitcoin_signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, bitcoin_signature_arg, 0, 64, bitcoin_signature_arg_ref.compact_form);
+ LDKAnnouncementSignatures ret = AnnouncementSignatures_new(channel_id_arg_ref, short_channel_id_arg, node_signature_arg_ref, bitcoin_signature_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NetAddress_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return UnsignedNodeAnnouncement_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUnsignedNodeAnnouncement orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUnsignedNodeAnnouncement ret = UnsignedNodeAnnouncement_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1get_1features(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedNodeAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKNodeFeatures ret = UnsignedNodeAnnouncement_get_features(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKNodeFeatures val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return UnsignedNodeAnnouncement_set_features(&this_ptr_conv, val_conv);
}
return UnsignedNodeAnnouncement_set_timestamp(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1get_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1get_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedNodeAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = UnsignedNodeAnnouncement_get_node_id(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, UnsignedNodeAnnouncement_get_node_id(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1set_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1set_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKUnsignedNodeAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return UnsignedNodeAnnouncement_set_node_id(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return UnsignedNodeAnnouncement_set_node_id(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1get_1rgb(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ret_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1set_1rgb(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1set_1rgb(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKUnsignedNodeAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKThreeBytes val_conv = *(LDKThreeBytes*)val;
- FREE((void*)val);
- return UnsignedNodeAnnouncement_set_rgb(&this_ptr_conv, val_conv);
+ LDKThreeBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 3);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 3, val_ref.data);
+ return UnsignedNodeAnnouncement_set_rgb(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1get_1alias(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UnsignedNodeAnnouncement_set_alias(&this_ptr_conv, val_ref);
}
return NodeAnnouncement_free(this_ptr_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKNodeAnnouncement orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKNodeAnnouncement ret = NodeAnnouncement_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKNodeAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = NodeAnnouncement_get_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, NodeAnnouncement_get_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKNodeAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return NodeAnnouncement_set_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return NodeAnnouncement_set_signature(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1get_1contents(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKUnsignedNodeAnnouncement ret = NodeAnnouncement_get_contents(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1set_1contents(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKUnsignedNodeAnnouncement val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = UnsignedNodeAnnouncement_clone(&val_conv);
return NodeAnnouncement_set_contents(&this_ptr_conv, val_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1new(JNIEnv * _env, jclass _b, jlong signature_arg, jlong contents_arg) {
- LDKSignature signature_arg_conv = *(LDKSignature*)signature_arg;
- FREE((void*)signature_arg);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1new(JNIEnv * _env, jclass _b, jbyteArray signature_arg, jlong contents_arg) {
+ LDKSignature signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, signature_arg, 0, 64, signature_arg_ref.compact_form);
LDKUnsignedNodeAnnouncement contents_arg_conv;
contents_arg_conv.inner = (void*)(contents_arg & (~1));
contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0);
- LDKNodeAnnouncement ret = NodeAnnouncement_new(signature_arg_conv, contents_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ if (contents_arg_conv.inner != NULL)
+ contents_arg_conv = UnsignedNodeAnnouncement_clone(&contents_arg_conv);
+ LDKNodeAnnouncement ret = NodeAnnouncement_new(signature_arg_ref, contents_arg_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return UnsignedChannelAnnouncement_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUnsignedChannelAnnouncement orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUnsignedChannelAnnouncement ret = UnsignedChannelAnnouncement_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1features(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelFeatures ret = UnsignedChannelAnnouncement_get_features(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelFeatures val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return UnsignedChannelAnnouncement_set_features(&this_ptr_conv, val_conv);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UnsignedChannelAnnouncement_set_chain_hash(&this_ptr_conv, val_ref);
}
return UnsignedChannelAnnouncement_set_short_channel_id(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1node_1id_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1node_1id_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = UnsignedChannelAnnouncement_get_node_id_1(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, UnsignedChannelAnnouncement_get_node_id_1(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1node_1id_11(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1node_1id_11(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return UnsignedChannelAnnouncement_set_node_id_1(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return UnsignedChannelAnnouncement_set_node_id_1(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1node_1id_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1node_1id_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = UnsignedChannelAnnouncement_get_node_id_2(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, UnsignedChannelAnnouncement_get_node_id_2(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1node_1id_12(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1node_1id_12(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return UnsignedChannelAnnouncement_set_node_id_2(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return UnsignedChannelAnnouncement_set_node_id_2(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1bitcoin_1key_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1bitcoin_1key_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = UnsignedChannelAnnouncement_get_bitcoin_key_1(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, UnsignedChannelAnnouncement_get_bitcoin_key_1(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1bitcoin_1key_11(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1bitcoin_1key_11(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return UnsignedChannelAnnouncement_set_bitcoin_key_1(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return UnsignedChannelAnnouncement_set_bitcoin_key_1(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1bitcoin_1key_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1get_1bitcoin_1key_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = UnsignedChannelAnnouncement_get_bitcoin_key_2(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, UnsignedChannelAnnouncement_get_bitcoin_key_2(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1bitcoin_1key_12(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1set_1bitcoin_1key_12(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKUnsignedChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return UnsignedChannelAnnouncement_set_bitcoin_key_2(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return UnsignedChannelAnnouncement_set_bitcoin_key_2(&this_ptr_conv, val_ref);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ChannelAnnouncement_free(this_ptr_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1node_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelAnnouncement orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelAnnouncement ret = ChannelAnnouncement_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1node_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = ChannelAnnouncement_get_node_signature_1(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, ChannelAnnouncement_get_node_signature_1(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1node_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1node_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return ChannelAnnouncement_set_node_signature_1(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return ChannelAnnouncement_set_node_signature_1(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1node_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1node_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = ChannelAnnouncement_get_node_signature_2(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, ChannelAnnouncement_get_node_signature_2(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1node_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1node_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return ChannelAnnouncement_set_node_signature_2(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return ChannelAnnouncement_set_node_signature_2(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1bitcoin_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1bitcoin_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = ChannelAnnouncement_get_bitcoin_signature_1(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, ChannelAnnouncement_get_bitcoin_signature_1(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1bitcoin_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1bitcoin_1signature_11(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return ChannelAnnouncement_set_bitcoin_signature_1(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return ChannelAnnouncement_set_bitcoin_signature_1(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1bitcoin_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1bitcoin_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = ChannelAnnouncement_get_bitcoin_signature_2(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, ChannelAnnouncement_get_bitcoin_signature_2(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1bitcoin_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1bitcoin_1signature_12(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelAnnouncement this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return ChannelAnnouncement_set_bitcoin_signature_2(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return ChannelAnnouncement_set_bitcoin_signature_2(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1get_1contents(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKUnsignedChannelAnnouncement ret = ChannelAnnouncement_get_contents(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1set_1contents(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKUnsignedChannelAnnouncement val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = UnsignedChannelAnnouncement_clone(&val_conv);
return ChannelAnnouncement_set_contents(&this_ptr_conv, val_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1new(JNIEnv * _env, jclass _b, jlong node_signature_1_arg, jlong node_signature_2_arg, jlong bitcoin_signature_1_arg, jlong bitcoin_signature_2_arg, jlong contents_arg) {
- LDKSignature node_signature_1_arg_conv = *(LDKSignature*)node_signature_1_arg;
- FREE((void*)node_signature_1_arg);
- LDKSignature node_signature_2_arg_conv = *(LDKSignature*)node_signature_2_arg;
- FREE((void*)node_signature_2_arg);
- LDKSignature bitcoin_signature_1_arg_conv = *(LDKSignature*)bitcoin_signature_1_arg;
- FREE((void*)bitcoin_signature_1_arg);
- LDKSignature bitcoin_signature_2_arg_conv = *(LDKSignature*)bitcoin_signature_2_arg;
- FREE((void*)bitcoin_signature_2_arg);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1new(JNIEnv * _env, jclass _b, jbyteArray node_signature_1_arg, jbyteArray node_signature_2_arg, jbyteArray bitcoin_signature_1_arg, jbyteArray bitcoin_signature_2_arg, jlong contents_arg) {
+ LDKSignature node_signature_1_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, node_signature_1_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, node_signature_1_arg, 0, 64, node_signature_1_arg_ref.compact_form);
+ LDKSignature node_signature_2_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, node_signature_2_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, node_signature_2_arg, 0, 64, node_signature_2_arg_ref.compact_form);
+ LDKSignature bitcoin_signature_1_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, bitcoin_signature_1_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, bitcoin_signature_1_arg, 0, 64, bitcoin_signature_1_arg_ref.compact_form);
+ LDKSignature bitcoin_signature_2_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, bitcoin_signature_2_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, bitcoin_signature_2_arg, 0, 64, bitcoin_signature_2_arg_ref.compact_form);
LDKUnsignedChannelAnnouncement contents_arg_conv;
contents_arg_conv.inner = (void*)(contents_arg & (~1));
contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0);
- 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);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ if (contents_arg_conv.inner != NULL)
+ contents_arg_conv = UnsignedChannelAnnouncement_clone(&contents_arg_conv);
+ LDKChannelAnnouncement ret = ChannelAnnouncement_new(node_signature_1_arg_ref, node_signature_2_arg_ref, bitcoin_signature_1_arg_ref, bitcoin_signature_2_arg_ref, contents_arg_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return UnsignedChannelUpdate_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKUnsignedChannelUpdate orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKUnsignedChannelUpdate ret = UnsignedChannelUpdate_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKUnsignedChannelUpdate this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return UnsignedChannelUpdate_set_chain_hash(&this_ptr_conv, val_ref);
}
return ChannelUpdate_free(this_ptr_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelUpdate orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelUpdate ret = ChannelUpdate_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelUpdate this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = ChannelUpdate_get_signature(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, ChannelUpdate_get_signature(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1set_1signature(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelUpdate this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return ChannelUpdate_set_signature(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return ChannelUpdate_set_signature(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1get_1contents(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKUnsignedChannelUpdate ret = ChannelUpdate_get_contents(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1set_1contents(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKUnsignedChannelUpdate val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = UnsignedChannelUpdate_clone(&val_conv);
return ChannelUpdate_set_contents(&this_ptr_conv, val_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1new(JNIEnv * _env, jclass _b, jlong signature_arg, jlong contents_arg) {
- LDKSignature signature_arg_conv = *(LDKSignature*)signature_arg;
- FREE((void*)signature_arg);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1new(JNIEnv * _env, jclass _b, jbyteArray signature_arg, jlong contents_arg) {
+ LDKSignature signature_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, signature_arg) == 64);
+ (*_env)->GetByteArrayRegion (_env, signature_arg, 0, 64, signature_arg_ref.compact_form);
LDKUnsignedChannelUpdate contents_arg_conv;
contents_arg_conv.inner = (void*)(contents_arg & (~1));
contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0);
- LDKChannelUpdate ret = ChannelUpdate_new(signature_arg_conv, contents_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ if (contents_arg_conv.inner != NULL)
+ contents_arg_conv = UnsignedChannelUpdate_clone(&contents_arg_conv);
+ LDKChannelUpdate ret = ChannelUpdate_new(signature_arg_ref, contents_arg_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return QueryChannelRange_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKQueryChannelRange orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKQueryChannelRange ret = QueryChannelRange_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKQueryChannelRange this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return QueryChannelRange_set_chain_hash(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1new(JNIEnv * _env, jclass _b, jbyteArray chain_hash_arg, jint first_blocknum_arg, jint number_of_blocks_arg) {
LDKThirtyTwoBytes chain_hash_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, chain_hash_arg) == 32);
(*_env)->GetByteArrayRegion (_env, chain_hash_arg, 0, 32, chain_hash_arg_ref.data);
LDKQueryChannelRange ret = QueryChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ReplyChannelRange_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKReplyChannelRange orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKReplyChannelRange ret = ReplyChannelRange_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKReplyChannelRange this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return ReplyChannelRange_set_chain_hash(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1new(JNIEnv * _env, jclass _b, jbyteArray 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_ref;
+ CHECK((*_env)->GetArrayLength (_env, chain_hash_arg) == 32);
(*_env)->GetByteArrayRegion (_env, chain_hash_arg, 0, 32, chain_hash_arg_ref.data);
LDKCVec_u64Z short_channel_ids_arg_conv = *(LDKCVec_u64Z*)short_channel_ids_arg;
FREE((void*)short_channel_ids_arg);
LDKReplyChannelRange ret = ReplyChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg, full_information_arg, short_channel_ids_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return QueryShortChannelIds_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKQueryShortChannelIds orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKQueryShortChannelIds ret = QueryShortChannelIds_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKQueryShortChannelIds this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return QueryShortChannelIds_set_chain_hash(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1new(JNIEnv * _env, jclass _b, jbyteArray chain_hash_arg, jlong short_channel_ids_arg) {
LDKThirtyTwoBytes chain_hash_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, chain_hash_arg) == 32);
(*_env)->GetByteArrayRegion (_env, chain_hash_arg, 0, 32, chain_hash_arg_ref.data);
LDKCVec_u64Z short_channel_ids_arg_conv = *(LDKCVec_u64Z*)short_channel_ids_arg;
FREE((void*)short_channel_ids_arg);
LDKQueryShortChannelIds ret = QueryShortChannelIds_new(chain_hash_arg_ref, short_channel_ids_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ReplyShortChannelIdsEnd_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKReplyShortChannelIdsEnd orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKReplyShortChannelIdsEnd ret = ReplyShortChannelIdsEnd_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKReplyShortChannelIdsEnd this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return ReplyShortChannelIdsEnd_set_chain_hash(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1new(JNIEnv * _env, jclass _b, jbyteArray chain_hash_arg, jboolean full_information_arg) {
LDKThirtyTwoBytes chain_hash_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, chain_hash_arg) == 32);
(*_env)->GetByteArrayRegion (_env, chain_hash_arg, 0, 32, chain_hash_arg_ref.data);
LDKReplyShortChannelIdsEnd ret = ReplyShortChannelIdsEnd_new(chain_hash_arg_ref, full_information_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return GossipTimestampFilter_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKGossipTimestampFilter orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKGossipTimestampFilter ret = GossipTimestampFilter_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1get_1chain_1hash(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKGossipTimestampFilter this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return GossipTimestampFilter_set_chain_hash(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1new(JNIEnv * _env, jclass _b, jbyteArray chain_hash_arg, jint first_timestamp_arg, jint timestamp_range_arg) {
LDKThirtyTwoBytes chain_hash_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, chain_hash_arg) == 32);
(*_env)->GetByteArrayRegion (_env, chain_hash_arg, 0, 32, chain_hash_arg_ref.data);
LDKGossipTimestampFilter ret = GossipTimestampFilter_new(chain_hash_arg_ref, first_timestamp_arg, timestamp_range_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ErrorAction_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKErrorAction action_arg_conv = *(LDKErrorAction*)action_arg;
FREE((void*)action_arg);
LDKLightningError ret = LightningError_new(err_arg_conv, action_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return CommitmentUpdate_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKCommitmentUpdate orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKCommitmentUpdate ret = CommitmentUpdate_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1set_1update_1add_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKCommitmentUpdate this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKUpdateFee ret = CommitmentUpdate_get_update_fee(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1set_1update_1fee(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKUpdateFee val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = UpdateFee_clone(&val_conv);
return CommitmentUpdate_set_update_fee(&this_ptr_conv, val_conv);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKCommitmentSigned ret = CommitmentUpdate_get_commitment_signed(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentUpdate_1set_1commitment_1signed(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKCommitmentSigned val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = CommitmentSigned_clone(&val_conv);
return CommitmentUpdate_set_commitment_signed(&this_ptr_conv, val_conv);
}
LDKUpdateFee update_fee_arg_conv;
update_fee_arg_conv.inner = (void*)(update_fee_arg & (~1));
update_fee_arg_conv.is_owned = (update_fee_arg & 1) || (update_fee_arg == 0);
+ if (update_fee_arg_conv.inner != NULL)
+ update_fee_arg_conv = UpdateFee_clone(&update_fee_arg_conv);
LDKCommitmentSigned commitment_signed_arg_conv;
commitment_signed_arg_conv.inner = (void*)(commitment_signed_arg & (~1));
commitment_signed_arg_conv.is_owned = (commitment_signed_arg & 1) || (commitment_signed_arg == 0);
+ if (commitment_signed_arg_conv.inner != NULL)
+ commitment_signed_arg_conv = CommitmentSigned_clone(&commitment_signed_arg_conv);
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);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HTLCFailChannelUpdate_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKAcceptChannel ret = AcceptChannel_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AnnouncementSignatures_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKAnnouncementSignatures ret = AnnouncementSignatures_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelReestablish_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKChannelReestablish ret = ChannelReestablish_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ClosingSigned_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKClosingSigned ret = ClosingSigned_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKCommitmentSigned ret = CommitmentSigned_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKFundingCreated ret = FundingCreated_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingSigned_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKFundingSigned ret = FundingSigned_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingLocked_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKFundingLocked ret = FundingLocked_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Init_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Init_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKInit ret = Init_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKOpenChannel ret = OpenChannel_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RevokeAndACK_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKRevokeAndACK ret = RevokeAndACK_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Shutdown_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Shutdown_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKShutdown ret = Shutdown_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUpdateFailHTLC ret = UpdateFailHTLC_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUpdateFailMalformedHTLC ret = UpdateFailMalformedHTLC_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFee_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFee_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUpdateFee ret = UpdateFee_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFulfillHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUpdateFulfillHTLC ret = UpdateFulfillHTLC_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateAddHTLC_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUpdateAddHTLC ret = UpdateAddHTLC_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKPing ret = Ping_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKPong ret = Pong_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUnsignedChannelAnnouncement ret = UnsignedChannelAnnouncement_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKChannelAnnouncement ret = ChannelAnnouncement_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUnsignedChannelUpdate ret = UnsignedChannelUpdate_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelUpdate_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKChannelUpdate ret = ChannelUpdate_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ErrorMessage_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKErrorMessage ret = ErrorMessage_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedNodeAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKUnsignedNodeAnnouncement ret = UnsignedNodeAnnouncement_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncement_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKNodeAnnouncement ret = NodeAnnouncement_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKQueryShortChannelIds ret = QueryShortChannelIds_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryShortChannelIds_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKReplyShortChannelIdsEnd ret = ReplyShortChannelIdsEnd_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyShortChannelIdsEnd_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKQueryChannelRange ret = QueryChannelRange_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_QueryChannelRange_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKReplyChannelRange ret = ReplyChannelRange_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ReplyChannelRange_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKGossipTimestampFilter ret = GossipTimestampFilter_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_GossipTimestampFilter_1write(JNIEnv * _env, jclass _b, jlong obj) {
LDKRoutingMessageHandler_JCalls_clone(route_handler_arg_conv.this_arg);
}
LDKMessageHandler ret = MessageHandler_new(chan_handler_arg_conv, route_handler_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_SocketDescriptor_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerHandleError_1new(JNIEnv * _env, jclass _b, jboolean no_connection_possible_arg) {
LDKPeerHandleError ret = PeerHandleError_new(no_connection_possible_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_PeerManager_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
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) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1new(JNIEnv * _env, jclass _b, jlong message_handler, jbyteArray our_node_secret, jbyteArray ephemeral_random_data, jlong logger) {
LDKMessageHandler message_handler_conv;
message_handler_conv.inner = (void*)(message_handler & (~1));
message_handler_conv.is_owned = (message_handler & 1) || (message_handler == 0);
- LDKSecretKey our_node_secret_conv = *(LDKSecretKey*)our_node_secret;
- FREE((void*)our_node_secret);
+ // Warning: we may need a move here but can't clone!
+ LDKSecretKey our_node_secret_ref;
+ CHECK((*_env)->GetArrayLength (_env, our_node_secret) == 32);
+ (*_env)->GetByteArrayRegion (_env, our_node_secret, 0, 32, our_node_secret_ref.bytes);
unsigned char ephemeral_random_data_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, ephemeral_random_data) == 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;
// 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 = PeerManager_new(message_handler_conv, our_node_secret_conv, ephemeral_random_data_ref, logger_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKPeerManager ret = PeerManager_new(message_handler_conv, our_node_secret_ref, ephemeral_random_data_ref, logger_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1get_1peer_1node_1ids(JNIEnv * _env, jclass _b, jlong this_arg) {
return (long)ret;
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1new_1outbound_1connection(JNIEnv * _env, jclass _b, jlong this_arg, jlong their_node_id, jlong descriptor) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PeerManager_1new_1outbound_1connection(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray their_node_id, jlong descriptor) {
LDKPeerManager this_arg_conv;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
- LDKPublicKey their_node_id_conv = *(LDKPublicKey*)their_node_id;
- FREE((void*)their_node_id);
+ LDKPublicKey their_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, their_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, their_node_id, 0, 33, their_node_id_ref.compressed_form);
LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)descriptor;
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);
+ *ret = PeerManager_new_outbound_connection(&this_arg_conv, their_node_id_ref, descriptor_conv);
return (long)ret;
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_build_1commitment_1secret(JNIEnv * _env, jclass _b, jbyteArray commitment_seed, jlong idx) {
unsigned char commitment_seed_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, commitment_seed) == 32);
(*_env)->GetByteArrayRegion (_env, commitment_seed, 0, 32, commitment_seed_arr);
unsigned char (*commitment_seed_ref)[32] = &commitment_seed_arr;
- jbyteArray _arr = (*_env)->NewByteArray(_env, 32);
- (*_env)->SetByteArrayRegion(_env, _arr, 0, 32, build_commitment_secret(commitment_seed_ref, idx).data);
- return _arr;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 32);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 32, build_commitment_secret(commitment_seed_ref, idx).data);
+ return arg_arr;
}
-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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_derive_1private_1key(JNIEnv * _env, jclass _b, jbyteArray per_commitment_point, jbyteArray base_secret) {
+ LDKPublicKey per_commitment_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, per_commitment_point, 0, 33, per_commitment_point_ref.compressed_form);
unsigned char base_secret_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, base_secret) == 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);
+ *ret = derive_private_key(per_commitment_point_ref, 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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_derive_1public_1key(JNIEnv * _env, jclass _b, jbyteArray per_commitment_point, jbyteArray base_point) {
+ LDKPublicKey per_commitment_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, per_commitment_point, 0, 33, per_commitment_point_ref.compressed_form);
+ LDKPublicKey base_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, base_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, base_point, 0, 33, base_point_ref.compressed_form);
LDKCResult_PublicKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_PublicKeySecpErrorZ), "LDKCResult_PublicKeySecpErrorZ");
- *ret = derive_public_key(per_commitment_point_conv, base_point_conv);
+ *ret = derive_public_key(per_commitment_point_ref, base_point_ref);
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];
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_secret) == 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];
+ CHECK((*_env)->GetArrayLength (_env, countersignatory_revocation_base_secret) == 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");
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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_derive_1public_1revocation_1key(JNIEnv * _env, jclass _b, jbyteArray per_commitment_point, jbyteArray countersignatory_revocation_base_point) {
+ LDKPublicKey per_commitment_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, per_commitment_point, 0, 33, per_commitment_point_ref.compressed_form);
+ LDKPublicKey countersignatory_revocation_base_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, countersignatory_revocation_base_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, countersignatory_revocation_base_point, 0, 33, countersignatory_revocation_base_point_ref.compressed_form);
LDKCResult_PublicKeySecpErrorZ* ret = MALLOC(sizeof(LDKCResult_PublicKeySecpErrorZ), "LDKCResult_PublicKeySecpErrorZ");
- *ret = derive_public_revocation_key(per_commitment_point_conv, countersignatory_revocation_base_point_conv);
+ *ret = derive_public_revocation_key(per_commitment_point_ref, countersignatory_revocation_base_point_ref);
return (long)ret;
}
return TxCreationKeys_free(this_ptr_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKTxCreationKeys orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKTxCreationKeys ret = TxCreationKeys_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = TxCreationKeys_get_per_commitment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, TxCreationKeys_get_per_commitment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return TxCreationKeys_set_per_commitment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return TxCreationKeys_set_per_commitment_point(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1revocation_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1revocation_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = TxCreationKeys_get_revocation_key(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, TxCreationKeys_get_revocation_key(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1revocation_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1revocation_1key(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return TxCreationKeys_set_revocation_key(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return TxCreationKeys_set_revocation_key(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1broadcaster_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1broadcaster_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = TxCreationKeys_get_broadcaster_htlc_key(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, TxCreationKeys_get_broadcaster_htlc_key(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1broadcaster_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, jbyteArray val) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return TxCreationKeys_set_broadcaster_htlc_key(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return TxCreationKeys_set_broadcaster_htlc_key(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1countersignatory_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1countersignatory_1htlc_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = TxCreationKeys_get_countersignatory_htlc_key(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, TxCreationKeys_get_countersignatory_htlc_key(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1countersignatory_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, jbyteArray val) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return TxCreationKeys_set_countersignatory_htlc_key(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return TxCreationKeys_set_countersignatory_htlc_key(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1broadcaster_1delayed_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1get_1broadcaster_1delayed_1payment_1key(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = TxCreationKeys_get_broadcaster_delayed_payment_key(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, TxCreationKeys_get_broadcaster_delayed_payment_key(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1set_1broadcaster_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, jbyteArray val) {
LDKTxCreationKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- 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 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 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 = 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);
- return ((long)ret.inner) | 1;
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return TxCreationKeys_set_broadcaster_delayed_payment_key(&this_ptr_conv, val_ref);
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1new(JNIEnv * _env, jclass _b, jbyteArray per_commitment_point_arg, jbyteArray revocation_key_arg, jbyteArray broadcaster_htlc_key_arg, jbyteArray countersignatory_htlc_key_arg, jbyteArray broadcaster_delayed_payment_key_arg) {
+ LDKPublicKey per_commitment_point_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_point_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, per_commitment_point_arg, 0, 33, per_commitment_point_arg_ref.compressed_form);
+ LDKPublicKey revocation_key_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, revocation_key_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, revocation_key_arg, 0, 33, revocation_key_arg_ref.compressed_form);
+ LDKPublicKey broadcaster_htlc_key_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, broadcaster_htlc_key_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, broadcaster_htlc_key_arg, 0, 33, broadcaster_htlc_key_arg_ref.compressed_form);
+ LDKPublicKey countersignatory_htlc_key_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, countersignatory_htlc_key_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, countersignatory_htlc_key_arg, 0, 33, countersignatory_htlc_key_arg_ref.compressed_form);
+ LDKPublicKey broadcaster_delayed_payment_key_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, broadcaster_delayed_payment_key_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, broadcaster_delayed_payment_key_arg, 0, 33, broadcaster_delayed_payment_key_arg_ref.compressed_form);
+ LDKTxCreationKeys ret = TxCreationKeys_new(per_commitment_point_arg_ref, revocation_key_arg_ref, broadcaster_htlc_key_arg_ref, countersignatory_htlc_key_arg_ref, broadcaster_delayed_payment_key_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKTxCreationKeys ret = TxCreationKeys_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKTxCreationKeys keys_conv;
keys_conv.inner = (void*)(keys & (~1));
keys_conv.is_owned = (keys & 1) || (keys == 0);
+ if (keys_conv.inner != NULL)
+ keys_conv = TxCreationKeys_clone(&keys_conv);
LDKPreCalculatedTxCreationKeys ret = PreCalculatedTxCreationKeys_new(keys_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1trust_1key_1derivation(JNIEnv * _env, jclass _b, jlong this_arg) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
LDKTxCreationKeys ret = PreCalculatedTxCreationKeys_trust_key_derivation(&this_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_arg) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_PreCalculatedTxCreationKeys_1per_1commitment_1point(JNIEnv * _env, jclass _b, jlong this_arg) {
LDKPreCalculatedTxCreationKeys this_arg_conv;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = PreCalculatedTxCreationKeys_per_commitment_point(&this_arg_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, PreCalculatedTxCreationKeys_per_commitment_point(&this_arg_conv).compressed_form);
+ return arg_arr;
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return ChannelPublicKeys_free(this_ptr_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKChannelPublicKeys orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKChannelPublicKeys ret = ChannelPublicKeys_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelPublicKeys_get_funding_pubkey(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelPublicKeys_get_funding_pubkey(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelPublicKeys_set_funding_pubkey(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelPublicKeys_set_funding_pubkey(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelPublicKeys_get_revocation_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelPublicKeys_get_revocation_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1revocation_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelPublicKeys_set_revocation_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelPublicKeys_set_revocation_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelPublicKeys_get_payment_point(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelPublicKeys_get_payment_point(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1payment_1point(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelPublicKeys_set_payment_point(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelPublicKeys_set_payment_point(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelPublicKeys_get_delayed_payment_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelPublicKeys_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1delayed_1payment_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelPublicKeys_set_delayed_payment_basepoint(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelPublicKeys_set_delayed_payment_basepoint(&this_ptr_conv, val_ref);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1get_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelPublicKeys_get_htlc_basepoint(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelPublicKeys_get_htlc_basepoint(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1set_1htlc_1basepoint(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelPublicKeys this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelPublicKeys_set_htlc_basepoint(&this_ptr_conv, val_conv);
-}
-
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1new(JNIEnv * _env, jclass _b, jlong funding_pubkey_arg, jlong revocation_basepoint_arg, jlong payment_point_arg, jlong delayed_payment_basepoint_arg, jlong htlc_basepoint_arg) {
- LDKPublicKey funding_pubkey_arg_conv = *(LDKPublicKey*)funding_pubkey_arg;
- FREE((void*)funding_pubkey_arg);
- LDKPublicKey revocation_basepoint_arg_conv = *(LDKPublicKey*)revocation_basepoint_arg;
- FREE((void*)revocation_basepoint_arg);
- LDKPublicKey payment_point_arg_conv = *(LDKPublicKey*)payment_point_arg;
- FREE((void*)payment_point_arg);
- LDKPublicKey delayed_payment_basepoint_arg_conv = *(LDKPublicKey*)delayed_payment_basepoint_arg;
- FREE((void*)delayed_payment_basepoint_arg);
- LDKPublicKey htlc_basepoint_arg_conv = *(LDKPublicKey*)htlc_basepoint_arg;
- FREE((void*)htlc_basepoint_arg);
- 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);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelPublicKeys_set_htlc_basepoint(&this_ptr_conv, val_ref);
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1new(JNIEnv * _env, jclass _b, jbyteArray funding_pubkey_arg, jbyteArray revocation_basepoint_arg, jbyteArray payment_point_arg, jbyteArray delayed_payment_basepoint_arg, jbyteArray htlc_basepoint_arg) {
+ LDKPublicKey funding_pubkey_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, funding_pubkey_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, funding_pubkey_arg, 0, 33, funding_pubkey_arg_ref.compressed_form);
+ LDKPublicKey revocation_basepoint_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, revocation_basepoint_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, revocation_basepoint_arg, 0, 33, revocation_basepoint_arg_ref.compressed_form);
+ LDKPublicKey payment_point_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, payment_point_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, payment_point_arg, 0, 33, payment_point_arg_ref.compressed_form);
+ LDKPublicKey delayed_payment_basepoint_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, delayed_payment_basepoint_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, delayed_payment_basepoint_arg, 0, 33, delayed_payment_basepoint_arg_ref.compressed_form);
+ LDKPublicKey htlc_basepoint_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, htlc_basepoint_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, htlc_basepoint_arg, 0, 33, htlc_basepoint_arg_ref.compressed_form);
+ LDKChannelPublicKeys ret = ChannelPublicKeys_new(funding_pubkey_arg_ref, revocation_basepoint_arg_ref, payment_point_arg_ref, delayed_payment_basepoint_arg_ref, htlc_basepoint_arg_ref);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelPublicKeys_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKChannelPublicKeys ret = ChannelPublicKeys_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
-}
-
-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 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);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1derive_1new(JNIEnv * _env, jclass _b, jbyteArray per_commitment_point, jbyteArray broadcaster_delayed_payment_base, jbyteArray broadcaster_htlc_base, jbyteArray countersignatory_revocation_base, jbyteArray countersignatory_htlc_base) {
+ LDKPublicKey per_commitment_point_ref;
+ CHECK((*_env)->GetArrayLength (_env, per_commitment_point) == 33);
+ (*_env)->GetByteArrayRegion (_env, per_commitment_point, 0, 33, per_commitment_point_ref.compressed_form);
+ LDKPublicKey broadcaster_delayed_payment_base_ref;
+ CHECK((*_env)->GetArrayLength (_env, broadcaster_delayed_payment_base) == 33);
+ (*_env)->GetByteArrayRegion (_env, broadcaster_delayed_payment_base, 0, 33, broadcaster_delayed_payment_base_ref.compressed_form);
+ LDKPublicKey broadcaster_htlc_base_ref;
+ CHECK((*_env)->GetArrayLength (_env, broadcaster_htlc_base) == 33);
+ (*_env)->GetByteArrayRegion (_env, broadcaster_htlc_base, 0, 33, broadcaster_htlc_base_ref.compressed_form);
+ LDKPublicKey countersignatory_revocation_base_ref;
+ CHECK((*_env)->GetArrayLength (_env, countersignatory_revocation_base) == 33);
+ (*_env)->GetByteArrayRegion (_env, countersignatory_revocation_base, 0, 33, countersignatory_revocation_base_ref.compressed_form);
+ LDKPublicKey countersignatory_htlc_base_ref;
+ CHECK((*_env)->GetArrayLength (_env, countersignatory_htlc_base) == 33);
+ (*_env)->GetByteArrayRegion (_env, countersignatory_htlc_base, 0, 33, countersignatory_htlc_base_ref.compressed_form);
LDKCResult_TxCreationKeysSecpErrorZ* ret = MALLOC(sizeof(LDKCResult_TxCreationKeysSecpErrorZ), "LDKCResult_TxCreationKeysSecpErrorZ");
- *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);
+ *ret = TxCreationKeys_derive_new(per_commitment_point_ref, broadcaster_delayed_payment_base_ref, broadcaster_htlc_base_ref, countersignatory_revocation_base_ref, countersignatory_htlc_base_ref);
return (long)ret;
}
-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 broadcaster_delayed_payment_key_conv = *(LDKPublicKey*)broadcaster_delayed_payment_key;
- FREE((void*)broadcaster_delayed_payment_key);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1revokeable_1redeemscript(JNIEnv * _env, jclass _b, jbyteArray revocation_key, jshort contest_delay, jbyteArray broadcaster_delayed_payment_key) {
+ LDKPublicKey revocation_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, revocation_key) == 33);
+ (*_env)->GetByteArrayRegion (_env, revocation_key, 0, 33, revocation_key_ref.compressed_form);
+ LDKPublicKey broadcaster_delayed_payment_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, broadcaster_delayed_payment_key) == 33);
+ (*_env)->GetByteArrayRegion (_env, broadcaster_delayed_payment_key, 0, 33, broadcaster_delayed_payment_key_ref.compressed_form);
LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z");
- *ret = get_revokeable_redeemscript(revocation_key_conv, contest_delay, broadcaster_delayed_payment_key_conv);
+ *ret = get_revokeable_redeemscript(revocation_key_ref, contest_delay, broadcaster_delayed_payment_key_ref);
return (long)ret;
}
return HTLCOutputInCommitment_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCOutputInCommitment_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKHTLCOutputInCommitment orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKHTLCOutputInCommitment ret = HTLCOutputInCommitment_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jboolean JNICALL Java_org_ldk_impl_bindings_HTLCOutputInCommitment_1get_1offered(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKHTLCOutputInCommitment this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return HTLCOutputInCommitment_set_payment_hash(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HTLCOutputInCommitment_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKHTLCOutputInCommitment ret = HTLCOutputInCommitment_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1htlc_1redeemscript(JNIEnv * _env, jclass _b, jlong htlc, jlong keys) {
return (long)ret;
}
-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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_make_1funding_1redeemscript(JNIEnv * _env, jclass _b, jbyteArray broadcaster, jbyteArray countersignatory) {
+ LDKPublicKey broadcaster_ref;
+ CHECK((*_env)->GetArrayLength (_env, broadcaster) == 33);
+ (*_env)->GetByteArrayRegion (_env, broadcaster, 0, 33, broadcaster_ref.compressed_form);
+ LDKPublicKey countersignatory_ref;
+ CHECK((*_env)->GetArrayLength (_env, countersignatory) == 33);
+ (*_env)->GetByteArrayRegion (_env, countersignatory, 0, 33, countersignatory_ref.compressed_form);
LDKCVec_u8Z* ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z");
- *ret = make_funding_redeemscript(broadcaster_conv, countersignatory_conv);
+ *ret = make_funding_redeemscript(broadcaster_ref, countersignatory_ref);
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 contest_delay, jlong htlc, jlong broadcaster_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, jbyteArray broadcaster_delayed_payment_key, jbyteArray revocation_key) {
unsigned char prev_hash_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, prev_hash) == 32);
(*_env)->GetByteArrayRegion (_env, prev_hash, 0, 32, prev_hash_arr);
unsigned char (*prev_hash_ref)[32] = &prev_hash_arr;
LDKHTLCOutputInCommitment htlc_conv;
htlc_conv.inner = (void*)(htlc & (~1));
htlc_conv.is_owned = (htlc & 1) || (htlc == 0);
- 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);
+ LDKPublicKey broadcaster_delayed_payment_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, broadcaster_delayed_payment_key) == 33);
+ (*_env)->GetByteArrayRegion (_env, broadcaster_delayed_payment_key, 0, 33, broadcaster_delayed_payment_key_ref.compressed_form);
+ LDKPublicKey revocation_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, revocation_key) == 33);
+ (*_env)->GetByteArrayRegion (_env, revocation_key, 0, 33, revocation_key_ref.compressed_form);
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);
+ *ret = build_htlc_transaction(prev_hash_ref, feerate_per_kw, contest_delay, &htlc_conv, broadcaster_delayed_payment_key_ref, revocation_key_ref);
return (long)ret;
}
return HolderCommitmentTransaction_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKHolderCommitmentTransaction orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKHolderCommitmentTransaction ret = HolderCommitmentTransaction_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1unsigned_1tx(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKHolderCommitmentTransaction this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
return HolderCommitmentTransaction_set_unsigned_tx(&this_ptr_conv, val_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1counterparty_1sig(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1counterparty_1sig(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKHolderCommitmentTransaction this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = HolderCommitmentTransaction_get_counterparty_sig(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, HolderCommitmentTransaction_get_counterparty_sig(&this_ptr_conv).compact_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1set_1counterparty_1sig(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1set_1counterparty_1sig(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKHolderCommitmentTransaction this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKSignature val_conv = *(LDKSignature*)val;
- FREE((void*)val);
- return HolderCommitmentTransaction_set_counterparty_sig(&this_ptr_conv, val_conv);
+ LDKSignature val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 64);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 64, val_ref.compact_form);
+ return HolderCommitmentTransaction_set_counterparty_sig(&this_ptr_conv, val_ref);
}
JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1get_1feerate_1per_1kw(JNIEnv * _env, jclass _b, jlong this_ptr) {
return HolderCommitmentTransaction_set_per_htlc(&this_ptr_conv, val_conv);
}
-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) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1new_1missing_1holder_1sig(JNIEnv * _env, jclass _b, jlong unsigned_tx, jbyteArray counterparty_sig, jbyteArray holder_funding_key, jbyteArray counterparty_funding_key, jlong keys, jint feerate_per_kw, jlong htlc_data) {
LDKTransaction unsigned_tx_conv = *(LDKTransaction*)unsigned_tx;
FREE((void*)unsigned_tx);
- 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);
+ LDKSignature counterparty_sig_ref;
+ CHECK((*_env)->GetArrayLength (_env, counterparty_sig) == 64);
+ (*_env)->GetByteArrayRegion (_env, counterparty_sig, 0, 64, counterparty_sig_ref.compact_form);
+ LDKPublicKey holder_funding_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, holder_funding_key) == 33);
+ (*_env)->GetByteArrayRegion (_env, holder_funding_key, 0, 33, holder_funding_key_ref.compressed_form);
+ LDKPublicKey counterparty_funding_key_ref;
+ CHECK((*_env)->GetArrayLength (_env, counterparty_funding_key) == 33);
+ (*_env)->GetByteArrayRegion (_env, counterparty_funding_key, 0, 33, counterparty_funding_key_ref.compressed_form);
LDKTxCreationKeys keys_conv;
keys_conv.inner = (void*)(keys & (~1));
keys_conv.is_owned = (keys & 1) || (keys == 0);
+ if (keys_conv.inner != NULL)
+ keys_conv = TxCreationKeys_clone(&keys_conv);
LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ htlc_data_conv = *(LDKCVec_C2Tuple_HTLCOutputInCommitmentSignatureZZ*)htlc_data;
FREE((void*)htlc_data);
- 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);
- return ((long)ret.inner) | 1;
+ LDKHolderCommitmentTransaction ret = HolderCommitmentTransaction_new_missing_holder_sig(unsigned_tx_conv, counterparty_sig_ref, holder_funding_key_ref, counterparty_funding_key_ref, keys_conv, feerate_per_kw, htlc_data_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1trust_1key_1derivation(JNIEnv * _env, jclass _b, jlong this_arg) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
LDKTxCreationKeys ret = HolderCommitmentTransaction_trust_key_derivation(&this_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1txid(JNIEnv * _env, jclass _b, jlong this_arg) {
LDKHolderCommitmentTransaction this_arg_conv;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
- jbyteArray _arr = (*_env)->NewByteArray(_env, 32);
- (*_env)->SetByteArrayRegion(_env, _arr, 0, 32, HolderCommitmentTransaction_txid(&this_arg_conv).data);
- return _arr;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 32);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 32, HolderCommitmentTransaction_txid(&this_arg_conv).data);
+ return arg_arr;
}
-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) {
+JNIEXPORT jbyteArray 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;
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char funding_key_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, funding_key) == 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;
- LDKSignature* ret = MALLOC(sizeof(LDKSignature), "LDKSignature");
- *ret = HolderCommitmentTransaction_get_holder_sig(&this_arg_conv, funding_key_ref, funding_redeemscript_conv, channel_value_satoshis);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 64);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 64, HolderCommitmentTransaction_get_holder_sig(&this_arg_conv, funding_key_ref, funding_redeemscript_conv, channel_value_satoshis).compact_form);
+ return arg_arr;
}
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) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
unsigned char htlc_base_key_arr[32];
+ CHECK((*_env)->GetArrayLength (_env, htlc_base_key) == 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");
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_HolderCommitmentTransaction_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKHolderCommitmentTransaction ret = HolderCommitmentTransaction_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_InitFeatures_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return RouteHop_free(this_ptr_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1get_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKRouteHop orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKRouteHop ret = RouteHop_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_RouteHop_1get_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKRouteHop this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = RouteHop_get_pubkey(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, RouteHop_get_pubkey(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKRouteHop this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return RouteHop_set_pubkey(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return RouteHop_set_pubkey(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1get_1node_1features(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKNodeFeatures ret = RouteHop_get_node_features(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1node_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKNodeFeatures val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return RouteHop_set_node_features(&this_ptr_conv, val_conv);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelFeatures ret = RouteHop_get_channel_features(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHop_1set_1channel_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelFeatures val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return RouteHop_set_channel_features(&this_ptr_conv, val_conv);
}
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);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHop_1new(JNIEnv * _env, jclass _b, jbyteArray 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_ref;
+ CHECK((*_env)->GetArrayLength (_env, pubkey_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, pubkey_arg, 0, 33, pubkey_arg_ref.compressed_form);
LDKNodeFeatures node_features_arg_conv;
node_features_arg_conv.inner = (void*)(node_features_arg & (~1));
node_features_arg_conv.is_owned = (node_features_arg & 1) || (node_features_arg == 0);
+ // Warning: we may need a move here but can't clone!
LDKChannelFeatures channel_features_arg_conv;
channel_features_arg_conv.inner = (void*)(channel_features_arg & (~1));
channel_features_arg_conv.is_owned = (channel_features_arg & 1) || (channel_features_arg == 0);
- 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);
- return ((long)ret.inner) | 1;
+ // Warning: we may need a move here but can't clone!
+ LDKRouteHop ret = RouteHop_new(pubkey_arg_ref, node_features_arg_conv, short_channel_id_arg, channel_features_arg_conv, fee_msat_arg, cltv_expiry_delta_arg);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Route_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return Route_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Route_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKRoute orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKRoute ret = Route_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Route_1set_1paths(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKRoute this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
LDKCVec_CVec_RouteHopZZ paths_arg_conv = *(LDKCVec_CVec_RouteHopZZ*)paths_arg;
FREE((void*)paths_arg);
LDKRoute ret = Route_new(paths_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Route_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Route_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKRoute ret = Route_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return RouteHint_free(this_ptr_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1src_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKRouteHint orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKRouteHint ret = RouteHint_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1src_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKRouteHint this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = RouteHint_get_src_node_id(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, RouteHint_get_src_node_id(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1src_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1src_1node_1id(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKRouteHint this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return RouteHint_set_src_node_id(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return RouteHint_set_src_node_id(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1short_1channel_1id(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKRoutingFees ret = RouteHint_get_fees(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1fees(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKRoutingFees val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = RoutingFees_clone(&val_conv);
return RouteHint_set_fees(&this_ptr_conv, val_conv);
}
return RouteHint_set_htlc_minimum_msat(&this_ptr_conv, val);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1new(JNIEnv * _env, jclass _b, jlong src_node_id_arg, jlong short_channel_id_arg, jlong fees_arg, jshort cltv_expiry_delta_arg, jlong htlc_minimum_msat_arg) {
- LDKPublicKey src_node_id_arg_conv = *(LDKPublicKey*)src_node_id_arg;
- FREE((void*)src_node_id_arg);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1new(JNIEnv * _env, jclass _b, jbyteArray src_node_id_arg, jlong short_channel_id_arg, jlong fees_arg, jshort cltv_expiry_delta_arg, jlong htlc_minimum_msat_arg) {
+ LDKPublicKey src_node_id_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, src_node_id_arg) == 33);
+ (*_env)->GetByteArrayRegion (_env, src_node_id_arg, 0, 33, src_node_id_arg_ref.compressed_form);
LDKRoutingFees fees_arg_conv;
fees_arg_conv.inner = (void*)(fees_arg & (~1));
fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0);
- LDKRouteHint ret = RouteHint_new(src_node_id_arg_conv, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg, htlc_minimum_msat_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ if (fees_arg_conv.inner != NULL)
+ fees_arg_conv = RoutingFees_clone(&fees_arg_conv);
+ LDKRouteHint ret = RouteHint_new(src_node_id_arg_ref, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg, htlc_minimum_msat_arg);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1route(JNIEnv * _env, jclass _b, jlong our_node_id, jlong network, jlong target, jlong first_hops, jlong last_hops, jlong final_value_msat, jint final_cltv, jlong logger) {
- LDKPublicKey our_node_id_conv = *(LDKPublicKey*)our_node_id;
- FREE((void*)our_node_id);
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1route(JNIEnv * _env, jclass _b, jbyteArray our_node_id, jlong network, jbyteArray target, jlong first_hops, jlong last_hops, jlong final_value_msat, jint final_cltv, jlong logger) {
+ LDKPublicKey our_node_id_ref;
+ CHECK((*_env)->GetArrayLength (_env, our_node_id) == 33);
+ (*_env)->GetByteArrayRegion (_env, our_node_id, 0, 33, our_node_id_ref.compressed_form);
LDKNetworkGraph network_conv;
network_conv.inner = (void*)(network & (~1));
network_conv.is_owned = (network & 1) || (network == 0);
- LDKPublicKey target_conv = *(LDKPublicKey*)target;
- FREE((void*)target);
+ LDKPublicKey target_ref;
+ CHECK((*_env)->GetArrayLength (_env, target) == 33);
+ (*_env)->GetByteArrayRegion (_env, target, 0, 33, target_ref.compressed_form);
LDKCVec_ChannelDetailsZ* first_hops_conv = (LDKCVec_ChannelDetailsZ*)first_hops;
LDKCVec_RouteHintZ last_hops_conv = *(LDKCVec_RouteHintZ*)last_hops;
FREE((void*)last_hops);
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);
+ *ret = get_route(our_node_id_ref, &network_conv, target_ref, first_hops_conv, last_hops_conv, final_value_msat, final_cltv, logger_conv);
return (long)ret;
}
LDKLogger_JCalls_clone(logger_conv.this_arg);
}
LDKNetGraphMsgHandler ret = NetGraphMsgHandler_new(chain_access_conv, logger_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1from_1net_1graph(JNIEnv * _env, jclass _b, jlong chain_access, jlong logger, jlong network_graph) {
LDKNetworkGraph network_graph_conv;
network_graph_conv.inner = (void*)(network_graph & (~1));
network_graph_conv.is_owned = (network_graph & 1) || (network_graph == 0);
+ // Warning: we may need a move here but can't clone!
LDKNetGraphMsgHandler ret = NetGraphMsgHandler_from_net_graph(chain_access_conv, logger_conv, network_graph_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1read_1locked_1graph(JNIEnv * _env, jclass _b, jlong this_arg) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
LDKLockedNetworkGraph ret = NetGraphMsgHandler_read_locked_graph(&this_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LockedNetworkGraph_1graph(JNIEnv * _env, jclass _b, jlong this_arg) {
this_arg_conv.inner = (void*)(this_arg & (~1));
this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
LDKNetworkGraph ret = LockedNetworkGraph_graph(&this_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetGraphMsgHandler_1as_1RoutingMessageHandler(JNIEnv * _env, jclass _b, jlong this_arg) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelUpdate ret = DirectionalChannelInfo_get_last_update_message(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1last_1update_1message(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelUpdate val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = ChannelUpdate_clone(&val_conv);
return DirectionalChannelInfo_set_last_update_message(&this_ptr_conv, val_conv);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKDirectionalChannelInfo ret = DirectionalChannelInfo_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelFeatures ret = ChannelInfo_get_features(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelFeatures val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
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) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1node_1one(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelInfo this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelInfo_get_node_one(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelInfo_get_node_one(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1node_1one(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1node_1one(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelInfo this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelInfo_set_node_one(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelInfo_set_node_one(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1one_1to_1two(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKDirectionalChannelInfo ret = ChannelInfo_get_one_to_two(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1one_1to_1two(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKDirectionalChannelInfo val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return ChannelInfo_set_one_to_two(&this_ptr_conv, val_conv);
}
-JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1node_1two(JNIEnv * _env, jclass _b, jlong this_ptr) {
+JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1node_1two(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKChannelInfo this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey* ret = MALLOC(sizeof(LDKPublicKey), "LDKPublicKey");
- *ret = ChannelInfo_get_node_two(&this_ptr_conv);
- return (long)ret;
+ jbyteArray arg_arr = (*_env)->NewByteArray(_env, 33);
+ (*_env)->SetByteArrayRegion(_env, arg_arr, 0, 33, ChannelInfo_get_node_two(&this_ptr_conv).compressed_form);
+ return arg_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1node_1two(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1node_1two(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKChannelInfo this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKPublicKey val_conv = *(LDKPublicKey*)val;
- FREE((void*)val);
- return ChannelInfo_set_node_two(&this_ptr_conv, val_conv);
+ LDKPublicKey val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 33);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 33, val_ref.compressed_form);
+ return ChannelInfo_set_node_two(&this_ptr_conv, val_ref);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1get_1two_1to_1one(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKDirectionalChannelInfo ret = ChannelInfo_get_two_to_one(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1two_1to_1one(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKDirectionalChannelInfo val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return ChannelInfo_set_two_to_one(&this_ptr_conv, val_conv);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKChannelAnnouncement ret = ChannelInfo_get_announcement_message(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1set_1announcement_1message(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKChannelAnnouncement val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = ChannelAnnouncement_clone(&val_conv);
return ChannelInfo_set_announcement_message(&this_ptr_conv, val_conv);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelInfo_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKChannelInfo ret = ChannelInfo_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RoutingFees_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
return RoutingFees_free(this_ptr_conv);
}
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingFees_1clone(JNIEnv * _env, jclass _b, jlong orig) {
+ LDKRoutingFees orig_conv;
+ orig_conv.inner = (void*)(orig & (~1));
+ orig_conv.is_owned = (orig & 1) || (orig == 0);
+ LDKRoutingFees ret = RoutingFees_clone(&orig_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
+}
+
JNIEXPORT jint JNICALL Java_org_ldk_impl_bindings_RoutingFees_1get_1base_1msat(JNIEnv * _env, jclass _b, jlong this_ptr) {
LDKRoutingFees this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingFees_1new(JNIEnv * _env, jclass _b, jint base_msat_arg, jint proportional_millionths_arg) {
LDKRoutingFees ret = RoutingFees_new(base_msat_arg, proportional_millionths_arg);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingFees_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKRoutingFees ret = RoutingFees_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RoutingFees_1write(JNIEnv * _env, jclass _b, jlong obj) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKNodeFeatures ret = NodeAnnouncementInfo_get_features(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1set_1features(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKNodeFeatures val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return NodeAnnouncementInfo_set_features(&this_ptr_conv, val_conv);
}
return ret_arr;
}
-JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1set_1rgb(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
+JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1set_1rgb(JNIEnv * _env, jclass _b, jlong this_ptr, jbyteArray val) {
LDKNodeAnnouncementInfo this_ptr_conv;
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
- LDKThreeBytes val_conv = *(LDKThreeBytes*)val;
- FREE((void*)val);
- return NodeAnnouncementInfo_set_rgb(&this_ptr_conv, val_conv);
+ LDKThreeBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 3);
+ (*_env)->GetByteArrayRegion (_env, val, 0, 3, val_ref.data);
+ return NodeAnnouncementInfo_set_rgb(&this_ptr_conv, val_ref);
}
JNIEXPORT jbyteArray JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1get_1alias(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKThirtyTwoBytes val_ref;
+ CHECK((*_env)->GetArrayLength (_env, val) == 32);
(*_env)->GetByteArrayRegion (_env, val, 0, 32, val_ref.data);
return NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_ref);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKNodeAnnouncement ret = NodeAnnouncementInfo_get_announcement_message(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1set_1announcement_1message(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKNodeAnnouncement val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = NodeAnnouncement_clone(&val_conv);
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, jbyteArray alias_arg, jlong addresses_arg, jlong announcement_message_arg) {
+JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1new(JNIEnv * _env, jclass _b, jlong features_arg, jint last_update_arg, jbyteArray rgb_arg, jbyteArray alias_arg, jlong addresses_arg, jlong announcement_message_arg) {
LDKNodeFeatures features_arg_conv;
features_arg_conv.inner = (void*)(features_arg & (~1));
features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0);
- LDKThreeBytes rgb_arg_conv = *(LDKThreeBytes*)rgb_arg;
- FREE((void*)rgb_arg);
+ // Warning: we may need a move here but can't clone!
+ LDKThreeBytes rgb_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, rgb_arg) == 3);
+ (*_env)->GetByteArrayRegion (_env, rgb_arg, 0, 3, rgb_arg_ref.data);
LDKThirtyTwoBytes alias_arg_ref;
+ CHECK((*_env)->GetArrayLength (_env, alias_arg) == 32);
(*_env)->GetByteArrayRegion (_env, alias_arg, 0, 32, alias_arg_ref.data);
LDKCVec_NetAddressZ addresses_arg_conv = *(LDKCVec_NetAddressZ*)addresses_arg;
FREE((void*)addresses_arg);
LDKNodeAnnouncement announcement_message_arg_conv;
announcement_message_arg_conv.inner = (void*)(announcement_message_arg & (~1));
announcement_message_arg_conv.is_owned = (announcement_message_arg & 1) || (announcement_message_arg == 0);
- LDKNodeAnnouncementInfo ret = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_conv, alias_arg_ref, addresses_arg_conv, announcement_message_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ if (announcement_message_arg_conv.inner != NULL)
+ announcement_message_arg_conv = NodeAnnouncement_clone(&announcement_message_arg_conv);
+ LDKNodeAnnouncementInfo ret = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_ref, alias_arg_ref, addresses_arg_conv, announcement_message_arg_conv);
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeAnnouncementInfo_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKNodeAnnouncementInfo ret = NodeAnnouncementInfo_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeInfo_1free(JNIEnv * _env, jclass _b, jlong this_ptr) {
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKRoutingFees ret = NodeInfo_get_lowest_inbound_channel_fees(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeInfo_1set_1lowest_1inbound_1channel_1fees(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKRoutingFees val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ if (val_conv.inner != NULL)
+ val_conv = RoutingFees_clone(&val_conv);
return NodeInfo_set_lowest_inbound_channel_fees(&this_ptr_conv, val_conv);
}
this_ptr_conv.inner = (void*)(this_ptr & (~1));
this_ptr_conv.is_owned = (this_ptr & 1) || (this_ptr == 0);
LDKNodeAnnouncementInfo ret = NodeInfo_get_announcement_info(&this_ptr_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NodeInfo_1set_1announcement_1info(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) {
LDKNodeAnnouncementInfo val_conv;
val_conv.inner = (void*)(val & (~1));
val_conv.is_owned = (val & 1) || (val == 0);
+ // Warning: we may need a move here but can't clone!
return NodeInfo_set_announcement_info(&this_ptr_conv, val_conv);
}
LDKRoutingFees lowest_inbound_channel_fees_arg_conv;
lowest_inbound_channel_fees_arg_conv.inner = (void*)(lowest_inbound_channel_fees_arg & (~1));
lowest_inbound_channel_fees_arg_conv.is_owned = (lowest_inbound_channel_fees_arg & 1) || (lowest_inbound_channel_fees_arg == 0);
+ if (lowest_inbound_channel_fees_arg_conv.inner != NULL)
+ lowest_inbound_channel_fees_arg_conv = RoutingFees_clone(&lowest_inbound_channel_fees_arg_conv);
LDKNodeAnnouncementInfo announcement_info_arg_conv;
announcement_info_arg_conv.inner = (void*)(announcement_info_arg & (~1));
announcement_info_arg_conv.is_owned = (announcement_info_arg & 1) || (announcement_info_arg == 0);
+ // Warning: we may need a move here but can't clone!
LDKNodeInfo ret = NodeInfo_new(channels_arg_conv, lowest_inbound_channel_fees_arg_conv, announcement_info_arg_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeInfo_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NodeInfo_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKNodeInfo ret = NodeInfo_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1write(JNIEnv * _env, jclass _b, jlong obj) {
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1read(JNIEnv * _env, jclass _b, jlong ser) {
LDKu8slice ser_conv = *(LDKu8slice*)ser;
LDKNetworkGraph ret = NetworkGraph_read(ser_conv);
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1new(JNIEnv * _env, jclass _b) {
LDKNetworkGraph ret = NetworkGraph_new();
- DO_ASSERT(ret.is_owned);
- return ((long)ret.inner) | 1;
+ return ((long)ret.inner) | (ret.is_owned ? 1 : 0);
}
JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_NetworkGraph_1close_1channel_1from_1update(JNIEnv * _env, jclass _b, jlong this_arg, jlong short_channel_id, jboolean is_permanent) {
projects / ldk-java / blobdiff