X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fbindings.c;fp=ts%2Fbindings.c;h=a383cb9d6749a4218c060c3333fd0019e32d0eb8;hb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;hp=54ab899b0bf16926b5393973a517b4e14a1cbcd8;hpb=e9c2970adecaa14b3e83e11eb160a7bcbdae20da;p=ldk-java diff --git a/ts/bindings.c b/ts/bindings.c index 54ab899b..a383cb9d 100644 --- a/ts/bindings.c +++ b/ts/bindings.c @@ -271,19 +271,12 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_u64u64Z_new(int64 ret->b = b; return (long)ret; } -static inline LDKC2Tuple_u64u64Z C2Tuple_u64u64Z_clone(const LDKC2Tuple_u64u64Z *orig) { - LDKC2Tuple_u64u64Z ret = { - .a = orig->a, - .b = orig->b, - }; - return ret; -} int64_t __attribute__((visibility("default"))) TS_LDKC2Tuple_u64u64Z_get_a(uint32_t ptr) { - LDKC2Tuple_u64u64Z *tuple = (LDKC2Tuple_u64u64Z*)ptr; + LDKC2Tuple_u64u64Z *tuple = (LDKC2Tuple_u64u64Z*)(ptr & ~1); return tuple->a; } int64_t __attribute__((visibility("default"))) TS_LDKC2Tuple_u64u64Z_get_b(uint32_t ptr) { - LDKC2Tuple_u64u64Z *tuple = (LDKC2Tuple_u64u64Z*)ptr; + LDKC2Tuple_u64u64Z *tuple = (LDKC2Tuple_u64u64Z*)(ptr & ~1); return tuple->b; } uint32_t __attribute__((visibility("default"))) TS_LDKSpendableOutputDescriptor_ref_from_ptr(uint32_t ptr) { @@ -294,7 +287,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKSpendableOutputDescriptor_ 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 = (long)outpoint_var.inner & ~1; - long output_ref = (long)&obj->static_output.output; + long output_ref = ((long)&obj->static_output.output) | 1; return 0 /* LDKSpendableOutputDescriptor - StaticOutput */; (void) outpoint_ref; (void) (long)output_ref; } case LDKSpendableOutputDescriptor_DynamicOutputP2WSH: { @@ -304,8 +297,8 @@ uint32_t __attribute__((visibility("default"))) TS_LDKSpendableOutputDescriptor_ long outpoint_ref = (long)outpoint_var.inner & ~1; int8_tArray per_commitment_point_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(per_commitment_point_arr + 4), obj->dynamic_output_p2wsh.per_commitment_point.compressed_form, 33); - long output_ref = (long)&obj->dynamic_output_p2wsh.output; - long key_derivation_params_ref = (long)&obj->dynamic_output_p2wsh.key_derivation_params; + long output_ref = ((long)&obj->dynamic_output_p2wsh.output) | 1; + long key_derivation_params_ref = (long)(&obj->dynamic_output_p2wsh.key_derivation_params) | 1; int8_tArray revocation_pubkey_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(revocation_pubkey_arr + 4), obj->dynamic_output_p2wsh.revocation_pubkey.compressed_form, 33); return 0 /* LDKSpendableOutputDescriptor - DynamicOutputP2WSH */; (void) outpoint_ref; (void) per_commitment_point_arr; (void) obj->dynamic_output_p2wsh.to_self_delay; (void) (long)output_ref; (void) key_derivation_params_ref; (void) revocation_pubkey_arr; @@ -315,8 +308,8 @@ uint32_t __attribute__((visibility("default"))) TS_LDKSpendableOutputDescriptor_ 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 = (long)outpoint_var.inner & ~1; - long output_ref = (long)&obj->static_output_counterparty_payment.output; - long key_derivation_params_ref = (long)&obj->static_output_counterparty_payment.key_derivation_params; + long output_ref = ((long)&obj->static_output_counterparty_payment.output) | 1; + long key_derivation_params_ref = (long)(&obj->static_output_counterparty_payment.key_derivation_params) | 1; return 0 /* LDKSpendableOutputDescriptor - StaticOutputCounterpartyPayment */; (void) outpoint_ref; (void) (long)output_ref; (void) key_derivation_params_ref; } default: abort(); @@ -332,7 +325,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_SpendableOutputDescr uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKSpendableOutputDescriptor arr_elem_conv = *(LDKSpendableOutputDescriptor*)arr_elem; + LDKSpendableOutputDescriptor arr_elem_conv = *(LDKSpendableOutputDescriptor*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } @@ -520,11 +513,11 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_ case LDKMessageSendEvent_HandleError: { int8_tArray node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(node_id_arr + 4), obj->handle_error.node_id.compressed_form, 33); - long action_ref = (long)&obj->handle_error.action; + long action_ref = ((long)&obj->handle_error.action) | 1; return 0 /* LDKMessageSendEvent - HandleError */; (void) node_id_arr; (void) action_ref; } case LDKMessageSendEvent_PaymentFailureNetworkUpdate: { - long update_ref = (long)&obj->payment_failure_network_update.update; + long update_ref = ((long)&obj->payment_failure_network_update.update) | 1; return 0 /* LDKMessageSendEvent - PaymentFailureNetworkUpdate */; (void) update_ref; } case LDKMessageSendEvent_SendChannelRangeQuery: { @@ -558,7 +551,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_MessageSendEventZ_ne uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKMessageSendEvent arr_elem_conv = *(LDKMessageSendEvent*)arr_elem; + LDKMessageSendEvent arr_elem_conv = *(LDKMessageSendEvent*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } @@ -615,7 +608,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKEvent_ref_from_ptr(uint32_ uint32_tArray outputs_arr = init_arr(outputs_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes"); uint32_t *outputs_arr_ptr = (uint32_t*)(outputs_arr + 4); for (size_t b = 0; b < outputs_var.datalen; b++) { - long arr_conv_27_ref = (long)&outputs_var.data[b]; + long arr_conv_27_ref = ((long)&outputs_var.data[b]) | 1; outputs_arr_ptr[b] = arr_conv_27_ref; } return 0 /* LDKEvent - SpendableOutputs */; (void) outputs_arr; @@ -633,7 +626,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_EventZ_new(uint32_tA uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKEvent arr_elem_conv = *(LDKEvent*)arr_elem; + LDKEvent arr_elem_conv = *(LDKEvent*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } @@ -659,11 +652,11 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_usizeTransactionZ return (long)ret; } intptr_t __attribute__((visibility("default"))) TS_LDKC2Tuple_usizeTransactionZ_get_a(uint32_t ptr) { - LDKC2Tuple_usizeTransactionZ *tuple = (LDKC2Tuple_usizeTransactionZ*)ptr; + LDKC2Tuple_usizeTransactionZ *tuple = (LDKC2Tuple_usizeTransactionZ*)(ptr & ~1); return tuple->a; } int8_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_usizeTransactionZ_get_b(uint32_t ptr) { - LDKC2Tuple_usizeTransactionZ *tuple = (LDKC2Tuple_usizeTransactionZ*)ptr; + LDKC2Tuple_usizeTransactionZ *tuple = (LDKC2Tuple_usizeTransactionZ*)(ptr & ~1); LDKTransaction b_var = tuple->b; int8_tArray b_arr = init_arr(b_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(b_arr + 4), b_var.data, b_var.datalen); @@ -679,7 +672,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_usizeTransac uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKC2Tuple_usizeTransactionZ arr_elem_conv = *(LDKC2Tuple_usizeTransactionZ*)arr_elem; + LDKC2Tuple_usizeTransactionZ arr_elem_conv = *(LDKC2Tuple_usizeTransactionZ*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } @@ -690,27 +683,16 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NoneChannelMonito return ((LDKCResult_NoneChannelMonitorUpdateErrZ*)arg)->result_ok; } void __attribute__((visibility("default"))) TS_LDKCResult_NoneChannelMonitorUpdateErrZ_get_ok(uint32_t arg) { - LDKCResult_NoneChannelMonitorUpdateErrZ *val = (LDKCResult_NoneChannelMonitorUpdateErrZ*)arg; + LDKCResult_NoneChannelMonitorUpdateErrZ *val = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NoneChannelMonitorUpdateErrZ_get_err(uint32_t arg) { - LDKCResult_NoneChannelMonitorUpdateErrZ *val = (LDKCResult_NoneChannelMonitorUpdateErrZ*)arg; + LDKCResult_NoneChannelMonitorUpdateErrZ *val = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(arg & ~1); CHECK(!val->result_ok); uint32_t err_conv = LDKChannelMonitorUpdateErr_to_js((*val->contents.err)); return err_conv; } -static inline LDKCResult_NoneChannelMonitorUpdateErrZ CResult_NoneChannelMonitorUpdateErrZ_clone(const LDKCResult_NoneChannelMonitorUpdateErrZ *orig) { - LDKCResult_NoneChannelMonitorUpdateErrZ res = { .result_ok = orig->result_ok }; - if (orig->result_ok) { - res.contents.result = NULL; - } else { - LDKChannelMonitorUpdateErr* contents = MALLOC(sizeof(LDKChannelMonitorUpdateErr), "LDKChannelMonitorUpdateErr result Err clone"); - *contents = ChannelMonitorUpdateErr_clone(orig->contents.err); - res.contents.err = contents; - } - return res; -} uint32_t __attribute__((visibility("default"))) TS_LDKCVec_MonitorEventZ_new(uint32_tArray elems) { LDKCVec_MonitorEventZ *ret = MALLOC(sizeof(LDKCVec_MonitorEventZ), "LDKCVec_MonitorEventZ"); ret->datalen = *((uint32_t*)elems); @@ -724,8 +706,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_MonitorEventZ_new(ui LDKMonitorEvent 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 = MonitorEvent_clone(&arr_elem_conv); + arr_elem_conv = MonitorEvent_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -742,7 +723,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpd return ((LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_ChannelMonitorUpdateDecodeErrorZ *val = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)arg; + LDKCResult_ChannelMonitorUpdateDecodeErrorZ *val = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKChannelMonitorUpdate res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -751,7 +732,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpd return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpdateDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_ChannelMonitorUpdateDecodeErrorZ *val = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)arg; + LDKCResult_ChannelMonitorUpdateDecodeErrorZ *val = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -763,12 +744,12 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NoneMonitorUpdate return ((LDKCResult_NoneMonitorUpdateErrorZ*)arg)->result_ok; } void __attribute__((visibility("default"))) TS_LDKCResult_NoneMonitorUpdateErrorZ_get_ok(uint32_t arg) { - LDKCResult_NoneMonitorUpdateErrorZ *val = (LDKCResult_NoneMonitorUpdateErrorZ*)arg; + LDKCResult_NoneMonitorUpdateErrorZ *val = (LDKCResult_NoneMonitorUpdateErrorZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NoneMonitorUpdateErrorZ_get_err(uint32_t arg) { - LDKCResult_NoneMonitorUpdateErrorZ *val = (LDKCResult_NoneMonitorUpdateErrorZ*)arg; + LDKCResult_NoneMonitorUpdateErrorZ *val = (LDKCResult_NoneMonitorUpdateErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKMonitorUpdateError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -781,8 +762,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_OutPointScriptZ_n 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); + a_conv = OutPoint_clone(&a_conv); ret->a = a_conv; LDKCVec_u8Z b_ref; b_ref.datalen = *((uint32_t*)b); @@ -791,15 +771,8 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_OutPointScriptZ_n ret->b = b_ref; return (long)ret; } -static inline LDKC2Tuple_OutPointScriptZ C2Tuple_OutPointScriptZ_clone(const LDKC2Tuple_OutPointScriptZ *orig) { - LDKC2Tuple_OutPointScriptZ ret = { - .a = OutPoint_clone(&orig->a), - .b = CVec_u8Z_clone(&orig->b), - }; - return ret; -} uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_OutPointScriptZ_get_a(uint32_t ptr) { - LDKC2Tuple_OutPointScriptZ *tuple = (LDKC2Tuple_OutPointScriptZ*)ptr; + LDKC2Tuple_OutPointScriptZ *tuple = (LDKC2Tuple_OutPointScriptZ*)(ptr & ~1); LDKOutPoint a_var = tuple->a; CHECK((((long)a_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&a_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -807,7 +780,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_OutPointScriptZ_g return a_ref; } int8_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_OutPointScriptZ_get_b(uint32_t ptr) { - LDKC2Tuple_OutPointScriptZ *tuple = (LDKC2Tuple_OutPointScriptZ*)ptr; + LDKC2Tuple_OutPointScriptZ *tuple = (LDKC2Tuple_OutPointScriptZ*)(ptr & ~1); LDKCVec_u8Z b_var = tuple->b; int8_tArray b_arr = init_arr(b_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(b_arr + 4), b_var.data, b_var.datalen); @@ -816,25 +789,18 @@ int8_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_OutPointScript uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_u32TxOutZ_new(int32_t a, uint32_t b) { LDKC2Tuple_u32TxOutZ* ret = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); ret->a = a; - LDKTxOut b_conv = *(LDKTxOut*)b; + LDKTxOut b_conv = *(LDKTxOut*)(((uint64_t)b) & ~1); FREE((void*)b); ret->b = b_conv; return (long)ret; } -static inline LDKC2Tuple_u32TxOutZ C2Tuple_u32TxOutZ_clone(const LDKC2Tuple_u32TxOutZ *orig) { - LDKC2Tuple_u32TxOutZ ret = { - .a = orig->a, - .b = TxOut_clone(&orig->b), - }; - return ret; -} int32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_u32TxOutZ_get_a(uint32_t ptr) { - LDKC2Tuple_u32TxOutZ *tuple = (LDKC2Tuple_u32TxOutZ*)ptr; + LDKC2Tuple_u32TxOutZ *tuple = (LDKC2Tuple_u32TxOutZ*)(ptr & ~1); return tuple->a; } uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_u32TxOutZ_get_b(uint32_t ptr) { - LDKC2Tuple_u32TxOutZ *tuple = (LDKC2Tuple_u32TxOutZ*)ptr; - long b_ref = (long)&tuple->b; + LDKC2Tuple_u32TxOutZ *tuple = (LDKC2Tuple_u32TxOutZ*)(ptr & ~1); + long b_ref = ((long)&tuple->b) | 1; return (long)b_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_u32TxOutZZ_new(uint32_tArray elems) { @@ -847,7 +813,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_u32TxOutZZ_n uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKC2Tuple_u32TxOutZ arr_elem_conv = *(LDKC2Tuple_u32TxOutZ*)arr_elem; + LDKC2Tuple_u32TxOutZ arr_elem_conv = *(LDKC2Tuple_u32TxOutZ*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } @@ -876,33 +842,26 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_TxidCVec_C2Tuple_ uint32_t* b_vals = (uint32_t*)(b + 4); for (size_t z = 0; z < b_constr.datalen; z++) { uint32_t arr_conv_25 = b_vals[z]; - LDKC2Tuple_u32TxOutZ arr_conv_25_conv = *(LDKC2Tuple_u32TxOutZ*)arr_conv_25; + LDKC2Tuple_u32TxOutZ arr_conv_25_conv = *(LDKC2Tuple_u32TxOutZ*)(((uint64_t)arr_conv_25) & ~1); FREE((void*)arr_conv_25); b_constr.data[z] = arr_conv_25_conv; } ret->b = b_constr; return (long)ret; } -static inline LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(const LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *orig) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ ret = { - .a = ThirtyTwoBytes_clone(&orig->a), - .b = CVec_C2Tuple_u32TxOutZZ_clone(&orig->b), - }; - return ret; -} int8_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(uint32_t ptr) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *tuple = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)ptr; + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *tuple = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(ptr & ~1); int8_tArray a_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(a_arr + 4), tuple->a.data, 32); return a_arr; } uint32_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(uint32_t ptr) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *tuple = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)ptr; + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *tuple = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(ptr & ~1); LDKCVec_C2Tuple_u32TxOutZZ b_var = tuple->b; uint32_tArray b_arr = init_arr(b_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes"); uint32_t *b_arr_ptr = (uint32_t*)(b_arr + 4); for (size_t z = 0; z < b_var.datalen; z++) { - long arr_conv_25_ref = (long)&b_var.data[z]; + long arr_conv_25_ref = (long)(&b_var.data[z]) | 1; b_arr_ptr[z] = arr_conv_25_ref; } return b_arr; @@ -917,20 +876,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_TxidCVec_C2T uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ arr_elem_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)arr_elem; + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ arr_elem_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } } return (long)ret; } -static inline LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_clone(const LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ *orig) { - LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ) * orig->datalen, "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ clone bytes"), .datalen = orig->datalen }; - for (size_t i = 0; i < ret.datalen; i++) { - ret.data[i] = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(&orig->data[i]); - } - return ret; -} uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_SignatureCVec_SignatureZZ_new(int8_tArray a, ptrArray b) { LDKC2Tuple_SignatureCVec_SignatureZZ* ret = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); LDKSignature a_ref; @@ -955,13 +907,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_SignatureCVec_Sig return (long)ret; } int8_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_SignatureCVec_SignatureZZ_get_a(uint32_t ptr) { - LDKC2Tuple_SignatureCVec_SignatureZZ *tuple = (LDKC2Tuple_SignatureCVec_SignatureZZ*)ptr; + LDKC2Tuple_SignatureCVec_SignatureZZ *tuple = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(ptr & ~1); int8_tArray a_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(a_arr + 4), tuple->a.compact_form, 64); return a_arr; } ptrArray __attribute__((visibility("default"))) TS_LDKC2Tuple_SignatureCVec_SignatureZZ_get_b(uint32_t ptr) { - LDKC2Tuple_SignatureCVec_SignatureZZ *tuple = (LDKC2Tuple_SignatureCVec_SignatureZZ*)ptr; + LDKC2Tuple_SignatureCVec_SignatureZZ *tuple = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(ptr & ~1); LDKCVec_SignatureZ b_var = tuple->b; ptrArray b_arr = init_arr(b_var.datalen, sizeof(uint32_t), "Native ptrArray Bytes"); int8_tArray *b_arr_ptr = (int8_tArray*)(b_arr + 4); @@ -976,13 +928,13 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_Signature return ((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint32_t arg) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *val = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg; + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *val = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(arg & ~1); CHECK(val->result_ok); - long res_ref = (long)&(*val->contents.result); + long res_ref = (long)(&(*val->contents.result)) | 1; return res_ref; } void __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(uint32_t arg) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *val = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg; + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *val = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(arg & ~1); CHECK(!val->result_ok); return *val->contents.err; } @@ -990,35 +942,14 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_SignatureNoneZ_re return ((LDKCResult_SignatureNoneZ*)arg)->result_ok; } int8_tArray __attribute__((visibility("default"))) TS_LDKCResult_SignatureNoneZ_get_ok(uint32_t arg) { - LDKCResult_SignatureNoneZ *val = (LDKCResult_SignatureNoneZ*)arg; + LDKCResult_SignatureNoneZ *val = (LDKCResult_SignatureNoneZ*)(arg & ~1); CHECK(val->result_ok); int8_tArray res_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(res_arr + 4), (*val->contents.result).compact_form, 64); return res_arr; } void __attribute__((visibility("default"))) TS_LDKCResult_SignatureNoneZ_get_err(uint32_t arg) { - LDKCResult_SignatureNoneZ *val = (LDKCResult_SignatureNoneZ*)arg; - CHECK(!val->result_ok); - return *val->contents.err; -} -jboolean __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_result_ok(uint32_t arg) { - return ((LDKCResult_CVec_SignatureZNoneZ*)arg)->result_ok; -} -ptrArray __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_get_ok(uint32_t arg) { - LDKCResult_CVec_SignatureZNoneZ *val = (LDKCResult_CVec_SignatureZNoneZ*)arg; - CHECK(val->result_ok); - LDKCVec_SignatureZ res_var = (*val->contents.result); - ptrArray res_arr = init_arr(res_var.datalen, sizeof(uint32_t), "Native ptrArray Bytes"); - int8_tArray *res_arr_ptr = (int8_tArray*)(res_arr + 4); - for (size_t m = 0; m < res_var.datalen; m++) { - int8_tArray arr_conv_12_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes"); - memcpy((uint8_t*)(arr_conv_12_arr + 4), res_var.data[m].compact_form, 64); - res_arr_ptr[m] = arr_conv_12_arr; - } - return res_arr; -} -void __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_get_err(uint32_t arg) { - LDKCResult_CVec_SignatureZNoneZ *val = (LDKCResult_CVec_SignatureZNoneZ*)arg; + LDKCResult_SignatureNoneZ *val = (LDKCResult_SignatureNoneZ*)(arg & ~1); CHECK(!val->result_ok); return *val->contents.err; } @@ -1028,8 +959,7 @@ typedef struct LDKChannelKeys_JCalls { uint32_t release_commitment_secret_meth; uint32_t key_derivation_params_meth; uint32_t sign_counterparty_commitment_meth; - uint32_t sign_holder_commitment_meth; - uint32_t sign_holder_commitment_htlc_transactions_meth; + uint32_t sign_holder_commitment_and_htlcs_meth; uint32_t sign_justice_transaction_meth; uint32_t sign_counterparty_htlc_transaction_meth; uint32_t sign_closing_transaction_meth; @@ -1044,8 +974,7 @@ static void LDKChannelKeys_JCalls_free(void* this_arg) { js_free(j_calls->release_commitment_secret_meth); js_free(j_calls->key_derivation_params_meth); js_free(j_calls->sign_counterparty_commitment_meth); - js_free(j_calls->sign_holder_commitment_meth); - js_free(j_calls->sign_holder_commitment_htlc_transactions_meth); + js_free(j_calls->sign_holder_commitment_and_htlcs_meth); js_free(j_calls->sign_justice_transaction_meth); js_free(j_calls->sign_counterparty_htlc_transaction_meth); js_free(j_calls->sign_closing_transaction_meth); @@ -1074,15 +1003,14 @@ LDKThirtyTwoBytes release_commitment_secret_jcall(const void* this_arg, uint64_t LDKC2Tuple_u64u64Z key_derivation_params_jcall(const void* this_arg) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; LDKC2Tuple_u64u64Z* ret = (LDKC2Tuple_u64u64Z*)js_invoke_function_0(j_calls->key_derivation_params_meth); - LDKC2Tuple_u64u64Z ret_conv = *(LDKC2Tuple_u64u64Z*)ret; + LDKC2Tuple_u64u64Z ret_conv = *(LDKC2Tuple_u64u64Z*)(((uint64_t)ret) & ~1); ret_conv = C2Tuple_u64u64Z_clone((LDKC2Tuple_u64u64Z*)ret); return ret_conv; } LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_jcall(const void* this_arg, const LDKCommitmentTransaction * commitment_tx) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; LDKCommitmentTransaction commitment_tx_var = *commitment_tx; - if (commitment_tx->inner != NULL) - commitment_tx_var = CommitmentTransaction_clone(commitment_tx); + commitment_tx_var = CommitmentTransaction_clone(commitment_tx); CHECK((((long)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long commitment_tx_ref = (long)commitment_tx_var.inner; @@ -1090,40 +1018,23 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_j commitment_tx_ref |= 1; } LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)js_invoke_function_1(j_calls->sign_counterparty_commitment_meth, commitment_tx_ref); - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)ret; + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)ret); return ret_conv; } -LDKCResult_SignatureNoneZ sign_holder_commitment_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * commitment_tx) { +LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * commitment_tx) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; LDKHolderCommitmentTransaction commitment_tx_var = *commitment_tx; - if (commitment_tx->inner != NULL) - commitment_tx_var = HolderCommitmentTransaction_clone(commitment_tx); + commitment_tx_var = HolderCommitmentTransaction_clone(commitment_tx); CHECK((((long)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long commitment_tx_ref = (long)commitment_tx_var.inner; if (commitment_tx_var.is_owned) { commitment_tx_ref |= 1; } - LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)js_invoke_function_1(j_calls->sign_holder_commitment_meth, commitment_tx_ref); - LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)ret; - ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)ret); - return ret_conv; -} -LDKCResult_CVec_SignatureZNoneZ sign_holder_commitment_htlc_transactions_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * commitment_tx) { - LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; - LDKHolderCommitmentTransaction commitment_tx_var = *commitment_tx; - if (commitment_tx->inner != NULL) - commitment_tx_var = HolderCommitmentTransaction_clone(commitment_tx); - CHECK((((long)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((long)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - long commitment_tx_ref = (long)commitment_tx_var.inner; - if (commitment_tx_var.is_owned) { - commitment_tx_ref |= 1; - } - LDKCResult_CVec_SignatureZNoneZ* ret = (LDKCResult_CVec_SignatureZNoneZ*)js_invoke_function_1(j_calls->sign_holder_commitment_htlc_transactions_meth, commitment_tx_ref); - LDKCResult_CVec_SignatureZNoneZ ret_conv = *(LDKCResult_CVec_SignatureZNoneZ*)ret; - ret_conv = CResult_CVec_SignatureZNoneZ_clone((LDKCResult_CVec_SignatureZNoneZ*)ret); + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)js_invoke_function_1(j_calls->sign_holder_commitment_and_htlcs_meth, commitment_tx_ref); + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)ret); return ret_conv; } LDKCResult_SignatureNoneZ sign_justice_transaction_jcall(const void* this_arg, LDKTransaction justice_tx, uintptr_t input, uint64_t amount, const uint8_t (* per_commitment_key)[32], const LDKHTLCOutputInCommitment * htlc) { @@ -1135,8 +1046,7 @@ LDKCResult_SignatureNoneZ sign_justice_transaction_jcall(const void* this_arg, L int8_tArray per_commitment_key_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(per_commitment_key_arr + 4), *per_commitment_key, 32); LDKHTLCOutputInCommitment htlc_var = *htlc; - if (htlc->inner != NULL) - htlc_var = HTLCOutputInCommitment_clone(htlc); + htlc_var = HTLCOutputInCommitment_clone(htlc); CHECK((((long)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long htlc_ref = (long)htlc_var.inner; @@ -1144,7 +1054,7 @@ LDKCResult_SignatureNoneZ sign_justice_transaction_jcall(const void* this_arg, L htlc_ref |= 1; } LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)js_invoke_function_5(j_calls->sign_justice_transaction_meth, justice_tx_arr, input, amount, per_commitment_key_arr, htlc_ref); - LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)ret; + LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)ret); return ret_conv; } @@ -1157,8 +1067,7 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_jcall(const void* t int8_tArray per_commitment_point_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(per_commitment_point_arr + 4), per_commitment_point.compressed_form, 33); LDKHTLCOutputInCommitment htlc_var = *htlc; - if (htlc->inner != NULL) - htlc_var = HTLCOutputInCommitment_clone(htlc); + htlc_var = HTLCOutputInCommitment_clone(htlc); CHECK((((long)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long htlc_ref = (long)htlc_var.inner; @@ -1166,7 +1075,7 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_jcall(const void* t htlc_ref |= 1; } LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)js_invoke_function_5(j_calls->sign_counterparty_htlc_transaction_meth, htlc_tx_arr, input, amount, per_commitment_point_arr, htlc_ref); - LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)ret; + LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)ret); return ret_conv; } @@ -1177,15 +1086,14 @@ LDKCResult_SignatureNoneZ sign_closing_transaction_jcall(const void* this_arg, L memcpy((uint8_t*)(closing_tx_arr + 4), closing_tx_var.data, closing_tx_var.datalen); Transaction_free(closing_tx_var); LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)js_invoke_function_1(j_calls->sign_closing_transaction_meth, closing_tx_arr); - LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)ret; + LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)ret); return ret_conv; } LDKCResult_SignatureNoneZ sign_channel_announcement_jcall(const void* this_arg, const LDKUnsignedChannelAnnouncement * msg) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; LDKUnsignedChannelAnnouncement msg_var = *msg; - if (msg->inner != NULL) - msg_var = UnsignedChannelAnnouncement_clone(msg); + msg_var = UnsignedChannelAnnouncement_clone(msg); 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 = (long)msg_var.inner; @@ -1193,15 +1101,14 @@ LDKCResult_SignatureNoneZ sign_channel_announcement_jcall(const void* this_arg, msg_ref |= 1; } LDKCResult_SignatureNoneZ* ret = (LDKCResult_SignatureNoneZ*)js_invoke_function_1(j_calls->sign_channel_announcement_meth, msg_ref); - LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)ret; + LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)ret); return ret_conv; } void ready_channel_jcall(void* this_arg, const LDKChannelTransactionParameters * channel_parameters) { LDKChannelKeys_JCalls *j_calls = (LDKChannelKeys_JCalls*) this_arg; LDKChannelTransactionParameters channel_parameters_var = *channel_parameters; - if (channel_parameters->inner != NULL) - channel_parameters_var = ChannelTransactionParameters_clone(channel_parameters); + channel_parameters_var = ChannelTransactionParameters_clone(channel_parameters); CHECK((((long)channel_parameters_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&channel_parameters_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long channel_parameters_ref = (long)channel_parameters_var.inner; @@ -1232,8 +1139,7 @@ static inline LDKChannelKeys LDKChannelKeys_init (/*TODO: JS Object Reference */ LDKChannelPublicKeys pubkeys_conv; pubkeys_conv.inner = (void*)(pubkeys & (~1)); pubkeys_conv.is_owned = (pubkeys & 1) || (pubkeys == 0); - if (pubkeys_conv.inner != NULL) - pubkeys_conv = ChannelPublicKeys_clone(&pubkeys_conv); + pubkeys_conv = ChannelPublicKeys_clone(&pubkeys_conv); LDKChannelKeys ret = { .this_arg = (void*) calls, @@ -1241,8 +1147,7 @@ static inline LDKChannelKeys LDKChannelKeys_init (/*TODO: JS Object Reference */ .release_commitment_secret = release_commitment_secret_jcall, .key_derivation_params = key_derivation_params_jcall, .sign_counterparty_commitment = sign_counterparty_commitment_jcall, - .sign_holder_commitment = sign_holder_commitment_jcall, - .sign_holder_commitment_htlc_transactions = sign_holder_commitment_htlc_transactions_jcall, + .sign_holder_commitment_and_htlcs = sign_holder_commitment_and_htlcs_jcall, .sign_justice_transaction = sign_justice_transaction_jcall, .sign_counterparty_htlc_transaction = sign_counterparty_htlc_transaction_jcall, .sign_closing_transaction = sign_closing_transaction_jcall, @@ -1292,23 +1197,13 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelKeys_sign_counterpart return (long)ret_conv; } -uint32_t __attribute__((visibility("default"))) TS_ChannelKeys_sign_holder_commitment(uint32_t this_arg, uint32_t commitment_tx) { - LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg; - LDKHolderCommitmentTransaction commitment_tx_conv; - commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); - commitment_tx_conv.is_owned = false; - LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); - *ret_conv = (this_arg_conv->sign_holder_commitment)(this_arg_conv->this_arg, &commitment_tx_conv); - return (long)ret_conv; -} - -uint32_t __attribute__((visibility("default"))) TS_ChannelKeys_sign_holder_commitment_htlc_transactions(uint32_t this_arg, uint32_t commitment_tx) { +uint32_t __attribute__((visibility("default"))) TS_ChannelKeys_sign_holder_commitment_and_htlcs(uint32_t this_arg, uint32_t commitment_tx) { LDKChannelKeys* this_arg_conv = (LDKChannelKeys*)this_arg; LDKHolderCommitmentTransaction commitment_tx_conv; commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); commitment_tx_conv.is_owned = false; - LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); - *ret_conv = (this_arg_conv->sign_holder_commitment_htlc_transactions)(this_arg_conv->this_arg, &commitment_tx_conv); + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); + *ret_conv = (this_arg_conv->sign_holder_commitment_and_htlcs)(this_arg_conv->this_arg, &commitment_tx_conv); return (long)ret_conv; } @@ -1414,18 +1309,18 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_BlockHashChannelM LDKChannelMonitor b_conv; b_conv.inner = (void*)(b & (~1)); b_conv.is_owned = (b & 1) || (b == 0); - // Warning: we may need a move here but can't clone! + b_conv = ChannelMonitor_clone(&b_conv); ret->b = b_conv; return (long)ret; } int8_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_BlockHashChannelMonitorZ_get_a(uint32_t ptr) { - LDKC2Tuple_BlockHashChannelMonitorZ *tuple = (LDKC2Tuple_BlockHashChannelMonitorZ*)ptr; + LDKC2Tuple_BlockHashChannelMonitorZ *tuple = (LDKC2Tuple_BlockHashChannelMonitorZ*)(ptr & ~1); int8_tArray a_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(a_arr + 4), tuple->a.data, 32); return a_arr; } uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_BlockHashChannelMonitorZ_get_b(uint32_t ptr) { - LDKC2Tuple_BlockHashChannelMonitorZ *tuple = (LDKC2Tuple_BlockHashChannelMonitorZ*)ptr; + LDKC2Tuple_BlockHashChannelMonitorZ *tuple = (LDKC2Tuple_BlockHashChannelMonitorZ*)(ptr & ~1); LDKChannelMonitor b_var = tuple->b; CHECK((((long)b_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&b_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -1436,13 +1331,13 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHash return ((LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)arg; + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); - long res_ref = (long)&(*val->contents.result); + long res_ref = (long)(&(*val->contents.result)) | 1; return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)arg; + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -1454,13 +1349,13 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_SpendableOutputDe return ((LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ *val = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)arg; + LDKCResult_SpendableOutputDescriptorDecodeErrorZ *val = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); - long res_ref = (long)&(*val->contents.result); + long res_ref = ((long)&(*val->contents.result)) | 1; return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_SpendableOutputDescriptorDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ *val = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)arg; + LDKCResult_SpendableOutputDescriptorDecodeErrorZ *val = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -1472,14 +1367,14 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_ChanKeySignerDeco return ((LDKCResult_ChanKeySignerDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChanKeySignerDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_ChanKeySignerDecodeErrorZ *val = (LDKCResult_ChanKeySignerDecodeErrorZ*)arg; + LDKCResult_ChanKeySignerDecodeErrorZ *val = (LDKCResult_ChanKeySignerDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKChannelKeys* ret = MALLOC(sizeof(LDKChannelKeys), "LDKChannelKeys"); - *ret = (*val->contents.result); + *ret = ChannelKeys_clone(&(*val->contents.result)); return (long)ret; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChanKeySignerDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_ChanKeySignerDecodeErrorZ *val = (LDKCResult_ChanKeySignerDecodeErrorZ*)arg; + LDKCResult_ChanKeySignerDecodeErrorZ *val = (LDKCResult_ChanKeySignerDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -1491,7 +1386,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_InMemoryChannelKe return ((LDKCResult_InMemoryChannelKeysDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_InMemoryChannelKeysDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_InMemoryChannelKeysDecodeErrorZ *val = (LDKCResult_InMemoryChannelKeysDecodeErrorZ*)arg; + LDKCResult_InMemoryChannelKeysDecodeErrorZ *val = (LDKCResult_InMemoryChannelKeysDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKInMemoryChannelKeys res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -1500,7 +1395,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_InMemoryChannelKe return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_InMemoryChannelKeysDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_InMemoryChannelKeysDecodeErrorZ *val = (LDKCResult_InMemoryChannelKeysDecodeErrorZ*)arg; + LDKCResult_InMemoryChannelKeysDecodeErrorZ *val = (LDKCResult_InMemoryChannelKeysDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -1512,30 +1407,17 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_TxOutAccessErrorZ return ((LDKCResult_TxOutAccessErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_TxOutAccessErrorZ_get_ok(uint32_t arg) { - LDKCResult_TxOutAccessErrorZ *val = (LDKCResult_TxOutAccessErrorZ*)arg; + LDKCResult_TxOutAccessErrorZ *val = (LDKCResult_TxOutAccessErrorZ*)(arg & ~1); CHECK(val->result_ok); - long res_ref = (long)&(*val->contents.result); + long res_ref = ((long)&(*val->contents.result)) | 1; return (long)res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_TxOutAccessErrorZ_get_err(uint32_t arg) { - LDKCResult_TxOutAccessErrorZ *val = (LDKCResult_TxOutAccessErrorZ*)arg; + LDKCResult_TxOutAccessErrorZ *val = (LDKCResult_TxOutAccessErrorZ*)(arg & ~1); CHECK(!val->result_ok); uint32_t err_conv = LDKAccessError_to_js((*val->contents.err)); return err_conv; } -static inline LDKCResult_TxOutAccessErrorZ CResult_TxOutAccessErrorZ_clone(const LDKCResult_TxOutAccessErrorZ *orig) { - LDKCResult_TxOutAccessErrorZ res = { .result_ok = orig->result_ok }; - if (orig->result_ok) { - LDKTxOut* contents = MALLOC(sizeof(LDKTxOut), "LDKTxOut result OK clone"); - *contents = TxOut_clone(orig->contents.result); - res.contents.result = contents; - } else { - LDKAccessError* contents = MALLOC(sizeof(LDKAccessError), "LDKAccessError result Err clone"); - *contents = AccessError_clone(orig->contents.err); - res.contents.err = contents; - } - return res; -} uint32_t __attribute__((visibility("default"))) TS_LDKAPIError_ref_from_ptr(uint32_t ptr) { LDKAPIError *obj = (LDKAPIError*)ptr; switch(obj->tag) { @@ -1572,27 +1454,16 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NoneAPIErrorZ_res return ((LDKCResult_NoneAPIErrorZ*)arg)->result_ok; } void __attribute__((visibility("default"))) TS_LDKCResult_NoneAPIErrorZ_get_ok(uint32_t arg) { - LDKCResult_NoneAPIErrorZ *val = (LDKCResult_NoneAPIErrorZ*)arg; + LDKCResult_NoneAPIErrorZ *val = (LDKCResult_NoneAPIErrorZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NoneAPIErrorZ_get_err(uint32_t arg) { - LDKCResult_NoneAPIErrorZ *val = (LDKCResult_NoneAPIErrorZ*)arg; + LDKCResult_NoneAPIErrorZ *val = (LDKCResult_NoneAPIErrorZ*)(arg & ~1); CHECK(!val->result_ok); - long err_ref = (long)&(*val->contents.err); + long err_ref = ((long)&(*val->contents.err)) | 1; return err_ref; } -static inline LDKCResult_NoneAPIErrorZ CResult_NoneAPIErrorZ_clone(const LDKCResult_NoneAPIErrorZ *orig) { - LDKCResult_NoneAPIErrorZ res = { .result_ok = orig->result_ok }; - if (orig->result_ok) { - res.contents.result = NULL; - } else { - LDKAPIError* contents = MALLOC(sizeof(LDKAPIError), "LDKAPIError result Err clone"); - *contents = APIError_clone(orig->contents.err); - res.contents.err = contents; - } - return res; -} uint32_t __attribute__((visibility("default"))) TS_LDKCVec_ChannelDetailsZ_new(uint32_tArray elems) { LDKCVec_ChannelDetailsZ *ret = MALLOC(sizeof(LDKCVec_ChannelDetailsZ), "LDKCVec_ChannelDetailsZ"); ret->datalen = *((uint32_t*)elems); @@ -1606,8 +1477,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_ChannelDetailsZ_new( 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); + arr_elem_conv = ChannelDetails_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -1624,12 +1494,12 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NonePaymentSendFa return ((LDKCResult_NonePaymentSendFailureZ*)arg)->result_ok; } void __attribute__((visibility("default"))) TS_LDKCResult_NonePaymentSendFailureZ_get_ok(uint32_t arg) { - LDKCResult_NonePaymentSendFailureZ *val = (LDKCResult_NonePaymentSendFailureZ*)arg; + LDKCResult_NonePaymentSendFailureZ *val = (LDKCResult_NonePaymentSendFailureZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NonePaymentSendFailureZ_get_err(uint32_t arg) { - LDKCResult_NonePaymentSendFailureZ *val = (LDKCResult_NonePaymentSendFailureZ*)arg; + LDKCResult_NonePaymentSendFailureZ *val = (LDKCResult_NonePaymentSendFailureZ*)(arg & ~1); CHECK(!val->result_ok); LDKPaymentSendFailure err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -1673,7 +1543,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_NetAddressZ_new(uint uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKNetAddress arr_elem_conv = *(LDKNetAddress*)arr_elem; + LDKNetAddress arr_elem_conv = *(LDKNetAddress*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } @@ -1700,12 +1570,19 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_ChannelMonitorZ_new( 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! + arr_elem_conv = ChannelMonitor_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } return (long)ret; } +static inline LDKCVec_ChannelMonitorZ CVec_ChannelMonitorZ_clone(const LDKCVec_ChannelMonitorZ *orig) { + LDKCVec_ChannelMonitorZ ret = { .data = MALLOC(sizeof(LDKChannelMonitor) * orig->datalen, "LDKCVec_ChannelMonitorZ clone bytes"), .datalen = orig->datalen }; + for (size_t i = 0; i < ret.datalen; i++) { + ret.data[i] = ChannelMonitor_clone(&orig->data[i]); + } + return ret; +} typedef struct LDKWatch_JCalls { atomic_size_t refcnt; uint32_t watch_channel_meth; @@ -1738,7 +1615,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_jcall(const void* this_arg monitor_ref |= 1; } LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)js_invoke_function_2(j_calls->watch_channel_meth, funding_txo_ref, monitor_ref); - LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)ret; + LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)ret); return ret_conv; } @@ -1759,7 +1636,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_jcall(const void* this_ar update_ref |= 1; } LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)js_invoke_function_2(j_calls->update_channel_meth, funding_txo_ref, update_ref); - LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)ret; + LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)ret); return ret_conv; } @@ -1778,8 +1655,7 @@ LDKCVec_MonitorEventZ release_pending_monitor_events_jcall(const void* this_arg) LDKMonitorEvent arr_conv_14_conv; arr_conv_14_conv.inner = (void*)(arr_conv_14 & (~1)); arr_conv_14_conv.is_owned = (arr_conv_14 & 1) || (arr_conv_14 == 0); - if (arr_conv_14_conv.inner != NULL) - arr_conv_14_conv = MonitorEvent_clone(&arr_conv_14_conv); + arr_conv_14_conv = MonitorEvent_clone(&arr_conv_14_conv); arg_constr.data[o] = arr_conv_14_conv; } return arg_constr; @@ -1813,12 +1689,11 @@ uint32_t __attribute__((visibility("default"))) TS_Watch_watch_channel(uint32_t 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); + 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! + monitor_conv = ChannelMonitor_clone(&monitor_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->watch_channel)(this_arg_conv->this_arg, funding_txo_conv, monitor_conv); return (long)ret_conv; @@ -1829,13 +1704,11 @@ uint32_t __attribute__((visibility("default"))) TS_Watch_update_channel(uint32_ 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); + 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); + update_conv = ChannelMonitorUpdate_clone(&update_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->update_channel)(this_arg_conv->this_arg, funding_txo_conv, update_conv); return (long)ret_conv; @@ -1960,7 +1833,7 @@ LDKPublicKey get_shutdown_pubkey_jcall(const void* this_arg) { LDKChannelKeys get_channel_keys_jcall(const void* this_arg, bool inbound, uint64_t channel_value_satoshis) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; LDKChannelKeys* ret = (LDKChannelKeys*)js_invoke_function_2(j_calls->get_channel_keys_meth, inbound, channel_value_satoshis); - LDKChannelKeys ret_conv = *(LDKChannelKeys*)ret; + LDKChannelKeys ret_conv = *(LDKChannelKeys*)(((uint64_t)ret) & ~1); ret_conv = ChannelKeys_clone(ret); return ret_conv; } @@ -1978,8 +1851,8 @@ LDKCResult_ChanKeySignerDecodeErrorZ read_chan_signer_jcall(const void* this_arg int8_tArray reader_arr = init_arr(reader_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(reader_arr + 4), reader_var.data, reader_var.datalen); LDKCResult_ChanKeySignerDecodeErrorZ* ret = (LDKCResult_ChanKeySignerDecodeErrorZ*)js_invoke_function_1(j_calls->read_chan_signer_meth, reader_arr); - LDKCResult_ChanKeySignerDecodeErrorZ ret_conv = *(LDKCResult_ChanKeySignerDecodeErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_ChanKeySignerDecodeErrorZ ret_conv = *(LDKCResult_ChanKeySignerDecodeErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_ChanKeySignerDecodeErrorZ_clone((LDKCResult_ChanKeySignerDecodeErrorZ*)ret); return ret_conv; } static void* LDKKeysInterface_JCalls_clone(const void* this_arg) { @@ -2149,18 +2022,18 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_BlockHashChannelM LDKChannelManager b_conv; b_conv.inner = (void*)(b & (~1)); b_conv.is_owned = (b & 1) || (b == 0); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKChannelManager ret->b = b_conv; return (long)ret; } int8_tArray __attribute__((visibility("default"))) TS_LDKC2Tuple_BlockHashChannelManagerZ_get_a(uint32_t ptr) { - LDKC2Tuple_BlockHashChannelManagerZ *tuple = (LDKC2Tuple_BlockHashChannelManagerZ*)ptr; + LDKC2Tuple_BlockHashChannelManagerZ *tuple = (LDKC2Tuple_BlockHashChannelManagerZ*)(ptr & ~1); int8_tArray a_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(a_arr + 4), tuple->a.data, 32); return a_arr; } uint32_t __attribute__((visibility("default"))) TS_LDKC2Tuple_BlockHashChannelManagerZ_get_b(uint32_t ptr) { - LDKC2Tuple_BlockHashChannelManagerZ *tuple = (LDKC2Tuple_BlockHashChannelManagerZ*)ptr; + LDKC2Tuple_BlockHashChannelManagerZ *tuple = (LDKC2Tuple_BlockHashChannelManagerZ*)(ptr & ~1); LDKChannelManager b_var = tuple->b; CHECK((((long)b_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&b_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -2171,13 +2044,13 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHash return ((LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)arg; + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); - long res_ref = (long)&(*val->contents.result); + long res_ref = (long)(&(*val->contents.result)) | 1; return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)arg; + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2189,34 +2062,21 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NetAddressu8Z_res return ((LDKCResult_NetAddressu8Z*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NetAddressu8Z_get_ok(uint32_t arg) { - LDKCResult_NetAddressu8Z *val = (LDKCResult_NetAddressu8Z*)arg; + LDKCResult_NetAddressu8Z *val = (LDKCResult_NetAddressu8Z*)(arg & ~1); CHECK(val->result_ok); - long res_ref = (long)&(*val->contents.result); + long res_ref = ((long)&(*val->contents.result)) | 1; return res_ref; } int8_t __attribute__((visibility("default"))) TS_LDKCResult_NetAddressu8Z_get_err(uint32_t arg) { - LDKCResult_NetAddressu8Z *val = (LDKCResult_NetAddressu8Z*)arg; + LDKCResult_NetAddressu8Z *val = (LDKCResult_NetAddressu8Z*)(arg & ~1); CHECK(!val->result_ok); return *val->contents.err; } -static inline LDKCResult_NetAddressu8Z CResult_NetAddressu8Z_clone(const LDKCResult_NetAddressu8Z *orig) { - LDKCResult_NetAddressu8Z res = { .result_ok = orig->result_ok }; - if (orig->result_ok) { - LDKNetAddress* contents = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress result OK clone"); - *contents = NetAddress_clone(orig->contents.result); - res.contents.result = contents; - } else { - int8_t* contents = MALLOC(sizeof(int8_t), "int8_t result Err clone"); - *contents = *orig->contents.err; - res.contents.err = contents; - } - return res; -} jboolean __attribute__((visibility("default"))) TS_LDKCResult_CResult_NetAddressu8ZDecodeErrorZ_result_ok(uint32_t arg) { return ((LDKCResult_CResult_NetAddressu8ZDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_CResult_NetAddressu8ZDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_CResult_NetAddressu8ZDecodeErrorZ *val = (LDKCResult_CResult_NetAddressu8ZDecodeErrorZ*)arg; + LDKCResult_CResult_NetAddressu8ZDecodeErrorZ *val = (LDKCResult_CResult_NetAddressu8ZDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKCResult_NetAddressu8Z* res_conv = MALLOC(sizeof(LDKCResult_NetAddressu8Z), "LDKCResult_NetAddressu8Z"); *res_conv = (*val->contents.result); @@ -2224,7 +2084,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_CResult_NetAddres return (long)res_conv; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_CResult_NetAddressu8ZDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_CResult_NetAddressu8ZDecodeErrorZ *val = (LDKCResult_CResult_NetAddressu8ZDecodeErrorZ*)arg; + LDKCResult_CResult_NetAddressu8ZDecodeErrorZ *val = (LDKCResult_CResult_NetAddressu8ZDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2264,8 +2124,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_UpdateAddHTLCZ_new(u 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); + arr_elem_conv = UpdateAddHTLC_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -2291,8 +2150,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_UpdateFulfillHTLCZ_n 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); + arr_elem_conv = UpdateFulfillHTLC_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -2318,8 +2176,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_UpdateFailHTLCZ_new( 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); + arr_elem_conv = UpdateFailHTLC_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -2345,8 +2202,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_UpdateFailMalformedH 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); + arr_elem_conv = UpdateFailMalformedHTLC_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -2363,12 +2219,12 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_boolLightningErro return ((LDKCResult_boolLightningErrorZ*)arg)->result_ok; } jboolean __attribute__((visibility("default"))) TS_LDKCResult_boolLightningErrorZ_get_ok(uint32_t arg) { - LDKCResult_boolLightningErrorZ *val = (LDKCResult_boolLightningErrorZ*)arg; + LDKCResult_boolLightningErrorZ *val = (LDKCResult_boolLightningErrorZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_boolLightningErrorZ_get_err(uint32_t arg) { - LDKCResult_boolLightningErrorZ *val = (LDKCResult_boolLightningErrorZ*)arg; + LDKCResult_boolLightningErrorZ *val = (LDKCResult_boolLightningErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKLightningError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2381,33 +2237,22 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC3Tuple_ChannelAnnounceme 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); + 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); + 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); + c_conv = ChannelUpdate_clone(&c_conv); ret->c = c_conv; return (long)ret; } -static inline LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(const LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *orig) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ ret = { - .a = ChannelAnnouncement_clone(&orig->a), - .b = ChannelUpdate_clone(&orig->b), - .c = ChannelUpdate_clone(&orig->c), - }; - return ret; -} uint32_t __attribute__((visibility("default"))) TS_LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(uint32_t ptr) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *tuple = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)ptr; + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *tuple = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(ptr & ~1); LDKChannelAnnouncement a_var = tuple->a; CHECK((((long)a_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&a_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -2415,7 +2260,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC3Tuple_ChannelAnnounceme return a_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(uint32_t ptr) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *tuple = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)ptr; + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *tuple = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(ptr & ~1); LDKChannelUpdate b_var = tuple->b; CHECK((((long)b_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&b_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -2423,7 +2268,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKC3Tuple_ChannelAnnounceme return b_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(uint32_t ptr) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *tuple = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)ptr; + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *tuple = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(ptr & ~1); LDKChannelUpdate c_var = tuple->c; CHECK((((long)c_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&c_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -2440,20 +2285,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_C3Tuple_ChannelAnnou uint32_t *java_elems = (uint32_t*)(elems + 4); for (size_t i = 0; i < ret->datalen; i++) { uint32_t arr_elem = java_elems[i]; - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arr_elem_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)arr_elem; + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arr_elem_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(((uint64_t)arr_elem) & ~1); FREE((void*)arr_elem); ret->data[i] = arr_elem_conv; } } return (long)ret; } -static inline LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_clone(const LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ *orig) { - LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret = { .data = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ) * orig->datalen, "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ clone bytes"), .datalen = orig->datalen }; - for (size_t i = 0; i < ret.datalen; i++) { - ret.data[i] = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(&orig->data[i]); - } - return ret; -} uint32_t __attribute__((visibility("default"))) TS_LDKCVec_NodeAnnouncementZ_new(uint32_tArray elems) { LDKCVec_NodeAnnouncementZ *ret = MALLOC(sizeof(LDKCVec_NodeAnnouncementZ), "LDKCVec_NodeAnnouncementZ"); ret->datalen = *((uint32_t*)elems); @@ -2467,8 +2305,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_NodeAnnouncementZ_ne 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); + arr_elem_conv = NodeAnnouncement_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -2485,12 +2322,12 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NoneLightningErro return ((LDKCResult_NoneLightningErrorZ*)arg)->result_ok; } void __attribute__((visibility("default"))) TS_LDKCResult_NoneLightningErrorZ_get_ok(uint32_t arg) { - LDKCResult_NoneLightningErrorZ *val = (LDKCResult_NoneLightningErrorZ*)arg; + LDKCResult_NoneLightningErrorZ *val = (LDKCResult_NoneLightningErrorZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NoneLightningErrorZ_get_err(uint32_t arg) { - LDKCResult_NoneLightningErrorZ *val = (LDKCResult_NoneLightningErrorZ*)arg; + LDKCResult_NoneLightningErrorZ *val = (LDKCResult_NoneLightningErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKLightningError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2502,7 +2339,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablis return ((LDKCResult_ChannelReestablishDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablishDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_ChannelReestablishDecodeErrorZ *val = (LDKCResult_ChannelReestablishDecodeErrorZ*)arg; + LDKCResult_ChannelReestablishDecodeErrorZ *val = (LDKCResult_ChannelReestablishDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKChannelReestablish res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2511,7 +2348,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablis return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablishDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_ChannelReestablishDecodeErrorZ *val = (LDKCResult_ChannelReestablishDecodeErrorZ*)arg; + LDKCResult_ChannelReestablishDecodeErrorZ *val = (LDKCResult_ChannelReestablishDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2523,7 +2360,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_ return ((LDKCResult_InitDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_InitDecodeErrorZ *val = (LDKCResult_InitDecodeErrorZ*)arg; + LDKCResult_InitDecodeErrorZ *val = (LDKCResult_InitDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKInit res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2532,7 +2369,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_ return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_InitDecodeErrorZ *val = (LDKCResult_InitDecodeErrorZ*)arg; + LDKCResult_InitDecodeErrorZ *val = (LDKCResult_InitDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2544,7 +2381,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_ return ((LDKCResult_PingDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_PingDecodeErrorZ *val = (LDKCResult_PingDecodeErrorZ*)arg; + LDKCResult_PingDecodeErrorZ *val = (LDKCResult_PingDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKPing res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2553,7 +2390,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_ return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_PingDecodeErrorZ *val = (LDKCResult_PingDecodeErrorZ*)arg; + LDKCResult_PingDecodeErrorZ *val = (LDKCResult_PingDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2565,7 +2402,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_ return ((LDKCResult_PongDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_PongDecodeErrorZ *val = (LDKCResult_PongDecodeErrorZ*)arg; + LDKCResult_PongDecodeErrorZ *val = (LDKCResult_PongDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKPong res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2574,7 +2411,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_ return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_PongDecodeErrorZ *val = (LDKCResult_PongDecodeErrorZ*)arg; + LDKCResult_PongDecodeErrorZ *val = (LDKCResult_PongDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2586,7 +2423,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAn return ((LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)arg; + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKUnsignedChannelAnnouncement res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2595,7 +2432,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAn return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)arg; + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2607,7 +2444,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUp return ((LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_UnsignedChannelUpdateDecodeErrorZ *val = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)arg; + LDKCResult_UnsignedChannelUpdateDecodeErrorZ *val = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKUnsignedChannelUpdate res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2616,7 +2453,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUp return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUpdateDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_UnsignedChannelUpdateDecodeErrorZ *val = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)arg; + LDKCResult_UnsignedChannelUpdateDecodeErrorZ *val = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2628,7 +2465,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecod return ((LDKCResult_ErrorMessageDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_ErrorMessageDecodeErrorZ *val = (LDKCResult_ErrorMessageDecodeErrorZ*)arg; + LDKCResult_ErrorMessageDecodeErrorZ *val = (LDKCResult_ErrorMessageDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKErrorMessage res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2637,7 +2474,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecod return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_ErrorMessageDecodeErrorZ *val = (LDKCResult_ErrorMessageDecodeErrorZ*)arg; + LDKCResult_ErrorMessageDecodeErrorZ *val = (LDKCResult_ErrorMessageDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2649,7 +2486,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnou return ((LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)arg; + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKUnsignedNodeAnnouncement res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2658,7 +2495,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnou return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)arg; + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2670,7 +2507,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannel return ((LDKCResult_QueryShortChannelIdsDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannelIdsDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_QueryShortChannelIdsDecodeErrorZ *val = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)arg; + LDKCResult_QueryShortChannelIdsDecodeErrorZ *val = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKQueryShortChannelIds res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2679,7 +2516,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannel return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannelIdsDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_QueryShortChannelIdsDecodeErrorZ *val = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)arg; + LDKCResult_QueryShortChannelIdsDecodeErrorZ *val = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2691,7 +2528,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannel return ((LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *val = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)arg; + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *val = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKReplyShortChannelIdsEnd res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2700,7 +2537,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannel return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *val = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)arg; + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *val = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2712,7 +2549,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRange return ((LDKCResult_QueryChannelRangeDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRangeDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_QueryChannelRangeDecodeErrorZ *val = (LDKCResult_QueryChannelRangeDecodeErrorZ*)arg; + LDKCResult_QueryChannelRangeDecodeErrorZ *val = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKQueryChannelRange res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2721,7 +2558,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRange return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRangeDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_QueryChannelRangeDecodeErrorZ *val = (LDKCResult_QueryChannelRangeDecodeErrorZ*)arg; + LDKCResult_QueryChannelRangeDecodeErrorZ *val = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2733,7 +2570,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRange return ((LDKCResult_ReplyChannelRangeDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRangeDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_ReplyChannelRangeDecodeErrorZ *val = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)arg; + LDKCResult_ReplyChannelRangeDecodeErrorZ *val = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKReplyChannelRange res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2742,7 +2579,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRange return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRangeDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_ReplyChannelRangeDecodeErrorZ *val = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)arg; + LDKCResult_ReplyChannelRangeDecodeErrorZ *val = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2754,7 +2591,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFi return ((LDKCResult_GossipTimestampFilterDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFilterDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_GossipTimestampFilterDecodeErrorZ *val = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)arg; + LDKCResult_GossipTimestampFilterDecodeErrorZ *val = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKGossipTimestampFilter res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2763,7 +2600,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFi return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFilterDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_GossipTimestampFilterDecodeErrorZ *val = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)arg; + LDKCResult_GossipTimestampFilterDecodeErrorZ *val = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2775,7 +2612,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_CVec_u8ZPeerHandl return ((LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg)->result_ok; } int8_tArray __attribute__((visibility("default"))) TS_LDKCResult_CVec_u8ZPeerHandleErrorZ_get_ok(uint32_t arg) { - LDKCResult_CVec_u8ZPeerHandleErrorZ *val = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg; + LDKCResult_CVec_u8ZPeerHandleErrorZ *val = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKCVec_u8Z res_var = (*val->contents.result); int8_tArray res_arr = init_arr(res_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes"); @@ -2783,7 +2620,7 @@ int8_tArray __attribute__((visibility("default"))) TS_LDKCResult_CVec_u8ZPeerHa return res_arr; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_CVec_u8ZPeerHandleErrorZ_get_err(uint32_t arg) { - LDKCResult_CVec_u8ZPeerHandleErrorZ *val = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg; + LDKCResult_CVec_u8ZPeerHandleErrorZ *val = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKPeerHandleError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2795,12 +2632,12 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NonePeerHandleErr return ((LDKCResult_NonePeerHandleErrorZ*)arg)->result_ok; } void __attribute__((visibility("default"))) TS_LDKCResult_NonePeerHandleErrorZ_get_ok(uint32_t arg) { - LDKCResult_NonePeerHandleErrorZ *val = (LDKCResult_NonePeerHandleErrorZ*)arg; + LDKCResult_NonePeerHandleErrorZ *val = (LDKCResult_NonePeerHandleErrorZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NonePeerHandleErrorZ_get_err(uint32_t arg) { - LDKCResult_NonePeerHandleErrorZ *val = (LDKCResult_NonePeerHandleErrorZ*)arg; + LDKCResult_NonePeerHandleErrorZ *val = (LDKCResult_NonePeerHandleErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKPeerHandleError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2812,12 +2649,12 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_boolPeerHandleErr return ((LDKCResult_boolPeerHandleErrorZ*)arg)->result_ok; } jboolean __attribute__((visibility("default"))) TS_LDKCResult_boolPeerHandleErrorZ_get_ok(uint32_t arg) { - LDKCResult_boolPeerHandleErrorZ *val = (LDKCResult_boolPeerHandleErrorZ*)arg; + LDKCResult_boolPeerHandleErrorZ *val = (LDKCResult_boolPeerHandleErrorZ*)(arg & ~1); CHECK(val->result_ok); return *val->contents.result; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_boolPeerHandleErrorZ_get_err(uint32_t arg) { - LDKCResult_boolPeerHandleErrorZ *val = (LDKCResult_boolPeerHandleErrorZ*)arg; + LDKCResult_boolPeerHandleErrorZ *val = (LDKCResult_boolPeerHandleErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKPeerHandleError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2829,14 +2666,14 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_SecretKeySecpErro return ((LDKCResult_SecretKeySecpErrorZ*)arg)->result_ok; } int8_tArray __attribute__((visibility("default"))) TS_LDKCResult_SecretKeySecpErrorZ_get_ok(uint32_t arg) { - LDKCResult_SecretKeySecpErrorZ *val = (LDKCResult_SecretKeySecpErrorZ*)arg; + LDKCResult_SecretKeySecpErrorZ *val = (LDKCResult_SecretKeySecpErrorZ*)(arg & ~1); CHECK(val->result_ok); int8_tArray res_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(res_arr + 4), (*val->contents.result).bytes, 32); return res_arr; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_SecretKeySecpErrorZ_get_err(uint32_t arg) { - LDKCResult_SecretKeySecpErrorZ *val = (LDKCResult_SecretKeySecpErrorZ*)arg; + LDKCResult_SecretKeySecpErrorZ *val = (LDKCResult_SecretKeySecpErrorZ*)(arg & ~1); CHECK(!val->result_ok); uint32_t err_conv = LDKSecp256k1Error_to_js((*val->contents.err)); return err_conv; @@ -2845,14 +2682,14 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_PublicKeySecpErro return ((LDKCResult_PublicKeySecpErrorZ*)arg)->result_ok; } int8_tArray __attribute__((visibility("default"))) TS_LDKCResult_PublicKeySecpErrorZ_get_ok(uint32_t arg) { - LDKCResult_PublicKeySecpErrorZ *val = (LDKCResult_PublicKeySecpErrorZ*)arg; + LDKCResult_PublicKeySecpErrorZ *val = (LDKCResult_PublicKeySecpErrorZ*)(arg & ~1); CHECK(val->result_ok); int8_tArray res_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(res_arr + 4), (*val->contents.result).compressed_form, 33); return res_arr; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_PublicKeySecpErrorZ_get_err(uint32_t arg) { - LDKCResult_PublicKeySecpErrorZ *val = (LDKCResult_PublicKeySecpErrorZ*)arg; + LDKCResult_PublicKeySecpErrorZ *val = (LDKCResult_PublicKeySecpErrorZ*)(arg & ~1); CHECK(!val->result_ok); uint32_t err_conv = LDKSecp256k1Error_to_js((*val->contents.err)); return err_conv; @@ -2861,7 +2698,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysSec return ((LDKCResult_TxCreationKeysSecpErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysSecpErrorZ_get_ok(uint32_t arg) { - LDKCResult_TxCreationKeysSecpErrorZ *val = (LDKCResult_TxCreationKeysSecpErrorZ*)arg; + LDKCResult_TxCreationKeysSecpErrorZ *val = (LDKCResult_TxCreationKeysSecpErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKTxCreationKeys res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2870,7 +2707,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysSec return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysSecpErrorZ_get_err(uint32_t arg) { - LDKCResult_TxCreationKeysSecpErrorZ *val = (LDKCResult_TxCreationKeysSecpErrorZ*)arg; + LDKCResult_TxCreationKeysSecpErrorZ *val = (LDKCResult_TxCreationKeysSecpErrorZ*)(arg & ~1); CHECK(!val->result_ok); uint32_t err_conv = LDKSecp256k1Error_to_js((*val->contents.err)); return err_conv; @@ -2879,7 +2716,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitment return ((LDKCResult_TrustedCommitmentTransactionNoneZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitmentTransactionNoneZ_get_ok(uint32_t arg) { - LDKCResult_TrustedCommitmentTransactionNoneZ *val = (LDKCResult_TrustedCommitmentTransactionNoneZ*)arg; + LDKCResult_TrustedCommitmentTransactionNoneZ *val = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(arg & ~1); CHECK(val->result_ok); LDKTrustedCommitmentTransaction res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2888,7 +2725,28 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitment return res_ref; } void __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitmentTransactionNoneZ_get_err(uint32_t arg) { - LDKCResult_TrustedCommitmentTransactionNoneZ *val = (LDKCResult_TrustedCommitmentTransactionNoneZ*)arg; + LDKCResult_TrustedCommitmentTransactionNoneZ *val = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(arg & ~1); + CHECK(!val->result_ok); + return *val->contents.err; +} +jboolean __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_result_ok(uint32_t arg) { + return ((LDKCResult_CVec_SignatureZNoneZ*)arg)->result_ok; +} +ptrArray __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_get_ok(uint32_t arg) { + LDKCResult_CVec_SignatureZNoneZ *val = (LDKCResult_CVec_SignatureZNoneZ*)(arg & ~1); + CHECK(val->result_ok); + LDKCVec_SignatureZ res_var = (*val->contents.result); + ptrArray res_arr = init_arr(res_var.datalen, sizeof(uint32_t), "Native ptrArray Bytes"); + int8_tArray *res_arr_ptr = (int8_tArray*)(res_arr + 4); + for (size_t m = 0; m < res_var.datalen; m++) { + int8_tArray arr_conv_12_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes"); + memcpy((uint8_t*)(arr_conv_12_arr + 4), res_var.data[m].compact_form, 64); + res_arr_ptr[m] = arr_conv_12_arr; + } + return res_arr; +} +void __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_get_err(uint32_t arg) { + LDKCResult_CVec_SignatureZNoneZ *val = (LDKCResult_CVec_SignatureZNoneZ*)(arg & ~1); CHECK(!val->result_ok); return *val->contents.err; } @@ -2905,8 +2763,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_RouteHopZ_new(uint32 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); + arr_elem_conv = RouteHop_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -2930,7 +2787,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ return ((LDKCResult_RouteDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_RouteDecodeErrorZ *val = (LDKCResult_RouteDecodeErrorZ*)arg; + LDKCResult_RouteDecodeErrorZ *val = (LDKCResult_RouteDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKRoute res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2939,7 +2796,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_RouteDecodeErrorZ *val = (LDKCResult_RouteDecodeErrorZ*)arg; + LDKCResult_RouteDecodeErrorZ *val = (LDKCResult_RouteDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2960,8 +2817,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCVec_RouteHintZ_new(uint3 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); + arr_elem_conv = RouteHint_clone(&arr_elem_conv); ret->data[i] = arr_elem_conv; } } @@ -2978,7 +2834,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErr return ((LDKCResult_RouteLightningErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErrorZ_get_ok(uint32_t arg) { - LDKCResult_RouteLightningErrorZ *val = (LDKCResult_RouteLightningErrorZ*)arg; + LDKCResult_RouteLightningErrorZ *val = (LDKCResult_RouteLightningErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKRoute res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2987,7 +2843,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErr return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErrorZ_get_err(uint32_t arg) { - LDKCResult_RouteLightningErrorZ *val = (LDKCResult_RouteLightningErrorZ*)arg; + LDKCResult_RouteLightningErrorZ *val = (LDKCResult_RouteLightningErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKLightningError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -2999,7 +2855,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecode return ((LDKCResult_RoutingFeesDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_RoutingFeesDecodeErrorZ *val = (LDKCResult_RoutingFeesDecodeErrorZ*)arg; + LDKCResult_RoutingFeesDecodeErrorZ *val = (LDKCResult_RoutingFeesDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKRoutingFees res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3008,7 +2864,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecode return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_RoutingFeesDecodeErrorZ *val = (LDKCResult_RoutingFeesDecodeErrorZ*)arg; + LDKCResult_RoutingFeesDecodeErrorZ *val = (LDKCResult_RoutingFeesDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3020,7 +2876,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementI return ((LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_NodeAnnouncementInfoDecodeErrorZ *val = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)arg; + LDKCResult_NodeAnnouncementInfoDecodeErrorZ *val = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKNodeAnnouncementInfo res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3029,7 +2885,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementI return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementInfoDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_NodeAnnouncementInfoDecodeErrorZ *val = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)arg; + LDKCResult_NodeAnnouncementInfoDecodeErrorZ *val = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3041,7 +2897,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErr return ((LDKCResult_NodeInfoDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_NodeInfoDecodeErrorZ *val = (LDKCResult_NodeInfoDecodeErrorZ*)arg; + LDKCResult_NodeInfoDecodeErrorZ *val = (LDKCResult_NodeInfoDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKNodeInfo res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3050,7 +2906,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErr return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_NodeInfoDecodeErrorZ *val = (LDKCResult_NodeInfoDecodeErrorZ*)arg; + LDKCResult_NodeInfoDecodeErrorZ *val = (LDKCResult_NodeInfoDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3062,7 +2918,7 @@ jboolean __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecod return ((LDKCResult_NetworkGraphDecodeErrorZ*)arg)->result_ok; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecodeErrorZ_get_ok(uint32_t arg) { - LDKCResult_NetworkGraphDecodeErrorZ *val = (LDKCResult_NetworkGraphDecodeErrorZ*)arg; + LDKCResult_NetworkGraphDecodeErrorZ *val = (LDKCResult_NetworkGraphDecodeErrorZ*)(arg & ~1); CHECK(val->result_ok); LDKNetworkGraph res_var = (*val->contents.result); CHECK((((long)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3071,7 +2927,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecod return res_ref; } uint32_t __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecodeErrorZ_get_err(uint32_t arg) { - LDKCResult_NetworkGraphDecodeErrorZ *val = (LDKCResult_NetworkGraphDecodeErrorZ*)arg; + LDKCResult_NetworkGraphDecodeErrorZ *val = (LDKCResult_NetworkGraphDecodeErrorZ*)(arg & ~1); CHECK(!val->result_ok); LDKDecodeError err_var = (*val->contents.err); CHECK((((long)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -3102,7 +2958,7 @@ LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_jcall(const void* thi uint32_t* arg_vals = (uint32_t*)(arg + 4); for (size_t s = 0; s < arg_constr.datalen; s++) { uint32_t arr_conv_18 = arg_vals[s]; - LDKMessageSendEvent arr_conv_18_conv = *(LDKMessageSendEvent*)arr_conv_18; + LDKMessageSendEvent arr_conv_18_conv = *(LDKMessageSendEvent*)(((uint64_t)arr_conv_18) & ~1); FREE((void*)arr_conv_18); arg_constr.data[s] = arr_conv_18_conv; } @@ -3168,7 +3024,7 @@ LDKCVec_EventZ get_and_clear_pending_events_jcall(const void* this_arg) { uint32_t* arg_vals = (uint32_t*)(arg + 4); for (size_t h = 0; h < arg_constr.datalen; h++) { uint32_t arr_conv_7 = arg_vals[h]; - LDKEvent arr_conv_7_conv = *(LDKEvent*)arr_conv_7; + LDKEvent arr_conv_7_conv = *(LDKEvent*)(((uint64_t)arr_conv_7) & ~1); FREE((void*)arr_conv_7); arg_constr.data[h] = arr_conv_7_conv; } @@ -3227,7 +3083,7 @@ LDKCResult_TxOutAccessErrorZ get_utxo_jcall(const void* this_arg, const uint8_t int8_tArray genesis_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(genesis_hash_arr + 4), *genesis_hash, 32); LDKCResult_TxOutAccessErrorZ* ret = (LDKCResult_TxOutAccessErrorZ*)js_invoke_function_2(j_calls->get_utxo_meth, genesis_hash_arr, short_channel_id); - LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)ret; + LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_TxOutAccessErrorZ_clone((LDKCResult_TxOutAccessErrorZ*)ret); return ret_conv; } @@ -3289,8 +3145,7 @@ void register_tx_jcall(const void* this_arg, const uint8_t (* txid)[32], LDKu8sl void register_output_jcall(const void* this_arg, const LDKOutPoint * outpoint, LDKu8slice script_pubkey) { LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; LDKOutPoint outpoint_var = *outpoint; - if (outpoint->inner != NULL) - outpoint_var = OutPoint_clone(outpoint); + outpoint_var = OutPoint_clone(outpoint); 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 = (long)outpoint_var.inner; @@ -3371,7 +3226,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_jcall(const void* th id_ref |= 1; } LDKChannelMonitor data_var = *data; - // Warning: we may need a move here but can't clone! + data_var = ChannelMonitor_clone(data); CHECK((((long)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long data_ref = (long)data_var.inner; @@ -3379,7 +3234,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_jcall(const void* th data_ref |= 1; } LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)js_invoke_function_2(j_calls->persist_new_channel_meth, id_ref, data_ref); - LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)ret; + LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)ret); return ret_conv; } @@ -3393,8 +3248,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_jcall(const voi id_ref |= 1; } LDKChannelMonitorUpdate update_var = *update; - if (update->inner != NULL) - update_var = ChannelMonitorUpdate_clone(update); + update_var = ChannelMonitorUpdate_clone(update); 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 = (long)update_var.inner; @@ -3402,7 +3256,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_jcall(const voi update_ref |= 1; } LDKChannelMonitor data_var = *data; - // Warning: we may need a move here but can't clone! + data_var = ChannelMonitor_clone(data); CHECK((((long)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long data_ref = (long)data_var.inner; @@ -3410,7 +3264,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_jcall(const voi data_ref |= 1; } LDKCResult_NoneChannelMonitorUpdateErrZ* ret = (LDKCResult_NoneChannelMonitorUpdateErrZ*)js_invoke_function_3(j_calls->update_persisted_channel_meth, id_ref, update_ref, data_ref); - LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)ret; + LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1); ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)ret); return ret_conv; } @@ -3442,8 +3296,7 @@ uint32_t __attribute__((visibility("default"))) TS_Persist_persist_new_channel( LDKOutPoint id_conv; id_conv.inner = (void*)(id & (~1)); id_conv.is_owned = (id & 1) || (id == 0); - if (id_conv.inner != NULL) - id_conv = OutPoint_clone(&id_conv); + id_conv = OutPoint_clone(&id_conv); LDKChannelMonitor data_conv; data_conv.inner = (void*)(data & (~1)); data_conv.is_owned = false; @@ -3457,8 +3310,7 @@ uint32_t __attribute__((visibility("default"))) TS_Persist_update_persisted_cha LDKOutPoint id_conv; id_conv.inner = (void*)(id & (~1)); id_conv.is_owned = (id & 1) || (id == 0); - if (id_conv.inner != NULL) - id_conv = OutPoint_clone(&id_conv); + id_conv = OutPoint_clone(&id_conv); LDKChannelMonitorUpdate update_conv; update_conv.inner = (void*)(update & (~1)); update_conv.is_owned = false; @@ -3530,8 +3382,7 @@ void handle_open_channel_jcall(const void* this_arg, LDKPublicKey their_node_id, their_features_ref |= 1; } LDKOpenChannel msg_var = *msg; - if (msg->inner != NULL) - msg_var = OpenChannel_clone(msg); + msg_var = OpenChannel_clone(msg); 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 = (long)msg_var.inner; @@ -3552,8 +3403,7 @@ void handle_accept_channel_jcall(const void* this_arg, LDKPublicKey their_node_i their_features_ref |= 1; } LDKAcceptChannel msg_var = *msg; - if (msg->inner != NULL) - msg_var = AcceptChannel_clone(msg); + msg_var = AcceptChannel_clone(msg); 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 = (long)msg_var.inner; @@ -3567,8 +3417,7 @@ void handle_funding_created_jcall(const void* this_arg, LDKPublicKey their_node_ int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKFundingCreated msg_var = *msg; - if (msg->inner != NULL) - msg_var = FundingCreated_clone(msg); + msg_var = FundingCreated_clone(msg); 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 = (long)msg_var.inner; @@ -3582,8 +3431,7 @@ void handle_funding_signed_jcall(const void* this_arg, LDKPublicKey their_node_i int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKFundingSigned msg_var = *msg; - if (msg->inner != NULL) - msg_var = FundingSigned_clone(msg); + msg_var = FundingSigned_clone(msg); 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 = (long)msg_var.inner; @@ -3597,8 +3445,7 @@ void handle_funding_locked_jcall(const void* this_arg, LDKPublicKey their_node_i int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKFundingLocked msg_var = *msg; - if (msg->inner != NULL) - msg_var = FundingLocked_clone(msg); + msg_var = FundingLocked_clone(msg); 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 = (long)msg_var.inner; @@ -3612,8 +3459,7 @@ void handle_shutdown_jcall(const void* this_arg, LDKPublicKey their_node_id, con int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKShutdown msg_var = *msg; - if (msg->inner != NULL) - msg_var = Shutdown_clone(msg); + msg_var = Shutdown_clone(msg); 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 = (long)msg_var.inner; @@ -3627,8 +3473,7 @@ void handle_closing_signed_jcall(const void* this_arg, LDKPublicKey their_node_i int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKClosingSigned msg_var = *msg; - if (msg->inner != NULL) - msg_var = ClosingSigned_clone(msg); + msg_var = ClosingSigned_clone(msg); 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 = (long)msg_var.inner; @@ -3642,8 +3487,7 @@ void handle_update_add_htlc_jcall(const void* this_arg, LDKPublicKey their_node_ int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKUpdateAddHTLC msg_var = *msg; - if (msg->inner != NULL) - msg_var = UpdateAddHTLC_clone(msg); + msg_var = UpdateAddHTLC_clone(msg); 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 = (long)msg_var.inner; @@ -3657,8 +3501,7 @@ void handle_update_fulfill_htlc_jcall(const void* this_arg, LDKPublicKey their_n int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKUpdateFulfillHTLC msg_var = *msg; - if (msg->inner != NULL) - msg_var = UpdateFulfillHTLC_clone(msg); + msg_var = UpdateFulfillHTLC_clone(msg); 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 = (long)msg_var.inner; @@ -3672,8 +3515,7 @@ void handle_update_fail_htlc_jcall(const void* this_arg, LDKPublicKey their_node int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKUpdateFailHTLC msg_var = *msg; - if (msg->inner != NULL) - msg_var = UpdateFailHTLC_clone(msg); + msg_var = UpdateFailHTLC_clone(msg); 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 = (long)msg_var.inner; @@ -3687,8 +3529,7 @@ void handle_update_fail_malformed_htlc_jcall(const void* this_arg, LDKPublicKey int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKUpdateFailMalformedHTLC msg_var = *msg; - if (msg->inner != NULL) - msg_var = UpdateFailMalformedHTLC_clone(msg); + msg_var = UpdateFailMalformedHTLC_clone(msg); 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 = (long)msg_var.inner; @@ -3702,8 +3543,7 @@ void handle_commitment_signed_jcall(const void* this_arg, LDKPublicKey their_nod int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKCommitmentSigned msg_var = *msg; - if (msg->inner != NULL) - msg_var = CommitmentSigned_clone(msg); + msg_var = CommitmentSigned_clone(msg); 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 = (long)msg_var.inner; @@ -3717,8 +3557,7 @@ void handle_revoke_and_ack_jcall(const void* this_arg, LDKPublicKey their_node_i int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKRevokeAndACK msg_var = *msg; - if (msg->inner != NULL) - msg_var = RevokeAndACK_clone(msg); + msg_var = RevokeAndACK_clone(msg); 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 = (long)msg_var.inner; @@ -3732,8 +3571,7 @@ void handle_update_fee_jcall(const void* this_arg, LDKPublicKey their_node_id, c int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKUpdateFee msg_var = *msg; - if (msg->inner != NULL) - msg_var = UpdateFee_clone(msg); + msg_var = UpdateFee_clone(msg); 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 = (long)msg_var.inner; @@ -3747,8 +3585,7 @@ void handle_announcement_signatures_jcall(const void* this_arg, LDKPublicKey the int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKAnnouncementSignatures msg_var = *msg; - if (msg->inner != NULL) - msg_var = AnnouncementSignatures_clone(msg); + msg_var = AnnouncementSignatures_clone(msg); 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 = (long)msg_var.inner; @@ -3768,8 +3605,7 @@ void peer_connected_jcall(const void* this_arg, LDKPublicKey their_node_id, cons int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKInit msg_var = *msg; - if (msg->inner != NULL) - msg_var = Init_clone(msg); + msg_var = Init_clone(msg); 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 = (long)msg_var.inner; @@ -3783,8 +3619,7 @@ void handle_channel_reestablish_jcall(const void* this_arg, LDKPublicKey their_n int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKChannelReestablish msg_var = *msg; - if (msg->inner != NULL) - msg_var = ChannelReestablish_clone(msg); + msg_var = ChannelReestablish_clone(msg); 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 = (long)msg_var.inner; @@ -3798,8 +3633,7 @@ void handle_error_jcall(const void* this_arg, LDKPublicKey their_node_id, const int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKErrorMessage msg_var = *msg; - if (msg->inner != NULL) - msg_var = ErrorMessage_clone(msg); + msg_var = ErrorMessage_clone(msg); 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 = (long)msg_var.inner; @@ -3859,7 +3693,7 @@ void __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_ope 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! + // Warning: we need a move here but no clone is available for LDKInitFeatures LDKOpenChannel msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -3874,7 +3708,7 @@ void __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_acc 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! + // Warning: we need a move here but no clone is available for LDKInitFeatures LDKAcceptChannel msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -4100,8 +3934,7 @@ static void LDKRoutingMessageHandler_JCalls_free(void* this_arg) { LDKCResult_boolLightningErrorZ handle_node_announcement_jcall(const void* this_arg, const LDKNodeAnnouncement * msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; LDKNodeAnnouncement msg_var = *msg; - if (msg->inner != NULL) - msg_var = NodeAnnouncement_clone(msg); + msg_var = NodeAnnouncement_clone(msg); 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 = (long)msg_var.inner; @@ -4109,15 +3942,14 @@ LDKCResult_boolLightningErrorZ handle_node_announcement_jcall(const void* this_a msg_ref |= 1; } LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)js_invoke_function_1(j_calls->handle_node_announcement_meth, msg_ref); - LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_boolLightningErrorZ_clone((LDKCResult_boolLightningErrorZ*)ret); return ret_conv; } LDKCResult_boolLightningErrorZ handle_channel_announcement_jcall(const void* this_arg, const LDKChannelAnnouncement * msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; LDKChannelAnnouncement msg_var = *msg; - if (msg->inner != NULL) - msg_var = ChannelAnnouncement_clone(msg); + msg_var = ChannelAnnouncement_clone(msg); 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 = (long)msg_var.inner; @@ -4125,15 +3957,14 @@ LDKCResult_boolLightningErrorZ handle_channel_announcement_jcall(const void* thi msg_ref |= 1; } LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)js_invoke_function_1(j_calls->handle_channel_announcement_meth, msg_ref); - LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_boolLightningErrorZ_clone((LDKCResult_boolLightningErrorZ*)ret); return ret_conv; } LDKCResult_boolLightningErrorZ handle_channel_update_jcall(const void* this_arg, const LDKChannelUpdate * msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; LDKChannelUpdate msg_var = *msg; - if (msg->inner != NULL) - msg_var = ChannelUpdate_clone(msg); + msg_var = ChannelUpdate_clone(msg); 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 = (long)msg_var.inner; @@ -4141,8 +3972,8 @@ LDKCResult_boolLightningErrorZ handle_channel_update_jcall(const void* this_arg, msg_ref |= 1; } LDKCResult_boolLightningErrorZ* ret = (LDKCResult_boolLightningErrorZ*)js_invoke_function_1(j_calls->handle_channel_update_meth, msg_ref); - LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_boolLightningErrorZ_clone((LDKCResult_boolLightningErrorZ*)ret); return ret_conv; } void handle_htlc_fail_channel_update_jcall(const void* this_arg, const LDKHTLCFailChannelUpdate * update) { @@ -4162,7 +3993,7 @@ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel uint32_t* arg_vals = (uint32_t*)(arg + 4); for (size_t l = 0; l < arg_constr.datalen; l++) { uint32_t arr_conv_63 = arg_vals[l]; - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arr_conv_63_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)arr_conv_63; + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arr_conv_63_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(((uint64_t)arr_conv_63) & ~1); FREE((void*)arr_conv_63); arg_constr.data[l] = arr_conv_63_conv; } @@ -4185,8 +4016,7 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_jcall(const void* this_arg LDKNodeAnnouncement arr_conv_18_conv; arr_conv_18_conv.inner = (void*)(arr_conv_18 & (~1)); arr_conv_18_conv.is_owned = (arr_conv_18 & 1) || (arr_conv_18 == 0); - if (arr_conv_18_conv.inner != NULL) - arr_conv_18_conv = NodeAnnouncement_clone(&arr_conv_18_conv); + arr_conv_18_conv = NodeAnnouncement_clone(&arr_conv_18_conv); arg_constr.data[s] = arr_conv_18_conv; } return arg_constr; @@ -4196,8 +4026,7 @@ void sync_routing_table_jcall(const void* this_arg, LDKPublicKey their_node_id, int8_tArray their_node_id_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes"); memcpy((uint8_t*)(their_node_id_arr + 4), their_node_id.compressed_form, 33); LDKInit init_var = *init; - if (init->inner != NULL) - init_var = Init_clone(init); + init_var = Init_clone(init); CHECK((((long)init_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&init_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. long init_ref = (long)init_var.inner; @@ -4218,8 +4047,8 @@ LDKCResult_NoneLightningErrorZ handle_reply_channel_range_jcall(const void* this msg_ref |= 1; } LDKCResult_NoneLightningErrorZ* ret = (LDKCResult_NoneLightningErrorZ*)js_invoke_function_2(j_calls->handle_reply_channel_range_meth, their_node_id_arr, msg_ref); - LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)ret); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyShortChannelIdsEnd msg) { @@ -4234,8 +4063,8 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_jcall(const vo msg_ref |= 1; } LDKCResult_NoneLightningErrorZ* ret = (LDKCResult_NoneLightningErrorZ*)js_invoke_function_2(j_calls->handle_reply_short_channel_ids_end_meth, their_node_id_arr, msg_ref); - LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)ret); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_query_channel_range_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryChannelRange msg) { @@ -4250,8 +4079,8 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_jcall(const void* this msg_ref |= 1; } LDKCResult_NoneLightningErrorZ* ret = (LDKCResult_NoneLightningErrorZ*)js_invoke_function_2(j_calls->handle_query_channel_range_meth, their_node_id_arr, msg_ref); - LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)ret); return ret_conv; } LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryShortChannelIds msg) { @@ -4266,8 +4095,8 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_jcall(const void* msg_ref |= 1; } LDKCResult_NoneLightningErrorZ* ret = (LDKCResult_NoneLightningErrorZ*)js_invoke_function_2(j_calls->handle_query_short_channel_ids_meth, their_node_id_arr, msg_ref); - LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)ret; - // Warning: we may need a move here but can't do a full clone! + LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1); + ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)ret); return ret_conv; } static void* LDKRoutingMessageHandler_JCalls_clone(const void* this_arg) { @@ -4349,9 +4178,6 @@ uint32_tArray __attribute__((visibility("default"))) TS_RoutingMessageHandler_g for (size_t l = 0; l < ret_var.datalen; l++) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* arr_conv_63_ref = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *arr_conv_63_ref = ret_var.data[l]; - arr_conv_63_ref->a = ChannelAnnouncement_clone(&arr_conv_63_ref->a); - arr_conv_63_ref->b = ChannelUpdate_clone(&arr_conv_63_ref->b); - arr_conv_63_ref->c = ChannelUpdate_clone(&arr_conv_63_ref->c); ret_arr_ptr[l] = (long)arr_conv_63_ref; } FREE(ret_var.data); @@ -4399,8 +4225,7 @@ uint32_t __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle LDKReplyChannelRange msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); - if (msg_conv.inner != NULL) - msg_conv = ReplyChannelRange_clone(&msg_conv); + msg_conv = ReplyChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); return (long)ret_conv; @@ -4414,8 +4239,7 @@ uint32_t __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle LDKReplyShortChannelIdsEnd msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); - if (msg_conv.inner != NULL) - msg_conv = ReplyShortChannelIdsEnd_clone(&msg_conv); + msg_conv = ReplyShortChannelIdsEnd_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_short_channel_ids_end)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); return (long)ret_conv; @@ -4429,8 +4253,7 @@ uint32_t __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle LDKQueryChannelRange msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); - if (msg_conv.inner != NULL) - msg_conv = QueryChannelRange_clone(&msg_conv); + msg_conv = QueryChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); return (long)ret_conv; @@ -4444,8 +4267,7 @@ uint32_t __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle LDKQueryShortChannelIds msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); - if (msg_conv.inner != NULL) - msg_conv = QueryShortChannelIds_clone(&msg_conv); + msg_conv = QueryShortChannelIds_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_short_channel_ids)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); return (long)ret_conv; @@ -4545,13 +4367,14 @@ void __attribute__((visibility("default"))) TS_Transaction_free(int8_tArray _re } void __attribute__((visibility("default"))) TS_TxOut_free(uint32_t _res) { - LDKTxOut _res_conv = *(LDKTxOut*)_res; + if ((_res & 1) != 0) return; + LDKTxOut _res_conv = *(LDKTxOut*)(((uint64_t)_res) & ~1); FREE((void*)_res); TxOut_free(_res_conv); } uint32_t __attribute__((visibility("default"))) TS_TxOut_clone(uint32_t orig) { - LDKTxOut* orig_conv = (LDKTxOut*)orig; + LDKTxOut* orig_conv = (LDKTxOut*)(orig & ~1); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_clone(orig_conv); return (long)ret_ref; @@ -4567,7 +4390,7 @@ void __attribute__((visibility("default"))) TS_CVec_SpendableOutputDescriptorZ_ uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t b = 0; b < _res_constr.datalen; b++) { uint32_t arr_conv_27 = _res_vals[b]; - LDKSpendableOutputDescriptor arr_conv_27_conv = *(LDKSpendableOutputDescriptor*)arr_conv_27; + LDKSpendableOutputDescriptor arr_conv_27_conv = *(LDKSpendableOutputDescriptor*)(((uint64_t)arr_conv_27) & ~1); FREE((void*)arr_conv_27); _res_constr.data[b] = arr_conv_27_conv; } @@ -4584,7 +4407,7 @@ void __attribute__((visibility("default"))) TS_CVec_MessageSendEventZ_free(uint uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t s = 0; s < _res_constr.datalen; s++) { uint32_t arr_conv_18 = _res_vals[s]; - LDKMessageSendEvent arr_conv_18_conv = *(LDKMessageSendEvent*)arr_conv_18; + LDKMessageSendEvent arr_conv_18_conv = *(LDKMessageSendEvent*)(((uint64_t)arr_conv_18) & ~1); FREE((void*)arr_conv_18); _res_constr.data[s] = arr_conv_18_conv; } @@ -4601,7 +4424,7 @@ void __attribute__((visibility("default"))) TS_CVec_EventZ_free(uint32_tArray _ uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t h = 0; h < _res_constr.datalen; h++) { uint32_t arr_conv_7 = _res_vals[h]; - LDKEvent arr_conv_7_conv = *(LDKEvent*)arr_conv_7; + LDKEvent arr_conv_7_conv = *(LDKEvent*)(((uint64_t)arr_conv_7) & ~1); FREE((void*)arr_conv_7); _res_constr.data[h] = arr_conv_7_conv; } @@ -4609,7 +4432,8 @@ void __attribute__((visibility("default"))) TS_CVec_EventZ_free(uint32_tArray _ } void __attribute__((visibility("default"))) TS_C2Tuple_usizeTransactionZ_free(uint32_t _res) { - LDKC2Tuple_usizeTransactionZ _res_conv = *(LDKC2Tuple_usizeTransactionZ*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_usizeTransactionZ _res_conv = *(LDKC2Tuple_usizeTransactionZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_usizeTransactionZ_free(_res_conv); } @@ -4622,7 +4446,6 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_usizeTransactionZ_ne b_ref.data_is_owned = true; LDKC2Tuple_usizeTransactionZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *ret_ref = C2Tuple_usizeTransactionZ_new(a, b_ref); - // XXX: We likely need to clone here, but no _clone fn is available for Uint8Array return (long)ret_ref; } @@ -4636,7 +4459,7 @@ void __attribute__((visibility("default"))) TS_CVec_C2Tuple_usizeTransactionZZ_ uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t e = 0; e < _res_constr.datalen; e++) { uint32_t arr_conv_30 = _res_vals[e]; - LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)arr_conv_30; + LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)(((uint64_t)arr_conv_30) & ~1); FREE((void*)arr_conv_30); _res_constr.data[e] = arr_conv_30_conv; } @@ -4657,11 +4480,19 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUp } void __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint32_t _res) { - LDKCResult_NoneChannelMonitorUpdateErrZ _res_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NoneChannelMonitorUpdateErrZ _res_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NoneChannelMonitorUpdateErrZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint32_t orig) { + LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(orig & ~1); + LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); + *ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(orig_conv); + return (long)ret_conv; +} + void __attribute__((visibility("default"))) TS_CVec_MonitorEventZ_free(uint32_tArray _res) { LDKCVec_MonitorEventZ _res_constr; _res_constr.datalen = *((uint32_t*)_res); @@ -4684,8 +4515,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdate LDKChannelMonitorUpdate o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = ChannelMonitorUpdate_clone(&o_conv); + o_conv = ChannelMonitorUpdate_clone(&o_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -4695,14 +4525,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdate LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint32_t _res) { - LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res_conv); } @@ -4717,20 +4548,29 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NoneMonitorUpdateErr LDKMonitorUpdateError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = MonitorUpdateError_clone(&e_conv); LDKCResult_NoneMonitorUpdateErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ"); *ret_conv = CResult_NoneMonitorUpdateErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_NoneMonitorUpdateErrorZ_free(uint32_t _res) { - LDKCResult_NoneMonitorUpdateErrorZ _res_conv = *(LDKCResult_NoneMonitorUpdateErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NoneMonitorUpdateErrorZ _res_conv = *(LDKCResult_NoneMonitorUpdateErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NoneMonitorUpdateErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NoneMonitorUpdateErrorZ_clone(uint32_t orig) { + LDKCResult_NoneMonitorUpdateErrorZ* orig_conv = (LDKCResult_NoneMonitorUpdateErrorZ*)(orig & ~1); + LDKCResult_NoneMonitorUpdateErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ"); + *ret_conv = CResult_NoneMonitorUpdateErrorZ_clone(orig_conv); + return (long)ret_conv; +} + void __attribute__((visibility("default"))) TS_C2Tuple_OutPointScriptZ_free(uint32_t _res) { - LDKC2Tuple_OutPointScriptZ _res_conv = *(LDKC2Tuple_OutPointScriptZ*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_OutPointScriptZ _res_conv = *(LDKC2Tuple_OutPointScriptZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_OutPointScriptZ_free(_res_conv); } @@ -4739,16 +4579,13 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_OutPointScriptZ_new( 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); + a_conv = OutPoint_clone(&a_conv); LDKCVec_u8Z b_ref; b_ref.datalen = *((uint32_t*)b); b_ref.data = MALLOC(b_ref.datalen, "LDKCVec_u8Z Bytes"); memcpy(b_ref.data, (uint8_t*)(b + 4), b_ref.datalen); LDKC2Tuple_OutPointScriptZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_ref = C2Tuple_OutPointScriptZ_new(a_conv, b_ref); - ret_ref->a = OutPoint_clone(&ret_ref->a); - ret_ref->b = CVec_u8Z_clone(&ret_ref->b); return (long)ret_ref; } @@ -4772,18 +4609,25 @@ void __attribute__((visibility("default"))) TS_CVec_TransactionZ_free(ptrArray CVec_TransactionZ_free(_res_constr); } +uint32_t __attribute__((visibility("default"))) TS_C2Tuple_u32TxOutZ_clone(uint32_t orig) { + LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)(orig & ~1); + LDKC2Tuple_u32TxOutZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); + *ret_ref = C2Tuple_u32TxOutZ_clone(orig_conv); + return (long)ret_ref; +} + void __attribute__((visibility("default"))) TS_C2Tuple_u32TxOutZ_free(uint32_t _res) { - LDKC2Tuple_u32TxOutZ _res_conv = *(LDKC2Tuple_u32TxOutZ*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_u32TxOutZ _res_conv = *(LDKC2Tuple_u32TxOutZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_u32TxOutZ_free(_res_conv); } uint32_t __attribute__((visibility("default"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint32_t b) { - LDKTxOut b_conv = *(LDKTxOut*)b; + LDKTxOut b_conv = *(LDKTxOut*)(((uint64_t)b) & ~1); FREE((void*)b); LDKC2Tuple_u32TxOutZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_ref = C2Tuple_u32TxOutZ_new(a, b_conv); - ret_ref->b = TxOut_clone(&ret_ref->b); return (long)ret_ref; } @@ -4797,7 +4641,7 @@ void __attribute__((visibility("default"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uin uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t z = 0; z < _res_constr.datalen; z++) { uint32_t arr_conv_25 = _res_vals[z]; - LDKC2Tuple_u32TxOutZ arr_conv_25_conv = *(LDKC2Tuple_u32TxOutZ*)arr_conv_25; + LDKC2Tuple_u32TxOutZ arr_conv_25_conv = *(LDKC2Tuple_u32TxOutZ*)(((uint64_t)arr_conv_25) & ~1); FREE((void*)arr_conv_25); _res_constr.data[z] = arr_conv_25_conv; } @@ -4805,7 +4649,8 @@ void __attribute__((visibility("default"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uin } void __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(uint32_t _res) { - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(_res_conv); } @@ -4823,14 +4668,12 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tuple_u32 uint32_t* b_vals = (uint32_t*)(b + 4); for (size_t z = 0; z < b_constr.datalen; z++) { uint32_t arr_conv_25 = b_vals[z]; - LDKC2Tuple_u32TxOutZ arr_conv_25_conv = *(LDKC2Tuple_u32TxOutZ*)arr_conv_25; + LDKC2Tuple_u32TxOutZ arr_conv_25_conv = *(LDKC2Tuple_u32TxOutZ*)(((uint64_t)arr_conv_25) & ~1); FREE((void*)arr_conv_25); b_constr.data[z] = arr_conv_25_conv; } LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_ref = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a_ref, b_constr); - ret_ref->a = ThirtyTwoBytes_clone(&ret_ref->a); - ret_ref->b = CVec_C2Tuple_u32TxOutZZ_clone(&ret_ref->b); return (long)ret_ref; } @@ -4844,7 +4687,7 @@ void __attribute__((visibility("default"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u3 uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t x = 0; x < _res_constr.datalen; x++) { uint32_t arr_conv_49 = _res_vals[x]; - LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ arr_conv_49_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)arr_conv_49; + LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ arr_conv_49_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(((uint64_t)arr_conv_49) & ~1); FREE((void*)arr_conv_49); _res_constr.data[x] = arr_conv_49_conv; } @@ -4852,7 +4695,8 @@ void __attribute__((visibility("default"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u3 } void __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint32_t _res) { - LDKC2Tuple_BlockHashChannelMonitorZ _res_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_BlockHashChannelMonitorZ _res_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_BlockHashChannelMonitorZ_free(_res_conv); } @@ -4864,16 +4708,14 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMoni LDKChannelMonitor b_conv; b_conv.inner = (void*)(b & (~1)); b_conv.is_owned = (b & 1) || (b == 0); - // Warning: we may need a move here but can't clone! + b_conv = ChannelMonitor_clone(&b_conv); LDKC2Tuple_BlockHashChannelMonitorZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_ref = C2Tuple_BlockHashChannelMonitorZ_new(a_ref, b_conv); - ret_ref->a = ThirtyTwoBytes_clone(&ret_ref->a); - // XXX: We likely need to clone here, but no _clone fn is available for ChannelMonitor return (long)ret_ref; } uint32_t __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint32_t o) { - LDKC2Tuple_BlockHashChannelMonitorZ o_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)o; + LDKC2Tuple_BlockHashChannelMonitorZ o_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(((uint64_t)o) & ~1); FREE((void*)o); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o_conv); @@ -4884,20 +4726,29 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashCha LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(uint32_t _res) { - LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_C2Tuple_u64u64Z_clone(uint32_t orig) { + LDKC2Tuple_u64u64Z* orig_conv = (LDKC2Tuple_u64u64Z*)(orig & ~1); + LDKC2Tuple_u64u64Z* ret_ref = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); + *ret_ref = C2Tuple_u64u64Z_clone(orig_conv); + return (long)ret_ref; +} + void __attribute__((visibility("default"))) TS_C2Tuple_u64u64Z_free(uint32_t _res) { - LDKC2Tuple_u64u64Z _res_conv = *(LDKC2Tuple_u64u64Z*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_u64u64Z _res_conv = *(LDKC2Tuple_u64u64Z*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_u64u64Z_free(_res_conv); } @@ -4909,7 +4760,7 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_u64u64Z_new(int64_t } uint32_t __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint32_t o) { - LDKSpendableOutputDescriptor o_conv = *(LDKSpendableOutputDescriptor*)o; + LDKSpendableOutputDescriptor o_conv = *(LDKSpendableOutputDescriptor*)(((uint64_t)o) & ~1); FREE((void*)o); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o_conv); @@ -4920,18 +4771,26 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescr LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint32_t _res) { - LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint32_t orig) { + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(orig & ~1); + LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); + *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig_conv); + return (long)ret_conv; +} + void __attribute__((visibility("default"))) TS_CVec_SignatureZ_free(ptrArray _res) { LDKCVec_SignatureZ _res_constr; _res_constr.datalen = *((uint32_t*)_res); @@ -4950,8 +4809,16 @@ void __attribute__((visibility("default"))) TS_CVec_SignatureZ_free(ptrArray _r CVec_SignatureZ_free(_res_constr); } +uint32_t __attribute__((visibility("default"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint32_t orig) { + LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(orig & ~1); + LDKC2Tuple_SignatureCVec_SignatureZZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); + *ret_ref = C2Tuple_SignatureCVec_SignatureZZ_clone(orig_conv); + return (long)ret_ref; +} + void __attribute__((visibility("default"))) TS_C2Tuple_SignatureCVec_SignatureZZ_free(uint32_t _res) { - LDKC2Tuple_SignatureCVec_SignatureZZ _res_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_SignatureCVec_SignatureZZ _res_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_SignatureCVec_SignatureZZ_free(_res_conv); } @@ -4976,13 +4843,11 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_SignatureCVec_Signat } LDKC2Tuple_SignatureCVec_SignatureZZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_ref = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_constr); - // XXX: We likely need to clone here, but no _clone fn is available for Uint8Array - // XXX: We likely need to clone here, but no _clone fn is available for Uint8Array[] return (long)ret_ref; } uint32_t __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint32_t o) { - LDKC2Tuple_SignatureCVec_SignatureZZ o_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)o; + LDKC2Tuple_SignatureCVec_SignatureZZ o_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uint64_t)o) & ~1); FREE((void*)o); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o_conv); @@ -4996,13 +4861,14 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVe } void __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(uint32_t _res) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res_conv); } uint32_t __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint32_t orig) { - LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)orig; + LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(orig & ~1); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(orig_conv); return (long)ret_conv; @@ -5024,59 +4890,21 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_err() } void __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_free(uint32_t _res) { - LDKCResult_SignatureNoneZ _res_conv = *(LDKCResult_SignatureNoneZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_SignatureNoneZ _res_conv = *(LDKCResult_SignatureNoneZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_SignatureNoneZ_free(_res_conv); } uint32_t __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_clone(uint32_t orig) { - LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)orig; + LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)(orig & ~1); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_clone(orig_conv); return (long)ret_conv; } -uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_ok(ptrArray o) { - LDKCVec_SignatureZ o_constr; - o_constr.datalen = *((uint32_t*)o); - if (o_constr.datalen > 0) - o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); - else - o_constr.data = NULL; - int8_tArray* o_vals = (int8_tArray*)(o + 4); - for (size_t m = 0; m < o_constr.datalen; m++) { - int8_tArray arr_conv_12 = o_vals[m]; - LDKSignature arr_conv_12_ref; - CHECK(*((uint32_t*)arr_conv_12) == 64); - memcpy(arr_conv_12_ref.compact_form, (uint8_t*)(arr_conv_12 + 4), 64); - o_constr.data[m] = arr_conv_12_ref; - } - LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); - *ret_conv = CResult_CVec_SignatureZNoneZ_ok(o_constr); - return (long)ret_conv; -} - -uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_err() { - LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); - *ret_conv = CResult_CVec_SignatureZNoneZ_err(); - return (long)ret_conv; -} - -void __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_free(uint32_t _res) { - LDKCResult_CVec_SignatureZNoneZ _res_conv = *(LDKCResult_CVec_SignatureZNoneZ*)_res; - FREE((void*)_res); - CResult_CVec_SignatureZNoneZ_free(_res_conv); -} - -uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint32_t orig) { - LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)orig; - LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); - *ret_conv = CResult_CVec_SignatureZNoneZ_clone(orig_conv); - return (long)ret_conv; -} - uint32_t __attribute__((visibility("default"))) TS_CResult_ChanKeySignerDecodeErrorZ_ok(uint32_t o) { - LDKChannelKeys o_conv = *(LDKChannelKeys*)o; + LDKChannelKeys o_conv = *(LDKChannelKeys*)(((uint64_t)o) & ~1); LDKCResult_ChanKeySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChanKeySignerDecodeErrorZ), "LDKCResult_ChanKeySignerDecodeErrorZ"); *ret_conv = CResult_ChanKeySignerDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5086,24 +4914,31 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ChanKeySignerDecodeE LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_ChanKeySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChanKeySignerDecodeErrorZ), "LDKCResult_ChanKeySignerDecodeErrorZ"); *ret_conv = CResult_ChanKeySignerDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_ChanKeySignerDecodeErrorZ_free(uint32_t _res) { - LDKCResult_ChanKeySignerDecodeErrorZ _res_conv = *(LDKCResult_ChanKeySignerDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_ChanKeySignerDecodeErrorZ _res_conv = *(LDKCResult_ChanKeySignerDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_ChanKeySignerDecodeErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_ChanKeySignerDecodeErrorZ_clone(uint32_t orig) { + LDKCResult_ChanKeySignerDecodeErrorZ* orig_conv = (LDKCResult_ChanKeySignerDecodeErrorZ*)(orig & ~1); + LDKCResult_ChanKeySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChanKeySignerDecodeErrorZ), "LDKCResult_ChanKeySignerDecodeErrorZ"); + *ret_conv = CResult_ChanKeySignerDecodeErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_InMemoryChannelKeysDecodeErrorZ_ok(uint32_t o) { LDKInMemoryChannelKeys o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = InMemoryChannelKeys_clone(&o_conv); + o_conv = InMemoryChannelKeys_clone(&o_conv); LDKCResult_InMemoryChannelKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemoryChannelKeysDecodeErrorZ), "LDKCResult_InMemoryChannelKeysDecodeErrorZ"); *ret_conv = CResult_InMemoryChannelKeysDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5113,20 +4948,21 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_InMemoryChannelKeysD LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_InMemoryChannelKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemoryChannelKeysDecodeErrorZ), "LDKCResult_InMemoryChannelKeysDecodeErrorZ"); *ret_conv = CResult_InMemoryChannelKeysDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_InMemoryChannelKeysDecodeErrorZ_free(uint32_t _res) { - LDKCResult_InMemoryChannelKeysDecodeErrorZ _res_conv = *(LDKCResult_InMemoryChannelKeysDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_InMemoryChannelKeysDecodeErrorZ _res_conv = *(LDKCResult_InMemoryChannelKeysDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_InMemoryChannelKeysDecodeErrorZ_free(_res_conv); } uint32_t __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_ok(uint32_t o) { - LDKTxOut o_conv = *(LDKTxOut*)o; + LDKTxOut o_conv = *(LDKTxOut*)(((uint64_t)o) & ~1); FREE((void*)o); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_ok(o_conv); @@ -5141,11 +4977,19 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_er } void __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_free(uint32_t _res) { - LDKCResult_TxOutAccessErrorZ _res_conv = *(LDKCResult_TxOutAccessErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_TxOutAccessErrorZ _res_conv = *(LDKCResult_TxOutAccessErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_TxOutAccessErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_clone(uint32_t orig) { + LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)(orig & ~1); + LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); + *ret_conv = CResult_TxOutAccessErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_ok() { LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_ok(); @@ -5153,7 +4997,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_ok() { } uint32_t __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_err(uint32_t e) { - LDKAPIError e_conv = *(LDKAPIError*)e; + LDKAPIError e_conv = *(LDKAPIError*)(((uint64_t)e) & ~1); FREE((void*)e); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_err(e_conv); @@ -5161,7 +5005,8 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_err(ui } void __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_free(uint32_t _res) { - LDKCResult_NoneAPIErrorZ _res_conv = *(LDKCResult_NoneAPIErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NoneAPIErrorZ _res_conv = *(LDKCResult_NoneAPIErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NoneAPIErrorZ_free(_res_conv); } @@ -5194,18 +5039,26 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailu LDKPaymentSendFailure e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = PaymentSendFailure_clone(&e_conv); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailureZ_free(uint32_t _res) { - LDKCResult_NonePaymentSendFailureZ _res_conv = *(LDKCResult_NonePaymentSendFailureZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NonePaymentSendFailureZ _res_conv = *(LDKCResult_NonePaymentSendFailureZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NonePaymentSendFailureZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailureZ_clone(uint32_t orig) { + LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)(orig & ~1); + LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); + *ret_conv = CResult_NonePaymentSendFailureZ_clone(orig_conv); + return (long)ret_conv; +} + void __attribute__((visibility("default"))) TS_CVec_NetAddressZ_free(uint32_tArray _res) { LDKCVec_NetAddressZ _res_constr; _res_constr.datalen = *((uint32_t*)_res); @@ -5216,7 +5069,7 @@ void __attribute__((visibility("default"))) TS_CVec_NetAddressZ_free(uint32_tAr uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t m = 0; m < _res_constr.datalen; m++) { uint32_t arr_conv_12 = _res_vals[m]; - LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)arr_conv_12; + LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)(((uint64_t)arr_conv_12) & ~1); FREE((void*)arr_conv_12); _res_constr.data[m] = arr_conv_12_conv; } @@ -5242,7 +5095,8 @@ void __attribute__((visibility("default"))) TS_CVec_ChannelMonitorZ_free(uint32 } void __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint32_t _res) { - LDKC2Tuple_BlockHashChannelManagerZ _res_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)_res; + if ((_res & 1) != 0) return; + LDKC2Tuple_BlockHashChannelManagerZ _res_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C2Tuple_BlockHashChannelManagerZ_free(_res_conv); } @@ -5254,16 +5108,14 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMana LDKChannelManager b_conv; b_conv.inner = (void*)(b & (~1)); b_conv.is_owned = (b & 1) || (b == 0); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKChannelManager LDKC2Tuple_BlockHashChannelManagerZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelManagerZ), "LDKC2Tuple_BlockHashChannelManagerZ"); *ret_ref = C2Tuple_BlockHashChannelManagerZ_new(a_ref, b_conv); - ret_ref->a = ThirtyTwoBytes_clone(&ret_ref->a); - // XXX: We likely need to clone here, but no _clone fn is available for ChannelManager return (long)ret_ref; } uint32_t __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint32_t o) { - LDKC2Tuple_BlockHashChannelManagerZ o_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)o; + LDKC2Tuple_BlockHashChannelManagerZ o_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(((uint64_t)o) & ~1); FREE((void*)o); LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o_conv); @@ -5274,20 +5126,21 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashCha LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(uint32_t _res) { - LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res_conv); } uint32_t __attribute__((visibility("default"))) TS_CResult_NetAddressu8Z_ok(uint32_t o) { - LDKNetAddress o_conv = *(LDKNetAddress*)o; + LDKNetAddress o_conv = *(LDKNetAddress*)(((uint64_t)o) & ~1); FREE((void*)o); LDKCResult_NetAddressu8Z* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressu8Z), "LDKCResult_NetAddressu8Z"); *ret_conv = CResult_NetAddressu8Z_ok(o_conv); @@ -5301,13 +5154,21 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NetAddressu8Z_err(in } void __attribute__((visibility("default"))) TS_CResult_NetAddressu8Z_free(uint32_t _res) { - LDKCResult_NetAddressu8Z _res_conv = *(LDKCResult_NetAddressu8Z*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NetAddressu8Z _res_conv = *(LDKCResult_NetAddressu8Z*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NetAddressu8Z_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NetAddressu8Z_clone(uint32_t orig) { + LDKCResult_NetAddressu8Z* orig_conv = (LDKCResult_NetAddressu8Z*)(orig & ~1); + LDKCResult_NetAddressu8Z* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressu8Z), "LDKCResult_NetAddressu8Z"); + *ret_conv = CResult_NetAddressu8Z_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_CResult_NetAddressu8ZDecodeErrorZ_ok(uint32_t o) { - LDKCResult_NetAddressu8Z o_conv = *(LDKCResult_NetAddressu8Z*)o; + LDKCResult_NetAddressu8Z o_conv = *(LDKCResult_NetAddressu8Z*)(((uint64_t)o) & ~1); FREE((void*)o); LDKCResult_CResult_NetAddressu8ZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CResult_NetAddressu8ZDecodeErrorZ), "LDKCResult_CResult_NetAddressu8ZDecodeErrorZ"); *ret_conv = CResult_CResult_NetAddressu8ZDecodeErrorZ_ok(o_conv); @@ -5318,14 +5179,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_CResult_NetAddressu8 LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_CResult_NetAddressu8ZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CResult_NetAddressu8ZDecodeErrorZ), "LDKCResult_CResult_NetAddressu8ZDecodeErrorZ"); *ret_conv = CResult_CResult_NetAddressu8ZDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_CResult_NetAddressu8ZDecodeErrorZ_free(uint32_t _res) { - LDKCResult_CResult_NetAddressu8ZDecodeErrorZ _res_conv = *(LDKCResult_CResult_NetAddressu8ZDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_CResult_NetAddressu8ZDecodeErrorZ _res_conv = *(LDKCResult_CResult_NetAddressu8ZDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_CResult_NetAddressu8ZDecodeErrorZ_free(_res_conv); } @@ -5427,20 +5289,29 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_ LDKLightningError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = LightningError_clone(&e_conv); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_free(uint32_t _res) { - LDKCResult_boolLightningErrorZ _res_conv = *(LDKCResult_boolLightningErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_boolLightningErrorZ _res_conv = *(LDKCResult_boolLightningErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_boolLightningErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_clone(uint32_t orig) { + LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)(orig & ~1); + LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); + *ret_conv = CResult_boolLightningErrorZ_clone(orig_conv); + return (long)ret_conv; +} + void __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint32_t _res) { - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)_res; + if ((_res & 1) != 0) return; + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(_res_conv); } @@ -5449,23 +5320,17 @@ uint32_t __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementC 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); + 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); + 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); + c_conv = ChannelUpdate_clone(&c_conv); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_ref = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_ref = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a_conv, b_conv, c_conv); - ret_ref->a = ChannelAnnouncement_clone(&ret_ref->a); - ret_ref->b = ChannelUpdate_clone(&ret_ref->b); - ret_ref->c = ChannelUpdate_clone(&ret_ref->c); return (long)ret_ref; } @@ -5479,7 +5344,7 @@ void __attribute__((visibility("default"))) TS_CVec_C3Tuple_ChannelAnnouncement uint32_t* _res_vals = (uint32_t*)(_res + 4); for (size_t l = 0; l < _res_constr.datalen; l++) { uint32_t arr_conv_63 = _res_vals[l]; - LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arr_conv_63_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)arr_conv_63; + LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arr_conv_63_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(((uint64_t)arr_conv_63) & ~1); FREE((void*)arr_conv_63); _res_constr.data[l] = arr_conv_63_conv; } @@ -5514,24 +5379,31 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_ LDKLightningError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = LightningError_clone(&e_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_free(uint32_t _res) { - LDKCResult_NoneLightningErrorZ _res_conv = *(LDKCResult_NoneLightningErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NoneLightningErrorZ _res_conv = *(LDKCResult_NoneLightningErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NoneLightningErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_clone(uint32_t orig) { + LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)(orig & ~1); + LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); + *ret_conv = CResult_NoneLightningErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDecodeErrorZ_ok(uint32_t o) { LDKChannelReestablish o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = ChannelReestablish_clone(&o_conv); + o_conv = ChannelReestablish_clone(&o_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5541,14 +5413,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDe LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint32_t _res) { - LDKCResult_ChannelReestablishDecodeErrorZ _res_conv = *(LDKCResult_ChannelReestablishDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_ChannelReestablishDecodeErrorZ _res_conv = *(LDKCResult_ChannelReestablishDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_ChannelReestablishDecodeErrorZ_free(_res_conv); } @@ -5557,8 +5430,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_ok( LDKInit o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = Init_clone(&o_conv); + o_conv = Init_clone(&o_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5568,14 +5440,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_err LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_free(uint32_t _res) { - LDKCResult_InitDecodeErrorZ _res_conv = *(LDKCResult_InitDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_InitDecodeErrorZ _res_conv = *(LDKCResult_InitDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_InitDecodeErrorZ_free(_res_conv); } @@ -5584,8 +5457,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_ok( LDKPing o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = Ping_clone(&o_conv); + o_conv = Ping_clone(&o_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5595,14 +5467,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_err LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_free(uint32_t _res) { - LDKCResult_PingDecodeErrorZ _res_conv = *(LDKCResult_PingDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_PingDecodeErrorZ _res_conv = *(LDKCResult_PingDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_PingDecodeErrorZ_free(_res_conv); } @@ -5611,8 +5484,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_ok( LDKPong o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = Pong_clone(&o_conv); + o_conv = Pong_clone(&o_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5622,14 +5494,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_err LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_free(uint32_t _res) { - LDKCResult_PongDecodeErrorZ _res_conv = *(LDKCResult_PongDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_PongDecodeErrorZ _res_conv = *(LDKCResult_PongDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_PongDecodeErrorZ_free(_res_conv); } @@ -5638,8 +5511,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnou LDKUnsignedChannelAnnouncement o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = UnsignedChannelAnnouncement_clone(&o_conv); + o_conv = UnsignedChannelAnnouncement_clone(&o_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5649,14 +5521,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnou LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint32_t _res) { - LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(_res_conv); } @@ -5665,8 +5538,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdat LDKUnsignedChannelUpdate o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = UnsignedChannelUpdate_clone(&o_conv); + o_conv = UnsignedChannelUpdate_clone(&o_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5676,14 +5548,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdat LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint32_t _res) { - LDKCResult_UnsignedChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_UnsignedChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_UnsignedChannelUpdateDecodeErrorZ_free(_res_conv); } @@ -5692,8 +5565,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeEr LDKErrorMessage o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = ErrorMessage_clone(&o_conv); + o_conv = ErrorMessage_clone(&o_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5703,14 +5575,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeEr LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint32_t _res) { - LDKCResult_ErrorMessageDecodeErrorZ _res_conv = *(LDKCResult_ErrorMessageDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_ErrorMessageDecodeErrorZ _res_conv = *(LDKCResult_ErrorMessageDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_ErrorMessageDecodeErrorZ_free(_res_conv); } @@ -5719,8 +5592,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnounce LDKUnsignedNodeAnnouncement o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = UnsignedNodeAnnouncement_clone(&o_conv); + o_conv = UnsignedNodeAnnouncement_clone(&o_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5730,14 +5602,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnounce LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint32_t _res) { - LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(_res_conv); } @@ -5746,8 +5619,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIds LDKQueryShortChannelIds o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = QueryShortChannelIds_clone(&o_conv); + o_conv = QueryShortChannelIds_clone(&o_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5757,14 +5629,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIds LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint32_t _res) { - LDKCResult_QueryShortChannelIdsDecodeErrorZ _res_conv = *(LDKCResult_QueryShortChannelIdsDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_QueryShortChannelIdsDecodeErrorZ _res_conv = *(LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_QueryShortChannelIdsDecodeErrorZ_free(_res_conv); } @@ -5773,8 +5646,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIds LDKReplyShortChannelIdsEnd o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = ReplyShortChannelIdsEnd_clone(&o_conv); + o_conv = ReplyShortChannelIdsEnd_clone(&o_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5784,14 +5656,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIds LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint32_t _res) { - LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ _res_conv = *(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ _res_conv = *(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(_res_conv); } @@ -5800,8 +5673,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDec LDKQueryChannelRange o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = QueryChannelRange_clone(&o_conv); + o_conv = QueryChannelRange_clone(&o_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5811,14 +5683,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDec LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint32_t _res) { - LDKCResult_QueryChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_QueryChannelRangeDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_QueryChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_QueryChannelRangeDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_QueryChannelRangeDecodeErrorZ_free(_res_conv); } @@ -5827,8 +5700,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDec LDKReplyChannelRange o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = ReplyChannelRange_clone(&o_conv); + o_conv = ReplyChannelRange_clone(&o_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5838,14 +5710,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDec LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint32_t _res) { - LDKCResult_ReplyChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_ReplyChannelRangeDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_ReplyChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_ReplyChannelRangeDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_ReplyChannelRangeDecodeErrorZ_free(_res_conv); } @@ -5854,8 +5727,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilte LDKGossipTimestampFilter o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = GossipTimestampFilter_clone(&o_conv); + o_conv = GossipTimestampFilter_clone(&o_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -5865,14 +5737,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilte LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint32_t _res) { - LDKCResult_GossipTimestampFilterDecodeErrorZ _res_conv = *(LDKCResult_GossipTimestampFilterDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_GossipTimestampFilterDecodeErrorZ _res_conv = *(LDKCResult_GossipTimestampFilterDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_GossipTimestampFilterDecodeErrorZ_free(_res_conv); } @@ -5917,18 +5790,26 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleEr LDKPeerHandleError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = PeerHandleError_clone(&e_conv); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_free(uint32_t _res) { - LDKCResult_CVec_u8ZPeerHandleErrorZ _res_conv = *(LDKCResult_CVec_u8ZPeerHandleErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_CVec_u8ZPeerHandleErrorZ _res_conv = *(LDKCResult_CVec_u8ZPeerHandleErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_CVec_u8ZPeerHandleErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint32_t orig) { + LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(orig & ~1); + LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); + *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_ok() { LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_ok(); @@ -5939,18 +5820,26 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ LDKPeerHandleError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = PeerHandleError_clone(&e_conv); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_free(uint32_t _res) { - LDKCResult_NonePeerHandleErrorZ _res_conv = *(LDKCResult_NonePeerHandleErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NonePeerHandleErrorZ _res_conv = *(LDKCResult_NonePeerHandleErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NonePeerHandleErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_clone(uint32_t orig) { + LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)(orig & ~1); + LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); + *ret_conv = CResult_NonePeerHandleErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_ok(jboolean o) { LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_ok(o); @@ -5961,18 +5850,26 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ LDKPeerHandleError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = PeerHandleError_clone(&e_conv); LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_free(uint32_t _res) { - LDKCResult_boolPeerHandleErrorZ _res_conv = *(LDKCResult_boolPeerHandleErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_boolPeerHandleErrorZ _res_conv = *(LDKCResult_boolPeerHandleErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_boolPeerHandleErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_clone(uint32_t orig) { + LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)(orig & ~1); + LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); + *ret_conv = CResult_boolPeerHandleErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_SecretKeySecpErrorZ_ok(int8_tArray o) { LDKSecretKey o_ref; CHECK(*((uint32_t*)o) == 32); @@ -5990,7 +5887,8 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_SecretKeySecpErrorZ_ } void __attribute__((visibility("default"))) TS_CResult_SecretKeySecpErrorZ_free(uint32_t _res) { - LDKCResult_SecretKeySecpErrorZ _res_conv = *(LDKCResult_SecretKeySecpErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_SecretKeySecpErrorZ _res_conv = *(LDKCResult_SecretKeySecpErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_SecretKeySecpErrorZ_free(_res_conv); } @@ -6012,7 +5910,8 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_PublicKeySecpErrorZ_ } void __attribute__((visibility("default"))) TS_CResult_PublicKeySecpErrorZ_free(uint32_t _res) { - LDKCResult_PublicKeySecpErrorZ _res_conv = *(LDKCResult_PublicKeySecpErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_PublicKeySecpErrorZ _res_conv = *(LDKCResult_PublicKeySecpErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_PublicKeySecpErrorZ_free(_res_conv); } @@ -6021,8 +5920,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_TxCreationKeysSecpEr LDKTxCreationKeys o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = TxCreationKeys_clone(&o_conv); + o_conv = TxCreationKeys_clone(&o_conv); LDKCResult_TxCreationKeysSecpErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysSecpErrorZ), "LDKCResult_TxCreationKeysSecpErrorZ"); *ret_conv = CResult_TxCreationKeysSecpErrorZ_ok(o_conv); return (long)ret_conv; @@ -6036,7 +5934,8 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_TxCreationKeysSecpEr } void __attribute__((visibility("default"))) TS_CResult_TxCreationKeysSecpErrorZ_free(uint32_t _res) { - LDKCResult_TxCreationKeysSecpErrorZ _res_conv = *(LDKCResult_TxCreationKeysSecpErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_TxCreationKeysSecpErrorZ _res_conv = *(LDKCResult_TxCreationKeysSecpErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_TxCreationKeysSecpErrorZ_free(_res_conv); } @@ -6045,7 +5944,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_TrustedCommitmentTra LDKTrustedCommitmentTransaction o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKTrustedCommitmentTransaction LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ"); *ret_conv = CResult_TrustedCommitmentTransactionNoneZ_ok(o_conv); return (long)ret_conv; @@ -6058,11 +5957,52 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_TrustedCommitmentTra } void __attribute__((visibility("default"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint32_t _res) { - LDKCResult_TrustedCommitmentTransactionNoneZ _res_conv = *(LDKCResult_TrustedCommitmentTransactionNoneZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_TrustedCommitmentTransactionNoneZ _res_conv = *(LDKCResult_TrustedCommitmentTransactionNoneZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_TrustedCommitmentTransactionNoneZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_ok(ptrArray o) { + LDKCVec_SignatureZ o_constr; + o_constr.datalen = *((uint32_t*)o); + if (o_constr.datalen > 0) + o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); + else + o_constr.data = NULL; + int8_tArray* o_vals = (int8_tArray*)(o + 4); + for (size_t m = 0; m < o_constr.datalen; m++) { + int8_tArray arr_conv_12 = o_vals[m]; + LDKSignature arr_conv_12_ref; + CHECK(*((uint32_t*)arr_conv_12) == 64); + memcpy(arr_conv_12_ref.compact_form, (uint8_t*)(arr_conv_12 + 4), 64); + o_constr.data[m] = arr_conv_12_ref; + } + LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); + *ret_conv = CResult_CVec_SignatureZNoneZ_ok(o_constr); + return (long)ret_conv; +} + +uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_err() { + LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); + *ret_conv = CResult_CVec_SignatureZNoneZ_err(); + return (long)ret_conv; +} + +void __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_free(uint32_t _res) { + if ((_res & 1) != 0) return; + LDKCResult_CVec_SignatureZNoneZ _res_conv = *(LDKCResult_CVec_SignatureZNoneZ*)(((uint64_t)_res) & ~1); + FREE((void*)_res); + CResult_CVec_SignatureZNoneZ_free(_res_conv); +} + +uint32_t __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint32_t orig) { + LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)(orig & ~1); + LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); + *ret_conv = CResult_CVec_SignatureZNoneZ_clone(orig_conv); + return (long)ret_conv; +} + void __attribute__((visibility("default"))) TS_CVec_RouteHopZ_free(uint32_tArray _res) { LDKCVec_RouteHopZ _res_constr; _res_constr.datalen = *((uint32_t*)_res); @@ -6114,8 +6054,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_ok LDKRoute o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = Route_clone(&o_conv); + o_conv = Route_clone(&o_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -6125,14 +6064,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_er LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_free(uint32_t _res) { - LDKCResult_RouteDecodeErrorZ _res_conv = *(LDKCResult_RouteDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_RouteDecodeErrorZ _res_conv = *(LDKCResult_RouteDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_RouteDecodeErrorZ_free(_res_conv); } @@ -6159,8 +6099,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ LDKRoute o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = Route_clone(&o_conv); + o_conv = Route_clone(&o_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_ok(o_conv); return (long)ret_conv; @@ -6170,14 +6109,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ LDKLightningError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = LightningError_clone(&e_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ_free(uint32_t _res) { - LDKCResult_RouteLightningErrorZ _res_conv = *(LDKCResult_RouteLightningErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_RouteLightningErrorZ _res_conv = *(LDKCResult_RouteLightningErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_RouteLightningErrorZ_free(_res_conv); } @@ -6186,8 +6126,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErr LDKRoutingFees o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - if (o_conv.inner != NULL) - o_conv = RoutingFees_clone(&o_conv); + o_conv = RoutingFees_clone(&o_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -6197,14 +6136,15 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErr LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint32_t _res) { - LDKCResult_RoutingFeesDecodeErrorZ _res_conv = *(LDKCResult_RoutingFeesDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_RoutingFeesDecodeErrorZ _res_conv = *(LDKCResult_RoutingFeesDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_RoutingFeesDecodeErrorZ_free(_res_conv); } @@ -6213,7 +6153,7 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfo LDKNodeAnnouncementInfo o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - // Warning: we may need a move here but can't clone! + o_conv = NodeAnnouncementInfo_clone(&o_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -6223,23 +6163,31 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfo LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint32_t _res) { - LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint32_t orig) { + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(orig & ~1); + LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); + *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint32_t o) { LDKNodeInfo o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - // Warning: we may need a move here but can't clone! + o_conv = NodeInfo_clone(&o_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -6249,23 +6197,31 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint32_t _res) { - LDKCResult_NodeInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeInfoDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NodeInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeInfoDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NodeInfoDecodeErrorZ_free(_res_conv); } +uint32_t __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint32_t orig) { + LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(orig & ~1); + LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); + *ret_conv = CResult_NodeInfoDecodeErrorZ_clone(orig_conv); + return (long)ret_conv; +} + uint32_t __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint32_t o) { LDKNetworkGraph o_conv; o_conv.inner = (void*)(o & (~1)); o_conv.is_owned = (o & 1) || (o == 0); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKNetworkGraph LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_ok(o_conv); return (long)ret_conv; @@ -6275,20 +6231,22 @@ uint32_t __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeEr LDKDecodeError e_conv; e_conv.inner = (void*)(e & (~1)); e_conv.is_owned = (e & 1) || (e == 0); - // Warning: we may need a move here but can't clone! + e_conv = DecodeError_clone(&e_conv); LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_err(e_conv); return (long)ret_conv; } void __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint32_t _res) { - LDKCResult_NetworkGraphDecodeErrorZ _res_conv = *(LDKCResult_NetworkGraphDecodeErrorZ*)_res; + if ((_res & 1) != 0) return; + LDKCResult_NetworkGraphDecodeErrorZ _res_conv = *(LDKCResult_NetworkGraphDecodeErrorZ*)(((uint64_t)_res) & ~1); FREE((void*)_res); CResult_NetworkGraphDecodeErrorZ_free(_res_conv); } void __attribute__((visibility("default"))) TS_Event_free(uint32_t this_ptr) { - LDKEvent this_ptr_conv = *(LDKEvent*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKEvent this_ptr_conv = *(LDKEvent*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); Event_free(this_ptr_conv); } @@ -6311,7 +6269,8 @@ int8_tArray __attribute__((visibility("default"))) TS_Event_write(uint32_t obj) } void __attribute__((visibility("default"))) TS_MessageSendEvent_free(uint32_t this_ptr) { - LDKMessageSendEvent this_ptr_conv = *(LDKMessageSendEvent*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKMessageSendEvent this_ptr_conv = *(LDKMessageSendEvent*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); MessageSendEvent_free(this_ptr_conv); } @@ -6325,19 +6284,22 @@ uint32_t __attribute__((visibility("default"))) TS_MessageSendEvent_clone(uint3 } void __attribute__((visibility("default"))) TS_MessageSendEventsProvider_free(uint32_t this_ptr) { - LDKMessageSendEventsProvider this_ptr_conv = *(LDKMessageSendEventsProvider*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKMessageSendEventsProvider this_ptr_conv = *(LDKMessageSendEventsProvider*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); MessageSendEventsProvider_free(this_ptr_conv); } void __attribute__((visibility("default"))) TS_EventsProvider_free(uint32_t this_ptr) { - LDKEventsProvider this_ptr_conv = *(LDKEventsProvider*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKEventsProvider this_ptr_conv = *(LDKEventsProvider*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); EventsProvider_free(this_ptr_conv); } void __attribute__((visibility("default"))) TS_APIError_free(uint32_t this_ptr) { - LDKAPIError this_ptr_conv = *(LDKAPIError*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKAPIError this_ptr_conv = *(LDKAPIError*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); APIError_free(this_ptr_conv); } @@ -6351,7 +6313,7 @@ uint32_t __attribute__((visibility("default"))) TS_APIError_clone(uint32_t orig } uint32_t __attribute__((visibility("default"))) TS_Level_clone(uint32_t orig) { - LDKLevel* orig_conv = (LDKLevel*)orig; + LDKLevel* orig_conv = (LDKLevel*)(orig & ~1); uint32_t ret_conv = LDKLevel_to_js(Level_clone(orig_conv)); return ret_conv; } @@ -6362,7 +6324,8 @@ uint32_t __attribute__((visibility("default"))) TS_Level_max() { } void __attribute__((visibility("default"))) TS_Logger_free(uint32_t this_ptr) { - LDKLogger this_ptr_conv = *(LDKLogger*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKLogger this_ptr_conv = *(LDKLogger*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); Logger_free(this_ptr_conv); } @@ -6803,8 +6766,7 @@ void __attribute__((visibility("default"))) TS_UserConfig_set_own_channel_confi 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); + val_conv = ChannelHandshakeConfig_clone(&val_conv); UserConfig_set_own_channel_config(&this_ptr_conv, val_conv); } @@ -6829,8 +6791,7 @@ void __attribute__((visibility("default"))) TS_UserConfig_set_peer_channel_conf 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); + val_conv = ChannelHandshakeLimits_clone(&val_conv); UserConfig_set_peer_channel_config_limits(&this_ptr_conv, val_conv); } @@ -6855,8 +6816,7 @@ void __attribute__((visibility("default"))) TS_UserConfig_set_channel_options(u 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); + val_conv = ChannelConfig_clone(&val_conv); UserConfig_set_channel_options(&this_ptr_conv, val_conv); } @@ -6864,18 +6824,15 @@ uint32_t __attribute__((visibility("default"))) TS_UserConfig_new(uint32_t own_ 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); + 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); + 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); + channel_options_arg_conv = ChannelConfig_clone(&channel_options_arg_conv); LDKUserConfig ret_var = UserConfig_new(own_channel_config_arg_conv, peer_channel_config_limits_arg_conv, channel_options_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -6898,43 +6855,48 @@ uint32_t __attribute__((visibility("default"))) TS_UserConfig_default() { } uint32_t __attribute__((visibility("default"))) TS_AccessError_clone(uint32_t orig) { - LDKAccessError* orig_conv = (LDKAccessError*)orig; + LDKAccessError* orig_conv = (LDKAccessError*)(orig & ~1); uint32_t ret_conv = LDKAccessError_to_js(AccessError_clone(orig_conv)); return ret_conv; } void __attribute__((visibility("default"))) TS_Access_free(uint32_t this_ptr) { - LDKAccess this_ptr_conv = *(LDKAccess*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKAccess this_ptr_conv = *(LDKAccess*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); Access_free(this_ptr_conv); } void __attribute__((visibility("default"))) TS_Watch_free(uint32_t this_ptr) { - LDKWatch this_ptr_conv = *(LDKWatch*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKWatch this_ptr_conv = *(LDKWatch*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); Watch_free(this_ptr_conv); } void __attribute__((visibility("default"))) TS_Filter_free(uint32_t this_ptr) { - LDKFilter this_ptr_conv = *(LDKFilter*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKFilter this_ptr_conv = *(LDKFilter*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); Filter_free(this_ptr_conv); } void __attribute__((visibility("default"))) TS_BroadcasterInterface_free(uint32_t this_ptr) { - LDKBroadcasterInterface this_ptr_conv = *(LDKBroadcasterInterface*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKBroadcasterInterface this_ptr_conv = *(LDKBroadcasterInterface*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); BroadcasterInterface_free(this_ptr_conv); } uint32_t __attribute__((visibility("default"))) TS_ConfirmationTarget_clone(uint32_t orig) { - LDKConfirmationTarget* orig_conv = (LDKConfirmationTarget*)orig; + LDKConfirmationTarget* orig_conv = (LDKConfirmationTarget*)(orig & ~1); uint32_t ret_conv = LDKConfirmationTarget_to_js(ConfirmationTarget_clone(orig_conv)); return ret_conv; } void __attribute__((visibility("default"))) TS_FeeEstimator_free(uint32_t this_ptr) { - LDKFeeEstimator this_ptr_conv = *(LDKFeeEstimator*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKFeeEstimator this_ptr_conv = *(LDKFeeEstimator*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); FeeEstimator_free(this_ptr_conv); } @@ -6963,7 +6925,7 @@ void __attribute__((visibility("default"))) TS_ChainMonitor_block_connected(uin uint32_t* txdata_vals = (uint32_t*)(txdata + 4); for (size_t e = 0; e < txdata_constr.datalen; e++) { uint32_t arr_conv_30 = txdata_vals[e]; - LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)arr_conv_30; + LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)(((uint64_t)arr_conv_30) & ~1); FREE((void*)arr_conv_30); txdata_constr.data[e] = arr_conv_30_conv; } @@ -6983,10 +6945,10 @@ void __attribute__((visibility("default"))) TS_ChainMonitor_block_disconnected( uint32_t __attribute__((visibility("default"))) TS_ChainMonitor_new(uint32_t chain_source, uint32_t broadcaster, uint32_t logger, uint32_t feeest, uint32_t persister) { LDKFilter* chain_source_conv = (LDKFilter*)chain_source; - LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)broadcaster; - LDKLogger logger_conv = *(LDKLogger*)logger; - LDKFeeEstimator feeest_conv = *(LDKFeeEstimator*)feeest; - LDKPersist persister_conv = *(LDKPersist*)persister; + LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(((uint64_t)broadcaster) & ~1); + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); + LDKFeeEstimator feeest_conv = *(LDKFeeEstimator*)(((uint64_t)feeest) & ~1); + LDKPersist persister_conv = *(LDKPersist*)(((uint64_t)persister) & ~1); LDKChainMonitor ret_var = ChainMonitor_new(chain_source_conv, broadcaster_conv, logger_conv, feeest_conv, persister_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -7072,7 +7034,7 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_read(in } uint32_t __attribute__((visibility("default"))) TS_ChannelMonitorUpdateErr_clone(uint32_t orig) { - LDKChannelMonitorUpdateErr* orig_conv = (LDKChannelMonitorUpdateErr*)orig; + LDKChannelMonitorUpdateErr* orig_conv = (LDKChannelMonitorUpdateErr*)(orig & ~1); uint32_t ret_conv = LDKChannelMonitorUpdateErr_to_js(ChannelMonitorUpdateErr_clone(orig_conv)); return ret_conv; } @@ -7084,6 +7046,20 @@ void __attribute__((visibility("default"))) TS_MonitorUpdateError_free(uint32_t MonitorUpdateError_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_MonitorUpdateError_clone(uint32_t orig) { + LDKMonitorUpdateError orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKMonitorUpdateError ret_var = MonitorUpdateError_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + void __attribute__((visibility("default"))) TS_MonitorEvent_free(uint32_t this_ptr) { LDKMonitorEvent this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -7158,6 +7134,20 @@ void __attribute__((visibility("default"))) TS_ChannelMonitor_free(uint32_t thi ChannelMonitor_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_ChannelMonitor_clone(uint32_t orig) { + LDKChannelMonitor orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKChannelMonitor ret_var = ChannelMonitor_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + int8_tArray __attribute__((visibility("default"))) TS_ChannelMonitor_write(uint32_t obj) { LDKChannelMonitor obj_conv; obj_conv.inner = (void*)(obj & (~1)); @@ -7198,8 +7188,6 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelMonitor_get_funding_t this_arg_conv.is_owned = false; LDKC2Tuple_OutPointScriptZ* ret_ref = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_ref = ChannelMonitor_get_funding_txo(&this_arg_conv); - ret_ref->a = OutPoint_clone(&ret_ref->a); - ret_ref->b = CVec_u8Z_clone(&ret_ref->b); return (long)ret_ref; } @@ -7277,21 +7265,19 @@ uint32_tArray __attribute__((visibility("default"))) TS_ChannelMonitor_block_co uint32_t* txdata_vals = (uint32_t*)(txdata + 4); for (size_t e = 0; e < txdata_constr.datalen; e++) { uint32_t arr_conv_30 = txdata_vals[e]; - LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)arr_conv_30; + LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)(((uint64_t)arr_conv_30) & ~1); FREE((void*)arr_conv_30); txdata_constr.data[e] = arr_conv_30_conv; } - LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)broadcaster; - LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)fee_estimator; - LDKLogger logger_conv = *(LDKLogger*)logger; + LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(((uint64_t)broadcaster) & ~1); + LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(((uint64_t)fee_estimator) & ~1); + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_block_connected(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv); uint32_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes"); uint32_t *ret_arr_ptr = (uint32_t*)(ret_arr + 4); for (size_t x = 0; x < ret_var.datalen; x++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* arr_conv_49_ref = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *arr_conv_49_ref = ret_var.data[x]; - arr_conv_49_ref->a = ThirtyTwoBytes_clone(&arr_conv_49_ref->a); - arr_conv_49_ref->b = CVec_C2Tuple_u32TxOutZZ_clone(&arr_conv_49_ref->b); ret_arr_ptr[x] = (long)arr_conv_49_ref; } FREE(ret_var.data); @@ -7306,14 +7292,15 @@ void __attribute__((visibility("default"))) TS_ChannelMonitor_block_disconnecte CHECK(*((uint32_t*)header) == 80); memcpy(header_arr, (uint8_t*)(header + 4), 80); unsigned char (*header_ref)[80] = &header_arr; - LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)broadcaster; - LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)fee_estimator; - LDKLogger logger_conv = *(LDKLogger*)logger; + LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(((uint64_t)broadcaster) & ~1); + LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(((uint64_t)fee_estimator) & ~1); + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); ChannelMonitor_block_disconnected(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); } void __attribute__((visibility("default"))) TS_Persist_free(uint32_t this_ptr) { - LDKPersist this_ptr_conv = *(LDKPersist*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKPersist this_ptr_conv = *(LDKPersist*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); Persist_free(this_ptr_conv); } @@ -7432,7 +7419,8 @@ uint32_t __attribute__((visibility("default"))) TS_OutPoint_read(int8_tArray se } void __attribute__((visibility("default"))) TS_SpendableOutputDescriptor_free(uint32_t this_ptr) { - LDKSpendableOutputDescriptor this_ptr_conv = *(LDKSpendableOutputDescriptor*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKSpendableOutputDescriptor this_ptr_conv = *(LDKSpendableOutputDescriptor*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); SpendableOutputDescriptor_free(this_ptr_conv); } @@ -7471,13 +7459,15 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelKeys_clone(uint32_t o } void __attribute__((visibility("default"))) TS_ChannelKeys_free(uint32_t this_ptr) { - LDKChannelKeys this_ptr_conv = *(LDKChannelKeys*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKChannelKeys this_ptr_conv = *(LDKChannelKeys*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); ChannelKeys_free(this_ptr_conv); } void __attribute__((visibility("default"))) TS_KeysInterface_free(uint32_t this_ptr) { - LDKKeysInterface this_ptr_conv = *(LDKKeysInterface*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKKeysInterface this_ptr_conv = *(LDKKeysInterface*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); KeysInterface_free(this_ptr_conv); } @@ -7636,7 +7626,7 @@ uint32_t __attribute__((visibility("default"))) TS_InMemoryChannelKeys_new(int8 LDKThirtyTwoBytes commitment_seed_ref; CHECK(*((uint32_t*)commitment_seed) == 32); memcpy(commitment_seed_ref.data, (uint8_t*)(commitment_seed + 4), 32); - LDKC2Tuple_u64u64Z key_derivation_params_conv = *(LDKC2Tuple_u64u64Z*)key_derivation_params; + LDKC2Tuple_u64u64Z key_derivation_params_conv = *(LDKC2Tuple_u64u64Z*)(((uint64_t)key_derivation_params) & ~1); FREE((void*)key_derivation_params); LDKInMemoryChannelKeys ret_var = 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); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -7876,7 +7866,7 @@ void __attribute__((visibility("default"))) TS_ChannelDetails_set_counterparty_ 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! + // Warning: we need a move here but no clone is available for LDKInitFeatures ChannelDetails_set_counterparty_features(&this_ptr_conv, val_conv); } @@ -7962,18 +7952,31 @@ void __attribute__((visibility("default"))) TS_PaymentSendFailure_free(uint32_t PaymentSendFailure_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_PaymentSendFailure_clone(uint32_t orig) { + LDKPaymentSendFailure orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKPaymentSendFailure ret_var = PaymentSendFailure_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + uint32_t __attribute__((visibility("default"))) TS_ChannelManager_new(uint32_t network, uint32_t fee_est, uint32_t chain_monitor, uint32_t tx_broadcaster, uint32_t logger, uint32_t keys_manager, uint32_t config, intptr_t current_blockchain_height) { LDKNetwork network_conv = LDKNetwork_from_js(network); - LDKFeeEstimator fee_est_conv = *(LDKFeeEstimator*)fee_est; - LDKWatch chain_monitor_conv = *(LDKWatch*)chain_monitor; - LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)tx_broadcaster; - LDKLogger logger_conv = *(LDKLogger*)logger; - LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)keys_manager; + LDKFeeEstimator fee_est_conv = *(LDKFeeEstimator*)(((uint64_t)fee_est) & ~1); + LDKWatch chain_monitor_conv = *(LDKWatch*)(((uint64_t)chain_monitor) & ~1); + LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(((uint64_t)tx_broadcaster) & ~1); + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); + LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(((uint64_t)keys_manager) & ~1); 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); + config_conv = UserConfig_clone(&config_conv); LDKChannelManager ret_var = ChannelManager_new(network_conv, fee_est_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, keys_manager_conv, config_conv, current_blockchain_height); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -7994,8 +7997,7 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelManager_create_channe 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); + override_config_conv = UserConfig_clone(&override_config_conv); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_create_channel(&this_arg_conv, their_network_key_ref, channel_value_satoshis, push_msat, user_id, override_config_conv); return (long)ret_conv; @@ -8056,7 +8058,7 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelManager_close_channel return (long)ret_conv; } -void __attribute__((visibility("default"))) TS_ChannelManager_force_close_channel(uint32_t this_arg, int8_tArray channel_id) { +uint32_t __attribute__((visibility("default"))) TS_ChannelManager_force_close_channel(uint32_t this_arg, int8_tArray channel_id) { LDKChannelManager this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; @@ -8064,7 +8066,9 @@ void __attribute__((visibility("default"))) TS_ChannelManager_force_close_chann CHECK(*((uint32_t*)channel_id) == 32); memcpy(channel_id_arr, (uint8_t*)(channel_id + 4), 32); unsigned char (*channel_id_ref)[32] = &channel_id_arr; - ChannelManager_force_close_channel(&this_arg_conv, channel_id_ref); + LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); + *ret_conv = ChannelManager_force_close_channel(&this_arg_conv, channel_id_ref); + return (long)ret_conv; } void __attribute__((visibility("default"))) TS_ChannelManager_force_close_all_channels(uint32_t this_arg) { @@ -8103,8 +8107,7 @@ void __attribute__((visibility("default"))) TS_ChannelManager_funding_transacti 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); + funding_txo_conv = OutPoint_clone(&funding_txo_conv); ChannelManager_funding_transaction_generated(&this_arg_conv, temporary_channel_id_ref, funding_txo_conv); } @@ -8127,7 +8130,7 @@ void __attribute__((visibility("default"))) TS_ChannelManager_broadcast_node_an uint32_t* addresses_vals = (uint32_t*)(addresses + 4); for (size_t m = 0; m < addresses_constr.datalen; m++) { uint32_t arr_conv_12 = addresses_vals[m]; - LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)arr_conv_12; + LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)(((uint64_t)arr_conv_12) & ~1); FREE((void*)arr_conv_12); addresses_constr.data[m] = arr_conv_12_conv; } @@ -8231,7 +8234,7 @@ void __attribute__((visibility("default"))) TS_ChannelManager_block_connected(u uint32_t* txdata_vals = (uint32_t*)(txdata + 4); for (size_t e = 0; e < txdata_constr.datalen; e++) { uint32_t arr_conv_30 = txdata_vals[e]; - LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)arr_conv_30; + LDKC2Tuple_usizeTransactionZ arr_conv_30_conv = *(LDKC2Tuple_usizeTransactionZ*)(((uint64_t)arr_conv_30) & ~1); FREE((void*)arr_conv_30); txdata_constr.data[e] = arr_conv_30_conv; } @@ -8288,7 +8291,7 @@ void __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_keys_ LDKChannelManagerReadArgs this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKKeysInterface val_conv = *(LDKKeysInterface*)val; + LDKKeysInterface val_conv = *(LDKKeysInterface*)(((uint64_t)val) & ~1); ChannelManagerReadArgs_set_keys_manager(&this_ptr_conv, val_conv); } @@ -8304,7 +8307,7 @@ void __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_fee_e LDKChannelManagerReadArgs this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKFeeEstimator val_conv = *(LDKFeeEstimator*)val; + LDKFeeEstimator val_conv = *(LDKFeeEstimator*)(((uint64_t)val) & ~1); ChannelManagerReadArgs_set_fee_estimator(&this_ptr_conv, val_conv); } @@ -8320,7 +8323,7 @@ void __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_chain LDKChannelManagerReadArgs this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKWatch val_conv = *(LDKWatch*)val; + LDKWatch val_conv = *(LDKWatch*)(((uint64_t)val) & ~1); ChannelManagerReadArgs_set_chain_monitor(&this_ptr_conv, val_conv); } @@ -8336,7 +8339,7 @@ void __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_tx_br LDKChannelManagerReadArgs this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)val; + LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)(((uint64_t)val) & ~1); ChannelManagerReadArgs_set_tx_broadcaster(&this_ptr_conv, val_conv); } @@ -8352,7 +8355,7 @@ void __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_logge LDKChannelManagerReadArgs this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKLogger val_conv = *(LDKLogger*)val; + LDKLogger val_conv = *(LDKLogger*)(((uint64_t)val) & ~1); ChannelManagerReadArgs_set_logger(&this_ptr_conv, val_conv); } @@ -8377,22 +8380,20 @@ void __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_defau 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); + val_conv = UserConfig_clone(&val_conv); ChannelManagerReadArgs_set_default_config(&this_ptr_conv, val_conv); } uint32_t __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_new(uint32_t keys_manager, uint32_t fee_estimator, uint32_t chain_monitor, uint32_t tx_broadcaster, uint32_t logger, uint32_t default_config, uint32_tArray channel_monitors) { - LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)keys_manager; - LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)fee_estimator; - LDKWatch chain_monitor_conv = *(LDKWatch*)chain_monitor; - LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)tx_broadcaster; - LDKLogger logger_conv = *(LDKLogger*)logger; + LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(((uint64_t)keys_manager) & ~1); + LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(((uint64_t)fee_estimator) & ~1); + LDKWatch chain_monitor_conv = *(LDKWatch*)(((uint64_t)chain_monitor) & ~1); + LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(((uint64_t)tx_broadcaster) & ~1); + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); 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); + default_config_conv = UserConfig_clone(&default_config_conv); LDKCVec_ChannelMonitorZ channel_monitors_constr; channel_monitors_constr.datalen = *((uint32_t*)channel_monitors); if (channel_monitors_constr.datalen > 0) @@ -8405,7 +8406,6 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_new(u LDKChannelMonitor arr_conv_16_conv; arr_conv_16_conv.inner = (void*)(arr_conv_16 & (~1)); arr_conv_16_conv.is_owned = (arr_conv_16 & 1) || (arr_conv_16 == 0); - // Warning: we may need a move here but can't clone! channel_monitors_constr.data[q] = arr_conv_16_conv; } LDKChannelManagerReadArgs ret_var = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_constr); @@ -8425,7 +8425,7 @@ uint32_t __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMana LDKChannelManagerReadArgs arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = (arg & 1) || (arg == 0); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKChannelManagerReadArgs LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ"); *ret_conv = C2Tuple_BlockHashChannelManagerZ_read(ser_ref, arg_conv); return (long)ret_conv; @@ -8438,6 +8438,20 @@ void __attribute__((visibility("default"))) TS_DecodeError_free(uint32_t this_p DecodeError_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_DecodeError_clone(uint32_t orig) { + LDKDecodeError orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKDecodeError ret_var = DecodeError_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + void __attribute__((visibility("default"))) TS_Init_free(uint32_t this_ptr) { LDKInit this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -10521,7 +10535,8 @@ uint32_t __attribute__((visibility("default"))) TS_AnnouncementSignatures_new(i } void __attribute__((visibility("default"))) TS_NetAddress_free(uint32_t this_ptr) { - LDKNetAddress this_ptr_conv = *(LDKNetAddress*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKNetAddress this_ptr_conv = *(LDKNetAddress*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); NetAddress_free(this_ptr_conv); } @@ -10594,7 +10609,7 @@ void __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_fea 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! + // Warning: we need a move here but no clone is available for LDKNodeFeatures UnsignedNodeAnnouncement_set_features(&this_ptr_conv, val_conv); } @@ -10683,7 +10698,7 @@ void __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_add uint32_t* val_vals = (uint32_t*)(val + 4); for (size_t m = 0; m < val_constr.datalen; m++) { uint32_t arr_conv_12 = val_vals[m]; - LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)arr_conv_12; + LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)(((uint64_t)arr_conv_12) & ~1); FREE((void*)arr_conv_12); val_constr.data[m] = arr_conv_12_conv; } @@ -10751,8 +10766,7 @@ void __attribute__((visibility("default"))) TS_NodeAnnouncement_set_contents(ui 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); + val_conv = UnsignedNodeAnnouncement_clone(&val_conv); NodeAnnouncement_set_contents(&this_ptr_conv, val_conv); } @@ -10763,8 +10777,7 @@ uint32_t __attribute__((visibility("default"))) TS_NodeAnnouncement_new(int8_tA LDKUnsignedNodeAnnouncement contents_arg_conv; contents_arg_conv.inner = (void*)(contents_arg & (~1)); contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0); - if (contents_arg_conv.inner != NULL) - contents_arg_conv = UnsignedNodeAnnouncement_clone(&contents_arg_conv); + contents_arg_conv = UnsignedNodeAnnouncement_clone(&contents_arg_conv); LDKNodeAnnouncement ret_var = NodeAnnouncement_new(signature_arg_ref, contents_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -10817,7 +10830,7 @@ void __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_ 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! + // Warning: we need a move here but no clone is available for LDKChannelFeatures UnsignedChannelAnnouncement_set_features(&this_ptr_conv, val_conv); } @@ -11049,8 +11062,7 @@ void __attribute__((visibility("default"))) TS_ChannelAnnouncement_set_contents 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); + val_conv = UnsignedChannelAnnouncement_clone(&val_conv); ChannelAnnouncement_set_contents(&this_ptr_conv, val_conv); } @@ -11070,8 +11082,7 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelAnnouncement_new(int8 LDKUnsignedChannelAnnouncement contents_arg_conv; contents_arg_conv.inner = (void*)(contents_arg & (~1)); contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0); - if (contents_arg_conv.inner != NULL) - contents_arg_conv = UnsignedChannelAnnouncement_clone(&contents_arg_conv); + contents_arg_conv = UnsignedChannelAnnouncement_clone(&contents_arg_conv); LDKChannelAnnouncement ret_var = 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); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -11288,8 +11299,7 @@ void __attribute__((visibility("default"))) TS_ChannelUpdate_set_contents(uint3 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); + val_conv = UnsignedChannelUpdate_clone(&val_conv); ChannelUpdate_set_contents(&this_ptr_conv, val_conv); } @@ -11300,8 +11310,7 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelUpdate_new(int8_tArra LDKUnsignedChannelUpdate contents_arg_conv; contents_arg_conv.inner = (void*)(contents_arg & (~1)); contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0); - if (contents_arg_conv.inner != NULL) - contents_arg_conv = UnsignedChannelUpdate_clone(&contents_arg_conv); + contents_arg_conv = UnsignedChannelUpdate_clone(&contents_arg_conv); LDKChannelUpdate ret_var = ChannelUpdate_new(signature_arg_ref, contents_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -11761,7 +11770,8 @@ uint32_t __attribute__((visibility("default"))) TS_GossipTimestampFilter_new(in } void __attribute__((visibility("default"))) TS_ErrorAction_free(uint32_t this_ptr) { - LDKErrorAction this_ptr_conv = *(LDKErrorAction*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKErrorAction this_ptr_conv = *(LDKErrorAction*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); ErrorAction_free(this_ptr_conv); } @@ -11781,6 +11791,20 @@ void __attribute__((visibility("default"))) TS_LightningError_free(uint32_t thi LightningError_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_LightningError_clone(uint32_t orig) { + LDKLightningError orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKLightningError ret_var = LightningError_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + jstring __attribute__((visibility("default"))) TS_LightningError_get_err(uint32_t this_ptr) { LDKLightningError this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -11815,7 +11839,7 @@ void __attribute__((visibility("default"))) TS_LightningError_set_action(uint32 LDKLightningError this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKErrorAction val_conv = *(LDKErrorAction*)val; + LDKErrorAction val_conv = *(LDKErrorAction*)(((uint64_t)val) & ~1); FREE((void*)val); LightningError_set_action(&this_ptr_conv, val_conv); } @@ -11825,7 +11849,7 @@ uint32_t __attribute__((visibility("default"))) TS_LightningError_new(int8_tArr err_arg_ref.datalen = *((uint32_t*)err_arg); err_arg_ref.data = MALLOC(err_arg_ref.datalen, "LDKCVec_u8Z Bytes"); memcpy(err_arg_ref.data, (uint8_t*)(err_arg + 4), err_arg_ref.datalen); - LDKErrorAction action_arg_conv = *(LDKErrorAction*)action_arg; + LDKErrorAction action_arg_conv = *(LDKErrorAction*)(((uint64_t)action_arg) & ~1); FREE((void*)action_arg); LDKLightningError ret_var = LightningError_new(err_arg_ref, action_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -11874,8 +11898,7 @@ void __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_add_ LDKUpdateAddHTLC arr_conv_15_conv; arr_conv_15_conv.inner = (void*)(arr_conv_15 & (~1)); arr_conv_15_conv.is_owned = (arr_conv_15 & 1) || (arr_conv_15 == 0); - if (arr_conv_15_conv.inner != NULL) - arr_conv_15_conv = UpdateAddHTLC_clone(&arr_conv_15_conv); + arr_conv_15_conv = UpdateAddHTLC_clone(&arr_conv_15_conv); val_constr.data[p] = arr_conv_15_conv; } CommitmentUpdate_set_update_add_htlcs(&this_ptr_conv, val_constr); @@ -11897,8 +11920,7 @@ void __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fulf LDKUpdateFulfillHTLC arr_conv_19_conv; arr_conv_19_conv.inner = (void*)(arr_conv_19 & (~1)); arr_conv_19_conv.is_owned = (arr_conv_19 & 1) || (arr_conv_19 == 0); - if (arr_conv_19_conv.inner != NULL) - arr_conv_19_conv = UpdateFulfillHTLC_clone(&arr_conv_19_conv); + arr_conv_19_conv = UpdateFulfillHTLC_clone(&arr_conv_19_conv); val_constr.data[t] = arr_conv_19_conv; } CommitmentUpdate_set_update_fulfill_htlcs(&this_ptr_conv, val_constr); @@ -11920,8 +11942,7 @@ void __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fail LDKUpdateFailHTLC arr_conv_16_conv; arr_conv_16_conv.inner = (void*)(arr_conv_16 & (~1)); arr_conv_16_conv.is_owned = (arr_conv_16 & 1) || (arr_conv_16 == 0); - if (arr_conv_16_conv.inner != NULL) - arr_conv_16_conv = UpdateFailHTLC_clone(&arr_conv_16_conv); + arr_conv_16_conv = UpdateFailHTLC_clone(&arr_conv_16_conv); val_constr.data[q] = arr_conv_16_conv; } CommitmentUpdate_set_update_fail_htlcs(&this_ptr_conv, val_constr); @@ -11943,8 +11964,7 @@ void __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fail LDKUpdateFailMalformedHTLC arr_conv_25_conv; arr_conv_25_conv.inner = (void*)(arr_conv_25 & (~1)); arr_conv_25_conv.is_owned = (arr_conv_25 & 1) || (arr_conv_25 == 0); - if (arr_conv_25_conv.inner != NULL) - arr_conv_25_conv = UpdateFailMalformedHTLC_clone(&arr_conv_25_conv); + arr_conv_25_conv = UpdateFailMalformedHTLC_clone(&arr_conv_25_conv); val_constr.data[z] = arr_conv_25_conv; } CommitmentUpdate_set_update_fail_malformed_htlcs(&this_ptr_conv, val_constr); @@ -11971,8 +11991,7 @@ void __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fee( 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); + val_conv = UpdateFee_clone(&val_conv); CommitmentUpdate_set_update_fee(&this_ptr_conv, val_conv); } @@ -11997,8 +12016,7 @@ void __attribute__((visibility("default"))) TS_CommitmentUpdate_set_commitment_ 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); + val_conv = CommitmentSigned_clone(&val_conv); CommitmentUpdate_set_commitment_signed(&this_ptr_conv, val_conv); } @@ -12015,8 +12033,7 @@ uint32_t __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_ LDKUpdateAddHTLC arr_conv_15_conv; arr_conv_15_conv.inner = (void*)(arr_conv_15 & (~1)); arr_conv_15_conv.is_owned = (arr_conv_15 & 1) || (arr_conv_15 == 0); - if (arr_conv_15_conv.inner != NULL) - arr_conv_15_conv = UpdateAddHTLC_clone(&arr_conv_15_conv); + arr_conv_15_conv = UpdateAddHTLC_clone(&arr_conv_15_conv); update_add_htlcs_arg_constr.data[p] = arr_conv_15_conv; } LDKCVec_UpdateFulfillHTLCZ update_fulfill_htlcs_arg_constr; @@ -12031,8 +12048,7 @@ uint32_t __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_ LDKUpdateFulfillHTLC arr_conv_19_conv; arr_conv_19_conv.inner = (void*)(arr_conv_19 & (~1)); arr_conv_19_conv.is_owned = (arr_conv_19 & 1) || (arr_conv_19 == 0); - if (arr_conv_19_conv.inner != NULL) - arr_conv_19_conv = UpdateFulfillHTLC_clone(&arr_conv_19_conv); + arr_conv_19_conv = UpdateFulfillHTLC_clone(&arr_conv_19_conv); update_fulfill_htlcs_arg_constr.data[t] = arr_conv_19_conv; } LDKCVec_UpdateFailHTLCZ update_fail_htlcs_arg_constr; @@ -12047,8 +12063,7 @@ uint32_t __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_ LDKUpdateFailHTLC arr_conv_16_conv; arr_conv_16_conv.inner = (void*)(arr_conv_16 & (~1)); arr_conv_16_conv.is_owned = (arr_conv_16 & 1) || (arr_conv_16 == 0); - if (arr_conv_16_conv.inner != NULL) - arr_conv_16_conv = UpdateFailHTLC_clone(&arr_conv_16_conv); + arr_conv_16_conv = UpdateFailHTLC_clone(&arr_conv_16_conv); update_fail_htlcs_arg_constr.data[q] = arr_conv_16_conv; } LDKCVec_UpdateFailMalformedHTLCZ update_fail_malformed_htlcs_arg_constr; @@ -12063,20 +12078,17 @@ uint32_t __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_ LDKUpdateFailMalformedHTLC arr_conv_25_conv; arr_conv_25_conv.inner = (void*)(arr_conv_25 & (~1)); arr_conv_25_conv.is_owned = (arr_conv_25 & 1) || (arr_conv_25 == 0); - if (arr_conv_25_conv.inner != NULL) - arr_conv_25_conv = UpdateFailMalformedHTLC_clone(&arr_conv_25_conv); + arr_conv_25_conv = UpdateFailMalformedHTLC_clone(&arr_conv_25_conv); update_fail_malformed_htlcs_arg_constr.data[z] = arr_conv_25_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); + 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); + commitment_signed_arg_conv = CommitmentSigned_clone(&commitment_signed_arg_conv); LDKCommitmentUpdate ret_var = CommitmentUpdate_new(update_add_htlcs_arg_constr, update_fulfill_htlcs_arg_constr, update_fail_htlcs_arg_constr, update_fail_malformed_htlcs_arg_constr, update_fee_arg_conv, commitment_signed_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -12088,7 +12100,8 @@ uint32_t __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_ } void __attribute__((visibility("default"))) TS_HTLCFailChannelUpdate_free(uint32_t this_ptr) { - LDKHTLCFailChannelUpdate this_ptr_conv = *(LDKHTLCFailChannelUpdate*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKHTLCFailChannelUpdate this_ptr_conv = *(LDKHTLCFailChannelUpdate*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); HTLCFailChannelUpdate_free(this_ptr_conv); } @@ -12102,13 +12115,15 @@ uint32_t __attribute__((visibility("default"))) TS_HTLCFailChannelUpdate_clone( } void __attribute__((visibility("default"))) TS_ChannelMessageHandler_free(uint32_t this_ptr) { - LDKChannelMessageHandler this_ptr_conv = *(LDKChannelMessageHandler*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKChannelMessageHandler this_ptr_conv = *(LDKChannelMessageHandler*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); ChannelMessageHandler_free(this_ptr_conv); } void __attribute__((visibility("default"))) TS_RoutingMessageHandler_free(uint32_t this_ptr) { - LDKRoutingMessageHandler this_ptr_conv = *(LDKRoutingMessageHandler*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKRoutingMessageHandler this_ptr_conv = *(LDKRoutingMessageHandler*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); RoutingMessageHandler_free(this_ptr_conv); } @@ -12842,7 +12857,7 @@ void __attribute__((visibility("default"))) TS_MessageHandler_set_chan_handler( LDKMessageHandler this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)val; + LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)(((uint64_t)val) & ~1); MessageHandler_set_chan_handler(&this_ptr_conv, val_conv); } @@ -12858,13 +12873,13 @@ void __attribute__((visibility("default"))) TS_MessageHandler_set_route_handler LDKMessageHandler this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; - LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)val; + LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)(((uint64_t)val) & ~1); MessageHandler_set_route_handler(&this_ptr_conv, val_conv); } uint32_t __attribute__((visibility("default"))) TS_MessageHandler_new(uint32_t chan_handler_arg, uint32_t route_handler_arg) { - LDKChannelMessageHandler chan_handler_arg_conv = *(LDKChannelMessageHandler*)chan_handler_arg; - LDKRoutingMessageHandler route_handler_arg_conv = *(LDKRoutingMessageHandler*)route_handler_arg; + LDKChannelMessageHandler chan_handler_arg_conv = *(LDKChannelMessageHandler*)(((uint64_t)chan_handler_arg) & ~1); + LDKRoutingMessageHandler route_handler_arg_conv = *(LDKRoutingMessageHandler*)(((uint64_t)route_handler_arg) & ~1); LDKMessageHandler ret_var = MessageHandler_new(chan_handler_arg_conv, route_handler_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -12883,7 +12898,8 @@ uint32_t __attribute__((visibility("default"))) TS_SocketDescriptor_clone(uint3 } void __attribute__((visibility("default"))) TS_SocketDescriptor_free(uint32_t this_ptr) { - LDKSocketDescriptor this_ptr_conv = *(LDKSocketDescriptor*)this_ptr; + if ((this_ptr & 1) != 0) return; + LDKSocketDescriptor this_ptr_conv = *(LDKSocketDescriptor*)(((uint64_t)this_ptr) & ~1); FREE((void*)this_ptr); SocketDescriptor_free(this_ptr_conv); } @@ -12895,6 +12911,20 @@ void __attribute__((visibility("default"))) TS_PeerHandleError_free(uint32_t th PeerHandleError_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_PeerHandleError_clone(uint32_t orig) { + LDKPeerHandleError orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKPeerHandleError ret_var = PeerHandleError_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + jboolean __attribute__((visibility("default"))) TS_PeerHandleError_get_no_connection_possible(uint32_t this_ptr) { LDKPeerHandleError this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -12932,7 +12962,7 @@ uint32_t __attribute__((visibility("default"))) TS_PeerManager_new(uint32_t mes LDKMessageHandler message_handler_conv; message_handler_conv.inner = (void*)(message_handler & (~1)); message_handler_conv.is_owned = (message_handler & 1) || (message_handler == 0); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKMessageHandler LDKSecretKey our_node_secret_ref; CHECK(*((uint32_t*)our_node_secret) == 32); memcpy(our_node_secret_ref.bytes, (uint8_t*)(our_node_secret + 4), 32); @@ -12940,7 +12970,7 @@ uint32_t __attribute__((visibility("default"))) TS_PeerManager_new(uint32_t mes CHECK(*((uint32_t*)ephemeral_random_data) == 32); memcpy(ephemeral_random_data_arr, (uint8_t*)(ephemeral_random_data + 4), 32); unsigned char (*ephemeral_random_data_ref)[32] = &ephemeral_random_data_arr; - LDKLogger logger_conv = *(LDKLogger*)logger; + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); LDKPeerManager ret_var = PeerManager_new(message_handler_conv, our_node_secret_ref, ephemeral_random_data_ref, logger_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -12974,7 +13004,7 @@ uint32_t __attribute__((visibility("default"))) TS_PeerManager_new_outbound_con LDKPublicKey their_node_id_ref; CHECK(*((uint32_t*)their_node_id) == 33); memcpy(their_node_id_ref.compressed_form, (uint8_t*)(their_node_id + 4), 33); - LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)descriptor; + LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(((uint64_t)descriptor) & ~1); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = PeerManager_new_outbound_connection(&this_arg_conv, their_node_id_ref, descriptor_conv); return (long)ret_conv; @@ -12984,7 +13014,7 @@ uint32_t __attribute__((visibility("default"))) TS_PeerManager_new_inbound_conn LDKPeerManager this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; - LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)descriptor; + LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(((uint64_t)descriptor) & ~1); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = PeerManager_new_inbound_connection(&this_arg_conv, descriptor_conv); return (long)ret_conv; @@ -13681,8 +13711,7 @@ void __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set LDKChannelPublicKeys val_conv; val_conv.inner = (void*)(val & (~1)); val_conv.is_owned = (val & 1) || (val == 0); - if (val_conv.inner != NULL) - val_conv = ChannelPublicKeys_clone(&val_conv); + val_conv = ChannelPublicKeys_clone(&val_conv); ChannelTransactionParameters_set_holder_pubkeys(&this_ptr_conv, val_conv); } @@ -13737,8 +13766,7 @@ void __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set LDKCounterpartyChannelTransactionParameters val_conv; val_conv.inner = (void*)(val & (~1)); val_conv.is_owned = (val & 1) || (val == 0); - if (val_conv.inner != NULL) - val_conv = CounterpartyChannelTransactionParameters_clone(&val_conv); + val_conv = CounterpartyChannelTransactionParameters_clone(&val_conv); ChannelTransactionParameters_set_counterparty_parameters(&this_ptr_conv, val_conv); } @@ -13763,8 +13791,7 @@ void __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set LDKOutPoint val_conv; val_conv.inner = (void*)(val & (~1)); val_conv.is_owned = (val & 1) || (val == 0); - if (val_conv.inner != NULL) - val_conv = OutPoint_clone(&val_conv); + val_conv = OutPoint_clone(&val_conv); ChannelTransactionParameters_set_funding_outpoint(&this_ptr_conv, val_conv); } @@ -13772,18 +13799,15 @@ uint32_t __attribute__((visibility("default"))) TS_ChannelTransactionParameters LDKChannelPublicKeys holder_pubkeys_arg_conv; holder_pubkeys_arg_conv.inner = (void*)(holder_pubkeys_arg & (~1)); holder_pubkeys_arg_conv.is_owned = (holder_pubkeys_arg & 1) || (holder_pubkeys_arg == 0); - if (holder_pubkeys_arg_conv.inner != NULL) - holder_pubkeys_arg_conv = ChannelPublicKeys_clone(&holder_pubkeys_arg_conv); + holder_pubkeys_arg_conv = ChannelPublicKeys_clone(&holder_pubkeys_arg_conv); LDKCounterpartyChannelTransactionParameters counterparty_parameters_arg_conv; counterparty_parameters_arg_conv.inner = (void*)(counterparty_parameters_arg & (~1)); counterparty_parameters_arg_conv.is_owned = (counterparty_parameters_arg & 1) || (counterparty_parameters_arg == 0); - if (counterparty_parameters_arg_conv.inner != NULL) - counterparty_parameters_arg_conv = CounterpartyChannelTransactionParameters_clone(&counterparty_parameters_arg_conv); + counterparty_parameters_arg_conv = CounterpartyChannelTransactionParameters_clone(&counterparty_parameters_arg_conv); LDKOutPoint funding_outpoint_arg_conv; funding_outpoint_arg_conv.inner = (void*)(funding_outpoint_arg & (~1)); funding_outpoint_arg_conv.is_owned = (funding_outpoint_arg & 1) || (funding_outpoint_arg == 0); - if (funding_outpoint_arg_conv.inner != NULL) - funding_outpoint_arg_conv = OutPoint_clone(&funding_outpoint_arg_conv); + funding_outpoint_arg_conv = OutPoint_clone(&funding_outpoint_arg_conv); LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_new(holder_pubkeys_arg_conv, holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg_conv, funding_outpoint_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -13836,8 +13860,7 @@ void __attribute__((visibility("default"))) TS_CounterpartyChannelTransactionPa LDKChannelPublicKeys val_conv; val_conv.inner = (void*)(val & (~1)); val_conv.is_owned = (val & 1) || (val == 0); - if (val_conv.inner != NULL) - val_conv = ChannelPublicKeys_clone(&val_conv); + val_conv = ChannelPublicKeys_clone(&val_conv); CounterpartyChannelTransactionParameters_set_pubkeys(&this_ptr_conv, val_conv); } @@ -13860,8 +13883,7 @@ uint32_t __attribute__((visibility("default"))) TS_CounterpartyChannelTransacti LDKChannelPublicKeys pubkeys_arg_conv; pubkeys_arg_conv.inner = (void*)(pubkeys_arg & (~1)); pubkeys_arg_conv.is_owned = (pubkeys_arg & 1) || (pubkeys_arg == 0); - if (pubkeys_arg_conv.inner != NULL) - pubkeys_arg_conv = ChannelPublicKeys_clone(&pubkeys_arg_conv); + pubkeys_arg_conv = ChannelPublicKeys_clone(&pubkeys_arg_conv); LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_new(pubkeys_arg_conv, selected_contest_delay_arg); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -14113,8 +14135,7 @@ uint32_t __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_ LDKCommitmentTransaction commitment_tx_conv; commitment_tx_conv.inner = (void*)(commitment_tx & (~1)); commitment_tx_conv.is_owned = (commitment_tx & 1) || (commitment_tx == 0); - if (commitment_tx_conv.inner != NULL) - commitment_tx_conv = CommitmentTransaction_clone(&commitment_tx_conv); + commitment_tx_conv = CommitmentTransaction_clone(&commitment_tx_conv); LDKSignature counterparty_sig_ref; CHECK(*((uint32_t*)counterparty_sig) == 64); memcpy(counterparty_sig_ref.compact_form, (uint8_t*)(counterparty_sig + 4), 64); @@ -14546,7 +14567,7 @@ void __attribute__((visibility("default"))) TS_RouteHop_set_node_features(uint3 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! + // Warning: we need a move here but no clone is available for LDKNodeFeatures RouteHop_set_node_features(&this_ptr_conv, val_conv); } @@ -14586,7 +14607,7 @@ void __attribute__((visibility("default"))) TS_RouteHop_set_channel_features(ui 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! + // Warning: we need a move here but no clone is available for LDKChannelFeatures RouteHop_set_channel_features(&this_ptr_conv, val_conv); } @@ -14627,11 +14648,11 @@ uint32_t __attribute__((visibility("default"))) TS_RouteHop_new(int8_tArray pub 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! + // Warning: we need a move here but no clone is available for LDKNodeFeatures 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); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKChannelFeatures LDKRouteHop ret_var = RouteHop_new(pubkey_arg_ref, node_features_arg_conv, short_channel_id_arg, channel_features_arg_conv, fee_msat_arg, cltv_expiry_delta_arg); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -14688,8 +14709,7 @@ void __attribute__((visibility("default"))) TS_Route_set_paths(uint32_t this_pt LDKRouteHop arr_conv_10_conv; arr_conv_10_conv.inner = (void*)(arr_conv_10 & (~1)); arr_conv_10_conv.is_owned = (arr_conv_10 & 1) || (arr_conv_10 == 0); - if (arr_conv_10_conv.inner != NULL) - arr_conv_10_conv = RouteHop_clone(&arr_conv_10_conv); + arr_conv_10_conv = RouteHop_clone(&arr_conv_10_conv); arr_conv_12_constr.data[k] = arr_conv_10_conv; } val_constr.data[m] = arr_conv_12_constr; @@ -14719,8 +14739,7 @@ uint32_t __attribute__((visibility("default"))) TS_Route_new(ptrArray paths_arg LDKRouteHop arr_conv_10_conv; arr_conv_10_conv.inner = (void*)(arr_conv_10 & (~1)); arr_conv_10_conv.is_owned = (arr_conv_10 & 1) || (arr_conv_10 == 0); - if (arr_conv_10_conv.inner != NULL) - arr_conv_10_conv = RouteHop_clone(&arr_conv_10_conv); + arr_conv_10_conv = RouteHop_clone(&arr_conv_10_conv); arr_conv_12_constr.data[k] = arr_conv_10_conv; } paths_arg_constr.data[m] = arr_conv_12_constr; @@ -14831,8 +14850,7 @@ void __attribute__((visibility("default"))) TS_RouteHint_set_fees(uint32_t this 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); + val_conv = RoutingFees_clone(&val_conv); RouteHint_set_fees(&this_ptr_conv, val_conv); } @@ -14873,8 +14891,7 @@ uint32_t __attribute__((visibility("default"))) TS_RouteHint_new(int8_tArray sr LDKRoutingFees fees_arg_conv; fees_arg_conv.inner = (void*)(fees_arg & (~1)); fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0); - if (fees_arg_conv.inner != NULL) - fees_arg_conv = RoutingFees_clone(&fees_arg_conv); + fees_arg_conv = RoutingFees_clone(&fees_arg_conv); LDKRouteHint ret_var = RouteHint_new(src_node_id_arg_ref, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg, htlc_minimum_msat_arg); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -14921,11 +14938,10 @@ uint32_t __attribute__((visibility("default"))) TS_get_route(int8_tArray our_no LDKRouteHint arr_conv_11_conv; arr_conv_11_conv.inner = (void*)(arr_conv_11 & (~1)); arr_conv_11_conv.is_owned = (arr_conv_11 & 1) || (arr_conv_11 == 0); - if (arr_conv_11_conv.inner != NULL) - arr_conv_11_conv = RouteHint_clone(&arr_conv_11_conv); + arr_conv_11_conv = RouteHint_clone(&arr_conv_11_conv); last_hops_constr.data[l] = arr_conv_11_conv; } - LDKLogger logger_conv = *(LDKLogger*)logger; + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = get_route(our_node_id_ref, &network_conv, target_ref, &first_hops_constr, last_hops_constr, final_value_msat, final_cltv, logger_conv); FREE(first_hops_constr.data); @@ -14958,7 +14974,7 @@ uint32_t __attribute__((visibility("default"))) TS_NetGraphMsgHandler_new(int8_ CHECK(*((uint32_t*)genesis_hash) == 32); memcpy(genesis_hash_ref.data, (uint8_t*)(genesis_hash + 4), 32); LDKAccess* chain_access_conv = (LDKAccess*)chain_access; - LDKLogger logger_conv = *(LDKLogger*)logger; + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); LDKNetGraphMsgHandler ret_var = NetGraphMsgHandler_new(genesis_hash_ref, chain_access_conv, logger_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -14971,11 +14987,11 @@ uint32_t __attribute__((visibility("default"))) TS_NetGraphMsgHandler_new(int8_ uint32_t __attribute__((visibility("default"))) TS_NetGraphMsgHandler_from_net_graph(uint32_t chain_access, uint32_t logger, uint32_t network_graph) { LDKAccess* chain_access_conv = (LDKAccess*)chain_access; - LDKLogger logger_conv = *(LDKLogger*)logger; + LDKLogger logger_conv = *(LDKLogger*)(((uint64_t)logger) & ~1); 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! + // Warning: we need a move here but no clone is available for LDKNetworkGraph LDKNetGraphMsgHandler ret_var = NetGraphMsgHandler_from_net_graph(chain_access_conv, logger_conv, network_graph_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -15039,6 +15055,20 @@ void __attribute__((visibility("default"))) TS_DirectionalChannelInfo_free(uint DirectionalChannelInfo_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_DirectionalChannelInfo_clone(uint32_t orig) { + LDKDirectionalChannelInfo orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKDirectionalChannelInfo ret_var = DirectionalChannelInfo_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + int32_t __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_last_update(uint32_t this_ptr) { LDKDirectionalChannelInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -15120,8 +15150,7 @@ void __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_fees( 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); + val_conv = RoutingFees_clone(&val_conv); DirectionalChannelInfo_set_fees(&this_ptr_conv, val_conv); } @@ -15146,8 +15175,7 @@ void __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_last_ 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); + val_conv = ChannelUpdate_clone(&val_conv); DirectionalChannelInfo_set_last_update_message(&this_ptr_conv, val_conv); } @@ -15204,7 +15232,7 @@ void __attribute__((visibility("default"))) TS_ChannelInfo_set_features(uint32_ 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! + // Warning: we need a move here but no clone is available for LDKChannelFeatures ChannelInfo_set_features(&this_ptr_conv, val_conv); } @@ -15248,7 +15276,7 @@ void __attribute__((visibility("default"))) TS_ChannelInfo_set_one_to_two(uint3 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! + val_conv = DirectionalChannelInfo_clone(&val_conv); ChannelInfo_set_one_to_two(&this_ptr_conv, val_conv); } @@ -15292,7 +15320,7 @@ void __attribute__((visibility("default"))) TS_ChannelInfo_set_two_to_one(uint3 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! + val_conv = DirectionalChannelInfo_clone(&val_conv); ChannelInfo_set_two_to_one(&this_ptr_conv, val_conv); } @@ -15317,8 +15345,7 @@ void __attribute__((visibility("default"))) TS_ChannelInfo_set_announcement_mes 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); + val_conv = ChannelAnnouncement_clone(&val_conv); ChannelInfo_set_announcement_message(&this_ptr_conv, val_conv); } @@ -15436,6 +15463,20 @@ void __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_free(uint32 NodeAnnouncementInfo_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_clone(uint32_t orig) { + LDKNodeAnnouncementInfo orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + uint32_t __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_get_features(uint32_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -15457,7 +15498,7 @@ void __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_feature 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! + // Warning: we need a move here but no clone is available for LDKNodeFeatures NodeAnnouncementInfo_set_features(&this_ptr_conv, val_conv); } @@ -15527,7 +15568,7 @@ void __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_address uint32_t* val_vals = (uint32_t*)(val + 4); for (size_t m = 0; m < val_constr.datalen; m++) { uint32_t arr_conv_12 = val_vals[m]; - LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)arr_conv_12; + LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)(((uint64_t)arr_conv_12) & ~1); FREE((void*)arr_conv_12); val_constr.data[m] = arr_conv_12_conv; } @@ -15555,8 +15596,7 @@ void __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_announc 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); + val_conv = NodeAnnouncement_clone(&val_conv); NodeAnnouncementInfo_set_announcement_message(&this_ptr_conv, val_conv); } @@ -15564,7 +15604,7 @@ uint32_t __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_new(uin LDKNodeFeatures features_arg_conv; features_arg_conv.inner = (void*)(features_arg & (~1)); features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); - // Warning: we may need a move here but can't clone! + // Warning: we need a move here but no clone is available for LDKNodeFeatures LDKThreeBytes rgb_arg_ref; CHECK(*((uint32_t*)rgb_arg) == 3); memcpy(rgb_arg_ref.data, (uint8_t*)(rgb_arg + 4), 3); @@ -15580,15 +15620,14 @@ uint32_t __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_new(uin uint32_t* addresses_arg_vals = (uint32_t*)(addresses_arg + 4); for (size_t m = 0; m < addresses_arg_constr.datalen; m++) { uint32_t arr_conv_12 = addresses_arg_vals[m]; - LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)arr_conv_12; + LDKNetAddress arr_conv_12_conv = *(LDKNetAddress*)(((uint64_t)arr_conv_12) & ~1); FREE((void*)arr_conv_12); addresses_arg_constr.data[m] = arr_conv_12_conv; } 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); - if (announcement_message_arg_conv.inner != NULL) - announcement_message_arg_conv = NodeAnnouncement_clone(&announcement_message_arg_conv); + announcement_message_arg_conv = NodeAnnouncement_clone(&announcement_message_arg_conv); LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_ref, alias_arg_ref, addresses_arg_constr, announcement_message_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -15626,6 +15665,20 @@ void __attribute__((visibility("default"))) TS_NodeInfo_free(uint32_t this_ptr) NodeInfo_free(this_ptr_conv); } +uint32_t __attribute__((visibility("default"))) TS_NodeInfo_clone(uint32_t orig) { + LDKNodeInfo orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + LDKNodeInfo ret_var = NodeInfo_clone(&orig_conv); + CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + long ret_ref = (long)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + void __attribute__((visibility("default"))) TS_NodeInfo_set_channels(uint32_t this_ptr, int64_tArray val) { LDKNodeInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -15665,8 +15718,7 @@ void __attribute__((visibility("default"))) TS_NodeInfo_set_lowest_inbound_chan 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); + val_conv = RoutingFees_clone(&val_conv); NodeInfo_set_lowest_inbound_channel_fees(&this_ptr_conv, val_conv); } @@ -15691,7 +15743,7 @@ void __attribute__((visibility("default"))) TS_NodeInfo_set_announcement_info(u 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! + val_conv = NodeAnnouncementInfo_clone(&val_conv); NodeInfo_set_announcement_info(&this_ptr_conv, val_conv); } @@ -15710,12 +15762,11 @@ uint32_t __attribute__((visibility("default"))) TS_NodeInfo_new(int64_tArray ch 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); + 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! + announcement_info_arg_conv = NodeAnnouncementInfo_clone(&announcement_info_arg_conv); LDKNodeInfo ret_var = NodeInfo_new(channels_arg_constr, lowest_inbound_channel_fees_arg_conv, announcement_info_arg_conv); CHECK((((long)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((long)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.