X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fbindings.c;h=27d8f80f45d533d32bcd7a14ff61001286eb06fd;hb=7cbcc5ef17b8036b2e99980e227c7ca0d44dba7f;hp=aadf1ce6f0c8d9d9a2bc39555f23c107078aaa89;hpb=47341beaeecf907f422f126500baf586d54a0d41;p=ldk-java diff --git a/ts/bindings.c b/ts/bindings.c index aadf1ce6..27d8f80f 100644 --- a/ts/bindings.c +++ b/ts/bindings.c @@ -39,12 +39,12 @@ _Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits"); #define DECL_ARR_TYPE(ty, name) \ struct name##array { \ - uint32_t arr_len; \ + uint64_t arr_len; /* uint32_t would suffice but we want to align uint64_ts as well */ \ ty elems[]; \ }; \ typedef struct name##array * name##Array; \ static inline name##Array init_##name##Array(size_t arr_len, int lineno) { \ - name##Array arr = (name##Array)do_MALLOC(arr_len * sizeof(ty) + sizeof(uint32_t), #name" array init", lineno); \ + name##Array arr = (name##Array)do_MALLOC(arr_len * sizeof(ty) + sizeof(uint64_t), #name" array init", lineno); \ arr->arr_len = arr_len; \ return arr; \ } @@ -900,7 +900,7 @@ ptrArray __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_ok"))) LDKCVec_SignatureZ ret_var = CResult_CVec_SignatureZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { int8_tArray ret_conv_12_arr = init_int8_tArray(64, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].compact_form, 64); @@ -1134,6 +1134,11 @@ int64_t __attribute__((export_name("TS_LDKCOption_u64Z_Some_get_some"))) TS_LDKC int64_t some_conv = obj->some; return some_conv; } +static inline LDKCVec_u64Z CVec_u64Z_clone(const LDKCVec_u64Z *orig) { + LDKCVec_u64Z ret = { .data = MALLOC(sizeof(int64_t) * orig->datalen, "LDKCVec_u64Z clone bytes"), .datalen = orig->datalen }; + memcpy(ret.data, orig->data, sizeof(int64_t) * ret.datalen); + return ret; +} static inline struct LDKPaymentParameters CResult_PaymentParametersDecodeErrorZ_get_ok(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return PaymentParameters_clone(&*owner->contents.result); @@ -1423,6 +1428,86 @@ uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr return ret_ref; } +uint32_t __attribute__((export_name("TS_LDKHTLCDestination_ty_from_ptr"))) TS_LDKHTLCDestination_ty_from_ptr(uint32_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); + switch(obj->tag) { + case LDKHTLCDestination_NextHopChannel: return 0; + case LDKHTLCDestination_UnknownNextHop: return 1; + case LDKHTLCDestination_FailedPayment: return 2; + default: abort(); + } +} +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_node_id"))) TS_LDKHTLCDestination_NextHopChannel_get_node_id(uint32_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); + assert(obj->tag == LDKHTLCDestination_NextHopChannel); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); + memcpy(node_id_arr->elems, obj->next_hop_channel.node_id.compressed_form, 33); + return node_id_arr; +} +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_NextHopChannel_get_channel_id"))) TS_LDKHTLCDestination_NextHopChannel_get_channel_id(uint32_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); + assert(obj->tag == LDKHTLCDestination_NextHopChannel); + int8_tArray channel_id_arr = init_int8_tArray(32, __LINE__); + memcpy(channel_id_arr->elems, obj->next_hop_channel.channel_id.data, 32); + return channel_id_arr; +} +int64_t __attribute__((export_name("TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid"))) TS_LDKHTLCDestination_UnknownNextHop_get_requested_forward_scid(uint32_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); + assert(obj->tag == LDKHTLCDestination_UnknownNextHop); + int64_t requested_forward_scid_conv = obj->unknown_next_hop.requested_forward_scid; + return requested_forward_scid_conv; +} +int8_tArray __attribute__((export_name("TS_LDKHTLCDestination_FailedPayment_get_payment_hash"))) TS_LDKHTLCDestination_FailedPayment_get_payment_hash(uint32_t ptr) { + LDKHTLCDestination *obj = (LDKHTLCDestination*)(ptr & ~1); + assert(obj->tag == LDKHTLCDestination_FailedPayment); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); + memcpy(payment_hash_arr->elems, obj->failed_payment.payment_hash.data, 32); + return payment_hash_arr; +} +uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_ty_from_ptr"))) TS_LDKCOption_HTLCDestinationZ_ty_from_ptr(uint32_t ptr) { + LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)(ptr & ~1); + switch(obj->tag) { + case LDKCOption_HTLCDestinationZ_Some: return 0; + case LDKCOption_HTLCDestinationZ_None: return 1; + default: abort(); + } +} +uint32_t __attribute__((export_name("TS_LDKCOption_HTLCDestinationZ_Some_get_some"))) TS_LDKCOption_HTLCDestinationZ_Some_get_some(uint32_t ptr) { + LDKCOption_HTLCDestinationZ *obj = (LDKCOption_HTLCDestinationZ*)(ptr & ~1); + assert(obj->tag == LDKCOption_HTLCDestinationZ_Some); + uint32_t some_ref = ((uintptr_t)&obj->some) | 1; + return some_ref; +} +static inline struct LDKCOption_HTLCDestinationZ CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR owner){ +CHECK(owner->result_ok); + return COption_HTLCDestinationZ_clone(&*owner->contents.result); +} +uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(uint32_t owner) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(owner & ~1); + LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); + *ret_copy = CResult_COption_HTLCDestinationZDecodeErrorZ_get_ok(owner_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +static inline struct LDKDecodeError CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR owner){ +CHECK(!owner->result_ok); + return DecodeError_clone(&*owner->contents.err); +} +uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(uint32_t owner) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* owner_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(owner & ~1); + LDKDecodeError ret_var = CResult_COption_HTLCDestinationZDecodeErrorZ_get_err(owner_conv); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKNetworkUpdate_ty_from_ptr(uint32_t ptr) { LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); switch(obj->tag) { @@ -1547,12 +1632,15 @@ uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_ case LDKEvent_PaymentFailed: return 4; case LDKEvent_PaymentPathSuccessful: return 5; case LDKEvent_PaymentPathFailed: return 6; - case LDKEvent_PendingHTLCsForwardable: return 7; - case LDKEvent_SpendableOutputs: return 8; - case LDKEvent_PaymentForwarded: return 9; - case LDKEvent_ChannelClosed: return 10; - case LDKEvent_DiscardFunding: return 11; - case LDKEvent_OpenChannelRequest: return 12; + case LDKEvent_ProbeSuccessful: return 7; + case LDKEvent_ProbeFailed: return 8; + case LDKEvent_PendingHTLCsForwardable: return 9; + case LDKEvent_SpendableOutputs: return 10; + case LDKEvent_PaymentForwarded: return 11; + case LDKEvent_ChannelClosed: return 12; + case LDKEvent_DiscardFunding: return 13; + case LDKEvent_OpenChannelRequest: return 14; + case LDKEvent_HTLCHandlingFailed: return 15; default: abort(); } } @@ -1689,7 +1777,7 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_ LDKCVec_RouteHopZ path_var = obj->payment_path_successful.path; uint32_tArray path_arr = NULL; path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; uint32_t path_conv_10_ref = 0; @@ -1740,7 +1828,7 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path LDKCVec_RouteHopZ path_var = obj->payment_path_failed.path; uint32_tArray path_arr = NULL; path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; uint32_t path_conv_10_ref = 0; @@ -1772,6 +1860,78 @@ uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_retry"))) } return retry_ref; } +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_id"))) TS_LDKEvent_ProbeSuccessful_get_payment_id(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_ProbeSuccessful); + int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); + memcpy(payment_id_arr->elems, obj->probe_successful.payment_id.data, 32); + return payment_id_arr; +} +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_payment_hash"))) TS_LDKEvent_ProbeSuccessful_get_payment_hash(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_ProbeSuccessful); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); + memcpy(payment_hash_arr->elems, obj->probe_successful.payment_hash.data, 32); + return payment_hash_arr; +} +uint32_tArray __attribute__((export_name("TS_LDKEvent_ProbeSuccessful_get_path"))) TS_LDKEvent_ProbeSuccessful_get_path(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_ProbeSuccessful); + LDKCVec_RouteHopZ path_var = obj->probe_successful.path; + uint32_tArray path_arr = NULL; + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + for (size_t k = 0; k < path_var.datalen; k++) { + LDKRouteHop path_conv_10_var = path_var.data[k]; + uint32_t path_conv_10_ref = 0; + CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_arr_ptr[k] = path_conv_10_ref; + } + + return path_arr; +} +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_id"))) TS_LDKEvent_ProbeFailed_get_payment_id(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_ProbeFailed); + int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); + memcpy(payment_id_arr->elems, obj->probe_failed.payment_id.data, 32); + return payment_id_arr; +} +int8_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_payment_hash"))) TS_LDKEvent_ProbeFailed_get_payment_hash(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_ProbeFailed); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); + memcpy(payment_hash_arr->elems, obj->probe_failed.payment_hash.data, 32); + return payment_hash_arr; +} +uint32_tArray __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_path"))) TS_LDKEvent_ProbeFailed_get_path(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_ProbeFailed); + LDKCVec_RouteHopZ path_var = obj->probe_failed.path; + uint32_tArray path_arr = NULL; + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + for (size_t k = 0; k < path_var.datalen; k++) { + LDKRouteHop path_conv_10_var = path_var.data[k]; + uint32_t path_conv_10_ref = 0; + CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; + path_arr_ptr[k] = path_conv_10_ref; + } + + return path_arr; +} +uint32_t __attribute__((export_name("TS_LDKEvent_ProbeFailed_get_short_channel_id"))) TS_LDKEvent_ProbeFailed_get_short_channel_id(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_ProbeFailed); + uint32_t short_channel_id_ref = ((uintptr_t)&obj->probe_failed.short_channel_id) | 1; + return short_channel_id_ref; +} int64_t __attribute__((export_name("TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable"))) TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PendingHTLCsForwardable); @@ -1784,7 +1944,7 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outpu LDKCVec_SpendableOutputDescriptorZ outputs_var = obj->spendable_outputs.outputs; uint32_tArray outputs_arr = NULL; outputs_arr = init_uint32_tArray(outputs_var.datalen, __LINE__); - uint32_t *outputs_arr_ptr = (uint32_t*)(((uint8_t*)outputs_arr) + 4); + uint32_t *outputs_arr_ptr = (uint32_t*)(((uint8_t*)outputs_arr) + 8); for (size_t b = 0; b < outputs_var.datalen; b++) { uint32_t outputs_conv_27_ref = ((uintptr_t)&outputs_var.data[b]) | 1; outputs_arr_ptr[b] = outputs_conv_27_ref; @@ -1889,6 +2049,19 @@ uint32_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_channel_ channel_type_ref = (uintptr_t)channel_type_var.inner & ~1; return channel_type_ref; } +int8_tArray __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id"))) TS_LDKEvent_HTLCHandlingFailed_get_prev_channel_id(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_HTLCHandlingFailed); + int8_tArray prev_channel_id_arr = init_int8_tArray(32, __LINE__); + memcpy(prev_channel_id_arr->elems, obj->htlc_handling_failed.prev_channel_id.data, 32); + return prev_channel_id_arr; +} +uint32_t __attribute__((export_name("TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination"))) TS_LDKEvent_HTLCHandlingFailed_get_failed_next_destination(uint32_t ptr) { + LDKEvent *obj = (LDKEvent*)(ptr & ~1); + assert(obj->tag == LDKEvent_HTLCHandlingFailed); + uint32_t failed_next_destination_ref = ((uintptr_t)&obj->htlc_handling_failed.failed_next_destination) | 1; + return failed_next_destination_ref; +} uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDKCOption_EventZ_ty_from_ptr(uint32_t ptr) { LDKCOption_EventZ *obj = (LDKCOption_EventZ*)(ptr & ~1); switch(obj->tag) { @@ -2511,12 +2684,12 @@ static inline LDKCVec_MonitorEventZ CVec_MonitorEventZ_clone(const LDKCVec_Monit } return ret; } -static inline struct LDKOutPoint C2Tuple_OutPointCVec_MonitorEventZZ_get_a(LDKC2Tuple_OutPointCVec_MonitorEventZZ *NONNULL_PTR owner){ +static inline struct LDKOutPoint C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return OutPoint_clone(&owner->a); } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_a"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_a(uint32_t owner) { - LDKC2Tuple_OutPointCVec_MonitorEventZZ* owner_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(owner & ~1); - LDKOutPoint ret_var = C2Tuple_OutPointCVec_MonitorEventZZ_get_a(owner_conv); +uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(uint32_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); + LDKOutPoint ret_var = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_a(owner_conv); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -2528,15 +2701,15 @@ uint32_t __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_get return ret_ref; } -static inline struct LDKCVec_MonitorEventZ C2Tuple_OutPointCVec_MonitorEventZZ_get_b(LDKC2Tuple_OutPointCVec_MonitorEventZZ *NONNULL_PTR owner){ +static inline struct LDKCVec_MonitorEventZ C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ return CVec_MonitorEventZ_clone(&owner->b); } -uint32_tArray __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_b"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_b(uint32_t owner) { - LDKC2Tuple_OutPointCVec_MonitorEventZZ* owner_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(owner & ~1); - LDKCVec_MonitorEventZ ret_var = C2Tuple_OutPointCVec_MonitorEventZZ_get_b(owner_conv); +uint32_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(uint32_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); + LDKCVec_MonitorEventZ ret_var = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_b(owner_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_conv_14_copy = ret_var.data[o]; @@ -2548,10 +2721,20 @@ uint32_tArray __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZ return ret_arr; } -static inline LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_clone(const LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ *orig) { - LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ) * orig->datalen, "LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ clone bytes"), .datalen = orig->datalen }; +static inline struct LDKPublicKey C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR owner){ + return owner->c; +} +int8_tArray __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(uint32_t owner) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* owner_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(owner & ~1); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); + memcpy(ret_arr->elems, C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_get_c(owner_conv).compressed_form, 33); + return ret_arr; +} + +static inline LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_clone(const LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ *orig) { + LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ ret = { .data = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ) * orig->datalen, "LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ clone bytes"), .datalen = orig->datalen }; for (size_t i = 0; i < ret.datalen; i++) { - ret.data[i] = C2Tuple_OutPointCVec_MonitorEventZZ_clone(&orig->data[i]); + ret.data[i] = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(&orig->data[i]); } return ret; } @@ -2607,6 +2790,47 @@ uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_ return ret_ref; } +static inline uint64_t C2Tuple_u64u64Z_get_a(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){ + return owner->a; +} +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64u64Z_get_a(uint32_t owner) { + LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1); + int64_t ret_conv = C2Tuple_u64u64Z_get_a(owner_conv); + return ret_conv; +} + +static inline uint64_t C2Tuple_u64u64Z_get_b(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){ + return owner->b; +} +int64_t __attribute__((export_name("TS_C2Tuple_u64u64Z_get_b"))) TS_C2Tuple_u64u64Z_get_b(uint32_t owner) { + LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1); + int64_t ret_conv = C2Tuple_u64u64Z_get_b(owner_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(uint32_t ptr) { + LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1); + switch(obj->tag) { + case LDKCOption_C2Tuple_u64u64ZZ_Some: return 0; + case LDKCOption_C2Tuple_u64u64ZZ_None: return 1; + default: abort(); + } +} +uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(uint32_t ptr) { + LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1); + assert(obj->tag == LDKCOption_C2Tuple_u64u64ZZ_Some); + LDKC2Tuple_u64u64Z* some_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); + *some_conv = obj->some; + *some_conv = C2Tuple_u64u64Z_clone(some_conv); + return ((uint32_t)some_conv); +} +static inline LDKCVec_NodeIdZ CVec_NodeIdZ_clone(const LDKCVec_NodeIdZ *orig) { + LDKCVec_NodeIdZ ret = { .data = MALLOC(sizeof(LDKNodeId) * orig->datalen, "LDKCVec_NodeIdZ clone bytes"), .datalen = orig->datalen }; + for (size_t i = 0; i < ret.datalen; i++) { + ret.data[i] = NodeId_clone(&orig->data[i]); + } + return ret; +} typedef struct LDKLogger_JCalls { atomic_size_t refcnt; uint32_t instance_ptr; @@ -2629,7 +2853,7 @@ void log_LDKLogger_jcall(const void* this_arg, const LDKRecord * record) { if (record_var.is_owned) { record_ref |= 1; } - js_invoke_function_1(j_calls->instance_ptr, 0, (uint32_t)record_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 0, (uint32_t)record_ref, 0, 0, 0, 0, 0); } static void LDKLogger_JCalls_cloned(LDKLogger* new_obj) { LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) new_obj->this_arg; @@ -2946,7 +3170,7 @@ LDKCResult_TxOutAccessErrorZ get_utxo_LDKAccess_jcall(const void* this_arg, cons int8_tArray genesis_hash_arr = init_int8_tArray(32, __LINE__); memcpy(genesis_hash_arr->elems, *genesis_hash, 32); int64_t short_channel_id_conv = short_channel_id; - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 1, (uint32_t)genesis_hash_arr, (uint32_t)short_channel_id_conv); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 1, (uint32_t)genesis_hash_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(ret_ptr); @@ -3242,6 +3466,7 @@ uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetA case LDKNetAddress_IPv6: return 1; case LDKNetAddress_OnionV2: return 2; case LDKNetAddress_OnionV3: return 3; + case LDKNetAddress_Hostname: return 4; default: abort(); } } @@ -3303,6 +3528,23 @@ int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_port"))) TS_LDK int16_t port_conv = obj->onion_v3.port; return port_conv; } +uint32_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_hostname"))) TS_LDKNetAddress_Hostname_get_hostname(uint32_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); + assert(obj->tag == LDKNetAddress_Hostname); + LDKHostname hostname_var = obj->hostname.hostname; + uint32_t hostname_ref = 0; + CHECK((((uintptr_t)hostname_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&hostname_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(hostname_var); + hostname_ref = (uintptr_t)hostname_var.inner & ~1; + return hostname_ref; +} +int16_t __attribute__((export_name("TS_LDKNetAddress_Hostname_get_port"))) TS_LDKNetAddress_Hostname_get_port(uint32_t ptr) { + LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); + assert(obj->tag == LDKNetAddress_Hostname); + int16_t port_conv = obj->hostname.port; + return port_conv; +} static inline LDKCVec_NetAddressZ CVec_NetAddressZ_clone(const LDKCVec_NetAddressZ *orig) { LDKCVec_NetAddressZ ret = { .data = MALLOC(sizeof(LDKNetAddress) * orig->datalen, "LDKCVec_NetAddressZ clone bytes"), .datalen = orig->datalen }; for (size_t i = 0; i < ret.datalen; i++) { @@ -3346,11 +3588,42 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError return ret_ref; } -static inline LDKCVec_u64Z CVec_u64Z_clone(const LDKCVec_u64Z *orig) { - LDKCVec_u64Z ret = { .data = MALLOC(sizeof(int64_t) * orig->datalen, "LDKCVec_u64Z clone bytes"), .datalen = orig->datalen }; - memcpy(ret.data, orig->data, sizeof(int64_t) * ret.datalen); - return ret; +static inline struct LDKNodeAlias CResult_NodeAliasDecodeErrorZ_get_ok(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR owner){ +CHECK(owner->result_ok); + return NodeAlias_clone(&*owner->contents.result); +} +uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_ok"))) TS_CResult_NodeAliasDecodeErrorZ_get_ok(uint32_t owner) { + LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1); + LDKNodeAlias ret_var = CResult_NodeAliasDecodeErrorZ_get_ok(owner_conv); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + +static inline struct LDKDecodeError CResult_NodeAliasDecodeErrorZ_get_err(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR owner){ +CHECK(!owner->result_ok); + return DecodeError_clone(&*owner->contents.err); } +uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_err"))) TS_CResult_NodeAliasDecodeErrorZ_get_err(uint32_t owner) { + LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1); + LDKDecodeError ret_var = CResult_NodeAliasDecodeErrorZ_get_err(owner_conv); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + static inline struct LDKNodeInfo CResult_NodeInfoDecodeErrorZ_get_ok(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); return NodeInfo_clone(&*owner->contents.result); @@ -3434,7 +3707,7 @@ uint32_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_g LDKCVec_NetAddressZ some_var = obj->some; uint32_tArray some_arr = NULL; some_arr = init_uint32_tArray(some_var.datalen, __LINE__); - uint32_t *some_arr_ptr = (uint32_t*)(((uint8_t*)some_arr) + 4); + uint32_t *some_arr_ptr = (uint32_t*)(((uint8_t*)some_arr) + 8); for (size_t m = 0; m < some_var.datalen; m++) { uint32_t some_conv_12_ref = ((uintptr_t)&some_var.data[m]) | 1; some_arr_ptr[m] = some_conv_12_ref; @@ -3569,7 +3842,7 @@ ptrArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b LDKCVec_SignatureZ ret_var = C2Tuple_SignatureCVec_SignatureZZ_get_b(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { int8_tArray ret_conv_12_arr = init_int8_tArray(64, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].compact_form, 64); @@ -3692,7 +3965,7 @@ static void LDKBaseSign_JCalls_free(void* this_arg) { LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; int64_t idx_conv = idx; - int8_tArray ret = (int8_tArray)js_invoke_function_1(j_calls->instance_ptr, 2, (uint32_t)idx_conv); + int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 2, (uint32_t)idx_conv, 0, 0, 0, 0, 0); LDKPublicKey ret_ref; CHECK(ret->arr_len == 33); memcpy(ret_ref.compressed_form, ret->elems, 33); FREE(ret); @@ -3701,7 +3974,7 @@ LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, ui LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; int64_t idx_conv = idx; - int8_tArray ret = (int8_tArray)js_invoke_function_1(j_calls->instance_ptr, 3, (uint32_t)idx_conv); + int8_tArray ret = (int8_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 3, (uint32_t)idx_conv, 0, 0, 0, 0, 0); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); memcpy(ret_ref.data, ret->elems, 32); FREE(ret); @@ -3722,7 +3995,7 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th LDKCVec_PaymentPreimageZ preimages_var = preimages; ptrArray preimages_arr = NULL; preimages_arr = init_ptrArray(preimages_var.datalen, __LINE__); - int8_tArray *preimages_arr_ptr = (int8_tArray*)(((uint8_t*)preimages_arr) + 4); + int8_tArray *preimages_arr_ptr = (int8_tArray*)(((uint8_t*)preimages_arr) + 8); for (size_t m = 0; m < preimages_var.datalen; m++) { int8_tArray preimages_conv_12_arr = init_int8_tArray(32, __LINE__); memcpy(preimages_conv_12_arr->elems, preimages_var.data[m].data, 32); @@ -3730,7 +4003,7 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th } FREE(preimages_var.data); - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 4, (uint32_t)holder_tx_ref, (uint32_t)preimages_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 4, (uint32_t)holder_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); @@ -3739,7 +4012,7 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th } LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 5); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 5, 0, 0, 0, 0, 0, 0); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); memcpy(ret_ref.data, ret->elems, 32); FREE(ret); @@ -3760,7 +4033,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L LDKCVec_PaymentPreimageZ preimages_var = preimages; ptrArray preimages_arr = NULL; preimages_arr = init_ptrArray(preimages_var.datalen, __LINE__); - int8_tArray *preimages_arr_ptr = (int8_tArray*)(((uint8_t*)preimages_arr) + 4); + int8_tArray *preimages_arr_ptr = (int8_tArray*)(((uint8_t*)preimages_arr) + 8); for (size_t m = 0; m < preimages_var.datalen; m++) { int8_tArray preimages_conv_12_arr = init_int8_tArray(32, __LINE__); memcpy(preimages_conv_12_arr->elems, preimages_var.data[m].data, 32); @@ -3768,7 +4041,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L } FREE(preimages_var.data); - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 6, (uint32_t)commitment_tx_ref, (uint32_t)preimages_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 6, (uint32_t)commitment_tx_ref, (uint32_t)preimages_arr, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); @@ -3780,7 +4053,7 @@ LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const vo int64_t idx_conv = idx; int8_tArray secret_arr = init_int8_tArray(32, __LINE__); memcpy(secret_arr->elems, *secret, 32); - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 7, (uint32_t)idx_conv, (uint32_t)secret_arr); + uint32_t ret = js_invoke_function_buuuuu(j_calls->instance_ptr, 7, (uint32_t)idx_conv, (uint32_t)secret_arr, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); @@ -3799,7 +4072,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htl if (commitment_tx_var.is_owned) { commitment_tx_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 8, (uint32_t)commitment_tx_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 8, (uint32_t)commitment_tx_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); @@ -3816,7 +4089,7 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_output_LDKBaseSign_jcall(const vo int64_t amount_conv = amount; int8_tArray per_commitment_key_arr = init_int8_tArray(32, __LINE__); memcpy(per_commitment_key_arr->elems, *per_commitment_key, 32); - uint32_t ret = js_invoke_function_4(j_calls->instance_ptr, 9, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr); + uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 9, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); @@ -3843,7 +4116,7 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void if (htlc_var.is_owned) { htlc_ref |= 1; } - uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 10, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, (uint32_t)htlc_ref); + uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 10, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, (uint32_t)htlc_ref, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); @@ -3870,7 +4143,7 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c if (htlc_var.is_owned) { htlc_ref |= 1; } - uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 11, (uint32_t)htlc_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_point_arr, (uint32_t)htlc_ref); + uint32_t ret = js_invoke_function_uubuuu(j_calls->instance_ptr, 11, (uint32_t)htlc_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_point_arr, (uint32_t)htlc_ref, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); @@ -3889,7 +4162,7 @@ LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void* if (closing_tx_var.is_owned) { closing_tx_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 12, (uint32_t)closing_tx_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 12, (uint32_t)closing_tx_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); @@ -3908,7 +4181,7 @@ LDKCResult_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement_LDKBaseSig if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 13, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 13, (uint32_t)msg_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureSignatureZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(ret_ptr); @@ -3927,7 +4200,7 @@ void ready_channel_LDKBaseSign_jcall(void* this_arg, const LDKChannelTransaction if (channel_parameters_var.is_owned) { channel_parameters_ref |= 1; } - js_invoke_function_1(j_calls->instance_ptr, 14, (uint32_t)channel_parameters_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 14, (uint32_t)channel_parameters_ref, 0, 0, 0, 0, 0); } static void LDKBaseSign_JCalls_cloned(LDKBaseSign* new_obj) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) new_obj->this_arg; @@ -4001,7 +4274,7 @@ uint32_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) preimages_constr.data = MALLOC(preimages_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_PaymentPreimageZ Elements"); else preimages_constr.data = NULL; - int8_tArray* preimages_vals = (void*) preimages->elems /* XXX preimages leaks */; + int8_tArray* preimages_vals = (void*) preimages->elems; for (size_t m = 0; m < preimages_constr.datalen; m++) { int8_tArray preimages_conv_12 = preimages_vals[m]; LDKThirtyTwoBytes preimages_conv_12_ref; @@ -4009,6 +4282,7 @@ uint32_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) memcpy(preimages_conv_12_ref.data, preimages_conv_12->elems, 32); FREE(preimages_conv_12); preimages_constr.data[m] = preimages_conv_12_ref; } + FREE(preimages); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = (this_arg_conv->validate_holder_commitment)(this_arg_conv->this_arg, &holder_tx_conv, preimages_constr); return (uint32_t)ret_conv; @@ -4037,7 +4311,7 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment") preimages_constr.data = MALLOC(preimages_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_PaymentPreimageZ Elements"); else preimages_constr.data = NULL; - int8_tArray* preimages_vals = (void*) preimages->elems /* XXX preimages leaks */; + int8_tArray* preimages_vals = (void*) preimages->elems; for (size_t m = 0; m < preimages_constr.datalen; m++) { int8_tArray preimages_conv_12 = preimages_vals[m]; LDKThirtyTwoBytes preimages_conv_12_ref; @@ -4045,6 +4319,7 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment") memcpy(preimages_conv_12_ref.data, preimages_conv_12->elems, 32); FREE(preimages_conv_12); preimages_constr.data[m] = preimages_conv_12_ref; } + FREE(preimages); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = (this_arg_conv->sign_counterparty_commitment)(this_arg_conv->this_arg, &commitment_tx_conv, preimages_constr); return (uint32_t)ret_conv; @@ -4208,7 +4483,7 @@ static void LDKSign_JCalls_free(void* this_arg) { } LDKCVec_u8Z write_LDKSign_jcall(const void* this_arg) { LDKSign_JCalls *j_calls = (LDKSign_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 15); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 15, 0, 0, 0, 0, 0, 0); LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -4321,7 +4596,7 @@ ptrArray __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok"))) LDKCVec_CVec_u8ZZ ret_var = CResult_CVec_CVec_u8ZZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKCVec_u8Z ret_conv_12_var = ret_var.data[m]; int8_tArray ret_conv_12_arr = init_int8_tArray(ret_conv_12_var.datalen, __LINE__); @@ -4558,7 +4833,7 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PathParameter LDKCVec_CResult_NoneAPIErrorZZ path_parameter_error_var = obj->path_parameter_error; uint32_tArray path_parameter_error_arr = NULL; path_parameter_error_arr = init_uint32_tArray(path_parameter_error_var.datalen, __LINE__); - uint32_t *path_parameter_error_arr_ptr = (uint32_t*)(((uint8_t*)path_parameter_error_arr) + 4); + uint32_t *path_parameter_error_arr_ptr = (uint32_t*)(((uint8_t*)path_parameter_error_arr) + 8); for (size_t w = 0; w < path_parameter_error_var.datalen; w++) { LDKCResult_NoneAPIErrorZ* path_parameter_error_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *path_parameter_error_conv_22_conv = path_parameter_error_var.data[w]; @@ -4574,7 +4849,7 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_AllFailedRetr LDKCVec_APIErrorZ all_failed_retry_safe_var = obj->all_failed_retry_safe; uint32_tArray all_failed_retry_safe_arr = NULL; all_failed_retry_safe_arr = init_uint32_tArray(all_failed_retry_safe_var.datalen, __LINE__); - uint32_t *all_failed_retry_safe_arr_ptr = (uint32_t*)(((uint8_t*)all_failed_retry_safe_arr) + 4); + uint32_t *all_failed_retry_safe_arr_ptr = (uint32_t*)(((uint8_t*)all_failed_retry_safe_arr) + 8); for (size_t k = 0; k < all_failed_retry_safe_var.datalen; k++) { uint32_t all_failed_retry_safe_conv_10_ref = ((uintptr_t)&all_failed_retry_safe_var.data[k]) | 1; all_failed_retry_safe_arr_ptr[k] = all_failed_retry_safe_conv_10_ref; @@ -4588,7 +4863,7 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailur LDKCVec_CResult_NoneAPIErrorZZ results_var = obj->partial_failure.results; uint32_tArray results_arr = NULL; results_arr = init_uint32_tArray(results_var.datalen, __LINE__); - uint32_t *results_arr_ptr = (uint32_t*)(((uint8_t*)results_arr) + 4); + uint32_t *results_arr_ptr = (uint32_t*)(((uint8_t*)results_arr) + 8); for (size_t w = 0; w < results_var.datalen; w++) { LDKCResult_NoneAPIErrorZ* results_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *results_conv_22_conv = results_var.data[w]; @@ -4705,6 +4980,13 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa return ret_ref; } +static inline LDKCVec_ThirtyTwoBytesZ CVec_ThirtyTwoBytesZ_clone(const LDKCVec_ThirtyTwoBytesZ *orig) { + LDKCVec_ThirtyTwoBytesZ ret = { .data = MALLOC(sizeof(LDKThirtyTwoBytes) * orig->datalen, "LDKCVec_ThirtyTwoBytesZ clone bytes"), .datalen = orig->datalen }; + for (size_t i = 0; i < ret.datalen; i++) { + ret.data[i] = ThirtyTwoBytes_clone(&orig->data[i]); + } + return ret; +} static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_a(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR owner){ return ThirtyTwoBytes_clone(&owner->a); } @@ -5015,7 +5297,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void* if (monitor_var.is_owned) { monitor_ref |= 1; } - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 16, (uint32_t)funding_txo_ref, (uint32_t)monitor_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 16, (uint32_t)funding_txo_ref, (uint32_t)monitor_ref, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); @@ -5042,31 +5324,32 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void if (update_var.is_owned) { update_ref |= 1; } - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 17, (uint32_t)funding_txo_ref, (uint32_t)update_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 17, (uint32_t)funding_txo_ref, (uint32_t)update_ref, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); FREE((void*)ret); return ret_conv; } -LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ release_pending_monitor_events_LDKWatch_jcall(const void* this_arg) { +LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ release_pending_monitor_events_LDKWatch_jcall(const void* this_arg) { LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 18); - LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ ret_constr; + uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 18, 0, 0, 0, 0, 0, 0); + LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) - ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ Elements"); + ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems /* XXX ret leaks */; - for (size_t m = 0; m < ret_constr.datalen; m++) { - uint32_t ret_conv_38 = ret_vals[m]; - void* ret_conv_38_ptr = (void*)(((uintptr_t)ret_conv_38) & ~1); - CHECK_ACCESS(ret_conv_38_ptr); - LDKC2Tuple_OutPointCVec_MonitorEventZZ ret_conv_38_conv = *(LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(ret_conv_38_ptr); - FREE((void*)ret_conv_38); - ret_constr.data[m] = ret_conv_38_conv; - } + uint32_t* ret_vals = ret->elems; + for (size_t x = 0; x < ret_constr.datalen; x++) { + uint32_t ret_conv_49 = ret_vals[x]; + void* ret_conv_49_ptr = (void*)(((uintptr_t)ret_conv_49) & ~1); + CHECK_ACCESS(ret_conv_49_ptr); + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ ret_conv_49_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(ret_conv_49_ptr); + FREE((void*)ret_conv_49); + ret_constr.data[x] = ret_conv_49_conv; + } + FREE(ret); return ret_constr; } static void LDKWatch_JCalls_cloned(LDKWatch* new_obj) { @@ -5134,14 +5417,14 @@ uint32_tArray __attribute__((export_name("TS_Watch_release_pending_monitor_even void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr; - LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ ret_var = (this_arg_conv->release_pending_monitor_events)(this_arg_conv->this_arg); + LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ ret_var = (this_arg_conv->release_pending_monitor_events)(this_arg_conv->this_arg); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); - for (size_t m = 0; m < ret_var.datalen; m++) { - LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv_38_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ"); - *ret_conv_38_conv = ret_var.data[m]; - ret_arr_ptr[m] = ((uint32_t)ret_conv_38_conv); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + for (size_t x = 0; x < ret_var.datalen; x++) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv_49_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); + *ret_conv_49_conv = ret_var.data[x]; + ret_arr_ptr[x] = ((uint32_t)ret_conv_49_conv); } FREE(ret_var.data); @@ -5164,7 +5447,7 @@ void broadcast_transaction_LDKBroadcasterInterface_jcall(const void* this_arg, L int8_tArray tx_arr = init_int8_tArray(tx_var.datalen, __LINE__); memcpy(tx_arr->elems, tx_var.data, tx_var.datalen); Transaction_free(tx_var); - js_invoke_function_1(j_calls->instance_ptr, 19, (uint32_t)tx_arr); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 19, (uint32_t)tx_arr, 0, 0, 0, 0, 0); } static void LDKBroadcasterInterface_JCalls_cloned(LDKBroadcasterInterface* new_obj) { LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) new_obj->this_arg; @@ -5212,7 +5495,7 @@ static void LDKKeysInterface_JCalls_free(void* this_arg) { LDKCResult_SecretKeyNoneZ get_node_secret_LDKKeysInterface_jcall(const void* this_arg, LDKRecipient recipient) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; uint32_t recipient_conv = LDKRecipient_to_js(recipient); - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 20, (uint32_t)recipient_conv); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 20, (uint32_t)recipient_conv, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SecretKeyNoneZ ret_conv = *(LDKCResult_SecretKeyNoneZ*)(ret_ptr); @@ -5221,7 +5504,7 @@ LDKCResult_SecretKeyNoneZ get_node_secret_LDKKeysInterface_jcall(const void* thi } LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 21); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 21, 0, 0, 0, 0, 0, 0); LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -5230,7 +5513,7 @@ LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg) } LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* this_arg) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - uint32_t ret = js_invoke_function_0(j_calls->instance_ptr, 22); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 22, 0, 0, 0, 0, 0, 0); LDKShutdownScript ret_conv; ret_conv.inner = (void*)(ret & (~1)); ret_conv.is_owned = (ret & 1) || (ret == 0); @@ -5241,7 +5524,7 @@ LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inb LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; jboolean inbound_conv = inbound; int64_t channel_value_satoshis_conv = channel_value_satoshis; - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 23, (uint32_t)inbound_conv, (uint32_t)channel_value_satoshis_conv); + uint32_t ret = js_invoke_function_ubuuuu(j_calls->instance_ptr, 23, (uint32_t)inbound_conv, (uint32_t)channel_value_satoshis_conv, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKSign ret_conv = *(LDKSign*)(ret_ptr); @@ -5250,7 +5533,7 @@ LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inb } LDKThirtyTwoBytes get_secure_random_bytes_LDKKeysInterface_jcall(const void* this_arg) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 24); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 24, 0, 0, 0, 0, 0, 0); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); memcpy(ret_ref.data, ret->elems, 32); FREE(ret); @@ -5261,7 +5544,7 @@ LDKCResult_SignDecodeErrorZ read_chan_signer_LDKKeysInterface_jcall(const void* LDKu8slice reader_var = reader; int8_tArray reader_arr = init_int8_tArray(reader_var.datalen, __LINE__); memcpy(reader_arr->elems, reader_var.data, reader_var.datalen); - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 25, (uint32_t)reader_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 25, (uint32_t)reader_arr, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignDecodeErrorZ ret_conv = *(LDKCResult_SignDecodeErrorZ*)(ret_ptr); @@ -5276,7 +5559,7 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v LDKCVec_u5Z invoice_data_var = invoice_data; ptrArray invoice_data_arr = NULL; invoice_data_arr = init_ptrArray(invoice_data_var.datalen, __LINE__); - int8_t *invoice_data_arr_ptr = (int8_t*)(((uint8_t*)invoice_data_arr) + 4); + int8_t *invoice_data_arr_ptr = (int8_t*)(((uint8_t*)invoice_data_arr) + 8); for (size_t h = 0; h < invoice_data_var.datalen; h++) { uint8_t invoice_data_conv_7_val = invoice_data_var.data[h]._0; invoice_data_arr_ptr[h] = invoice_data_conv_7_val; @@ -5284,7 +5567,7 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v FREE(invoice_data_var.data); uint32_t receipient_conv = LDKRecipient_to_js(receipient); - uint32_t ret = js_invoke_function_3(j_calls->instance_ptr, 26, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, (uint32_t)receipient_conv); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 26, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, (uint32_t)receipient_conv, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_RecoverableSignatureNoneZ ret_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(ret_ptr); @@ -5293,7 +5576,7 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v } LDKThirtyTwoBytes get_inbound_payment_key_material_LDKKeysInterface_jcall(const void* this_arg) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 27); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 27, 0, 0, 0, 0, 0, 0); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); memcpy(ret_ref.data, ret->elems, 32); FREE(ret); @@ -5388,9 +5671,10 @@ uint32_t __attribute__((export_name("TS_KeysInterface_read_chan_signer"))) TS_K LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKu8slice reader_ref; reader_ref.datalen = reader->arr_len; - reader_ref.data = reader->elems /* XXX reader leaks */; + reader_ref.data = reader->elems; LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = (this_arg_conv->read_chan_signer)(this_arg_conv->this_arg, reader_ref); + FREE(reader); return (uint32_t)ret_conv; } @@ -5400,22 +5684,24 @@ uint32_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysI LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKu8slice hrp_bytes_ref; hrp_bytes_ref.datalen = hrp_bytes->arr_len; - hrp_bytes_ref.data = hrp_bytes->elems /* XXX hrp_bytes leaks */; + hrp_bytes_ref.data = hrp_bytes->elems; LDKCVec_u5Z invoice_data_constr; invoice_data_constr.datalen = invoice_data->arr_len; if (invoice_data_constr.datalen > 0) invoice_data_constr.data = MALLOC(invoice_data_constr.datalen * sizeof(LDKu5), "LDKCVec_u5Z Elements"); else invoice_data_constr.data = NULL; - int8_t* invoice_data_vals = (void*) invoice_data->elems /* XXX invoice_data leaks */; + int8_t* invoice_data_vals = (void*) invoice_data->elems; for (size_t h = 0; h < invoice_data_constr.datalen; h++) { int8_t invoice_data_conv_7 = invoice_data_vals[h]; invoice_data_constr.data[h] = (LDKu5){ ._0 = invoice_data_conv_7 }; } + FREE(invoice_data); LDKRecipient receipient_conv = LDKRecipient_from_js(receipient); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = (this_arg_conv->sign_invoice)(this_arg_conv->this_arg, hrp_bytes_ref, invoice_data_constr, receipient_conv); + FREE(hrp_bytes); return (uint32_t)ret_conv; } @@ -5441,7 +5727,7 @@ static void LDKFeeEstimator_JCalls_free(void* this_arg) { uint32_t get_est_sat_per_1000_weight_LDKFeeEstimator_jcall(const void* this_arg, LDKConfirmationTarget confirmation_target) { LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg; uint32_t confirmation_target_conv = LDKConfirmationTarget_to_js(confirmation_target); - return js_invoke_function_1(j_calls->instance_ptr, 28, (uint32_t)confirmation_target_conv); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 28, (uint32_t)confirmation_target_conv, 0, 0, 0, 0, 0); } static void LDKFeeEstimator_JCalls_cloned(LDKFeeEstimator* new_obj) { LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) new_obj->this_arg; @@ -5609,17 +5895,17 @@ static void LDKType_JCalls_free(void* this_arg) { } uint16_t type_id_LDKType_jcall(const void* this_arg) { LDKType_JCalls *j_calls = (LDKType_JCalls*) this_arg; - return js_invoke_function_0(j_calls->instance_ptr, 29); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 29, 0, 0, 0, 0, 0, 0); } LDKStr debug_str_LDKType_jcall(const void* this_arg) { LDKType_JCalls *j_calls = (LDKType_JCalls*) this_arg; - jstring ret = (jstring)js_invoke_function_0(j_calls->instance_ptr, 30); + jstring ret = (jstring)js_invoke_function_uuuuuu(j_calls->instance_ptr, 30, 0, 0, 0, 0, 0, 0); LDKStr ret_conv = str_ref_to_owned_c(ret); return ret_conv; } LDKCVec_u8Z write_LDKType_jcall(const void* this_arg) { LDKType_JCalls *j_calls = (LDKType_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 31); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 31, 0, 0, 0, 0, 0, 0); LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -6359,7 +6645,7 @@ uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32Script LDKCVec_C2Tuple_u32ScriptZZ ret_var = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_b(owner_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t v = 0; v < ret_var.datalen; v++) { LDKC2Tuple_u32ScriptZ* ret_conv_21_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv_21_conv = ret_var.data[v]; @@ -6428,7 +6714,7 @@ uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZ LDKCVec_C2Tuple_u32TxOutZZ ret_var = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_b(owner_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t u = 0; u < ret_var.datalen; u++) { LDKC2Tuple_u32TxOutZ* ret_conv_20_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv_20_conv = ret_var.data[u]; @@ -8014,7 +8300,7 @@ void register_tx_LDKFilter_jcall(const void* this_arg, const uint8_t (* txid)[32 LDKu8slice script_pubkey_var = script_pubkey; int8_tArray script_pubkey_arr = init_int8_tArray(script_pubkey_var.datalen, __LINE__); memcpy(script_pubkey_arr->elems, script_pubkey_var.data, script_pubkey_var.datalen); - js_invoke_function_2(j_calls->instance_ptr, 32, (uint32_t)txid_arr, (uint32_t)script_pubkey_arr); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 32, (uint32_t)txid_arr, (uint32_t)script_pubkey_arr, 0, 0, 0, 0); } LDKCOption_C2Tuple_usizeTransactionZZ register_output_LDKFilter_jcall(const void* this_arg, LDKWatchedOutput output) { LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; @@ -8027,7 +8313,7 @@ LDKCOption_C2Tuple_usizeTransactionZZ register_output_LDKFilter_jcall(const void if (output_var.is_owned) { output_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 33, (uint32_t)output_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 33, (uint32_t)output_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCOption_C2Tuple_usizeTransactionZZ ret_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(ret_ptr); @@ -8066,8 +8352,9 @@ void __attribute__((export_name("TS_Filter_register_tx"))) TS_Filter_register_t unsigned char (*txid_ref)[32] = &txid_arr; LDKu8slice script_pubkey_ref; script_pubkey_ref.datalen = script_pubkey->arr_len; - script_pubkey_ref.data = script_pubkey->elems /* XXX script_pubkey leaks */; + script_pubkey_ref.data = script_pubkey->elems; (this_arg_conv->register_tx)(this_arg_conv->this_arg, txid_ref, script_pubkey_ref); + FREE(script_pubkey); } uint32_t __attribute__((export_name("TS_Filter_register_output"))) TS_Filter_register_output(uint32_t this_arg, uint32_t output) { @@ -8148,14 +8435,14 @@ static void LDKMessageSendEventsProvider_JCalls_free(void* this_arg) { } LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsProvider_jcall(const void* this_arg) { LDKMessageSendEventsProvider_JCalls *j_calls = (LDKMessageSendEventsProvider_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 34); + uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 34, 0, 0, 0, 0, 0, 0); LDKCVec_MessageSendEventZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems /* XXX ret leaks */; + uint32_t* ret_vals = ret->elems; for (size_t s = 0; s < ret_constr.datalen; s++) { uint32_t ret_conv_18 = ret_vals[s]; void* ret_conv_18_ptr = (void*)(((uintptr_t)ret_conv_18) & ~1); @@ -8164,6 +8451,7 @@ LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsP FREE((void*)ret_conv_18); ret_constr.data[s] = ret_conv_18_conv; } + FREE(ret); return ret_constr; } static void LDKMessageSendEventsProvider_JCalls_cloned(LDKMessageSendEventsProvider* new_obj) { @@ -8194,7 +8482,7 @@ uint32_tArray __attribute__((export_name("TS_MessageSendEventsProvider_get_and_ LDKCVec_MessageSendEventZ ret_var = (this_arg_conv->get_and_clear_pending_msg_events)(this_arg_conv->this_arg); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t s = 0; s < ret_var.datalen; s++) { LDKMessageSendEvent *ret_conv_18_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_conv_18_copy = ret_var.data[s]; @@ -8220,7 +8508,7 @@ void handle_event_LDKEventHandler_jcall(const void* this_arg, const LDKEvent * e LDKEventHandler_JCalls *j_calls = (LDKEventHandler_JCalls*) this_arg; LDKEvent *ret_event = MALLOC(sizeof(LDKEvent), "LDKEvent ret conversion"); *ret_event = Event_clone(event); - js_invoke_function_1(j_calls->instance_ptr, 35, (uint32_t)(uint32_t)ret_event); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 35, (uint32_t)(uint32_t)ret_event, 0, 0, 0, 0, 0); } static void LDKEventHandler_JCalls_cloned(LDKEventHandler* new_obj) { LDKEventHandler_JCalls *j_calls = (LDKEventHandler_JCalls*) new_obj->this_arg; @@ -8265,7 +8553,7 @@ void process_pending_events_LDKEventsProvider_jcall(const void* this_arg, LDKEve LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) this_arg; LDKEventHandler* handler_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *handler_ret = handler; - js_invoke_function_1(j_calls->instance_ptr, 36, (uint32_t)(uint32_t)handler_ret); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 36, (uint32_t)(uint32_t)handler_ret, 0, 0, 0, 0, 0); } static void LDKEventsProvider_JCalls_cloned(LDKEventsProvider* new_obj) { LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) new_obj->this_arg; @@ -8344,14 +8632,14 @@ uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t shor if (usage_var.is_owned) { usage_ref |= 1; } - return js_invoke_function_4(j_calls->instance_ptr, 37, (uint32_t)short_channel_id_conv, (uint32_t)source_ref, (uint32_t)target_ref, (uint32_t)usage_ref); + return js_invoke_function_buuuuu(j_calls->instance_ptr, 37, (uint32_t)short_channel_id_conv, (uint32_t)source_ref, (uint32_t)target_ref, (uint32_t)usage_ref, 0, 0); } void payment_path_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path, uint64_t short_channel_id) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; uint32_tArray path_arr = NULL; path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; uint32_t path_conv_10_ref = 0; @@ -8367,14 +8655,59 @@ void payment_path_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path, FREE(path_var.data); int64_t short_channel_id_conv = short_channel_id; - js_invoke_function_2(j_calls->instance_ptr, 38, (uint32_t)path_arr, (uint32_t)short_channel_id_conv); + js_invoke_function_ubuuuu(j_calls->instance_ptr, 38, (uint32_t)path_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); } void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCVec_RouteHopZ path_var = path; uint32_tArray path_arr = NULL; path_arr = init_uint32_tArray(path_var.datalen, __LINE__); - uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + for (size_t k = 0; k < path_var.datalen; k++) { + LDKRouteHop path_conv_10_var = path_var.data[k]; + uint32_t path_conv_10_ref = 0; + CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; + if (path_conv_10_var.is_owned) { + path_conv_10_ref |= 1; + } + path_arr_ptr[k] = path_conv_10_ref; + } + + FREE(path_var.data); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 39, (uint32_t)path_arr, 0, 0, 0, 0, 0); +} +void probe_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path, uint64_t short_channel_id) { + LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; + LDKCVec_RouteHopZ path_var = path; + uint32_tArray path_arr = NULL; + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); + for (size_t k = 0; k < path_var.datalen; k++) { + LDKRouteHop path_conv_10_var = path_var.data[k]; + uint32_t path_conv_10_ref = 0; + CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var); + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; + if (path_conv_10_var.is_owned) { + path_conv_10_ref |= 1; + } + path_arr_ptr[k] = path_conv_10_ref; + } + + FREE(path_var.data); + int64_t short_channel_id_conv = short_channel_id; + js_invoke_function_ubuuuu(j_calls->instance_ptr, 40, (uint32_t)path_arr, (uint32_t)short_channel_id_conv, 0, 0, 0, 0); +} +void probe_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path) { + LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; + LDKCVec_RouteHopZ path_var = path; + uint32_tArray path_arr = NULL; + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); + uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 8); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; uint32_t path_conv_10_ref = 0; @@ -8389,11 +8722,11 @@ void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ pa } FREE(path_var.data); - js_invoke_function_1(j_calls->instance_ptr, 39, (uint32_t)path_arr); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 41, (uint32_t)path_arr, 0, 0, 0, 0, 0); } LDKCVec_u8Z write_LDKScore_jcall(const void* this_arg) { LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 40); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 42, 0, 0, 0, 0, 0, 0); LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -8414,6 +8747,8 @@ static inline LDKScore LDKScore_init (JSValue o) { .channel_penalty_msat = channel_penalty_msat_LDKScore_jcall, .payment_path_failed = payment_path_failed_LDKScore_jcall, .payment_path_successful = payment_path_successful_LDKScore_jcall, + .probe_failed = probe_failed_LDKScore_jcall, + .probe_successful = probe_successful_LDKScore_jcall, .write = write_LDKScore_jcall, .free = LDKScore_JCalls_free, }; @@ -8455,7 +8790,7 @@ void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_paym path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems /* XXX path leaks */; + uint32_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -8465,6 +8800,7 @@ void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_paym path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } + FREE(path); (this_arg_conv->payment_path_failed)(this_arg_conv->this_arg, path_constr, short_channel_id); } @@ -8478,7 +8814,7 @@ void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_ path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems /* XXX path leaks */; + uint32_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -8488,9 +8824,58 @@ void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_ path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } + FREE(path); (this_arg_conv->payment_path_successful)(this_arg_conv->this_arg, path_constr); } +void __attribute__((export_name("TS_Score_probe_failed"))) TS_Score_probe_failed(uint32_t this_arg, uint32_tArray path, int64_t short_channel_id) { + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); + if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } + LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; + LDKCVec_RouteHopZ path_constr; + path_constr.datalen = path->arr_len; + if (path_constr.datalen > 0) + path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); + else + path_constr.data = NULL; + uint32_t* path_vals = path->elems; + for (size_t k = 0; k < path_constr.datalen; k++) { + uint32_t path_conv_10 = path_vals[k]; + LDKRouteHop path_conv_10_conv; + path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); + path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); + path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); + path_constr.data[k] = path_conv_10_conv; + } + FREE(path); + (this_arg_conv->probe_failed)(this_arg_conv->this_arg, path_constr, short_channel_id); +} + +void __attribute__((export_name("TS_Score_probe_successful"))) TS_Score_probe_successful(uint32_t this_arg, uint32_tArray path) { + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); + if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } + LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr; + LDKCVec_RouteHopZ path_constr; + path_constr.datalen = path->arr_len; + if (path_constr.datalen > 0) + path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); + else + path_constr.data = NULL; + uint32_t* path_vals = path->elems; + for (size_t k = 0; k < path_constr.datalen; k++) { + uint32_t path_conv_10 = path_vals[k]; + LDKRouteHop path_conv_10_conv; + path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); + path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); + path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); + path_constr.data[k] = path_conv_10_conv; + } + FREE(path); + (this_arg_conv->probe_successful)(this_arg_conv->this_arg, path_constr); +} + int8_tArray __attribute__((export_name("TS_Score_write"))) TS_Score_write(uint32_t this_arg) { void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } @@ -8524,7 +8909,7 @@ LDKCResult_NoneErrorZ persist_manager_LDKPersister_jcall(const void* this_arg, c if (channel_manager_var.is_owned) { channel_manager_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 41, (uint32_t)channel_manager_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 43, (uint32_t)channel_manager_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); @@ -8543,7 +8928,7 @@ LDKCResult_NoneErrorZ persist_graph_LDKPersister_jcall(const void* this_arg, con if (network_graph_var.is_owned) { network_graph_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 42, (uint32_t)network_graph_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 44, (uint32_t)network_graph_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); @@ -8562,7 +8947,7 @@ LDKCResult_NoneErrorZ persist_scorer_LDKPersister_jcall(const void* this_arg, co if (scorer_var.is_owned) { scorer_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 43, (uint32_t)scorer_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 45, (uint32_t)scorer_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr); @@ -8648,7 +9033,7 @@ void filtered_block_connected_LDKListen_jcall(const void* this_arg, const uint8_ LDKCVec_C2Tuple_usizeTransactionZZ txdata_var = txdata; uint32_tArray txdata_arr = NULL; txdata_arr = init_uint32_tArray(txdata_var.datalen, __LINE__); - uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 4); + uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 8); for (size_t c = 0; c < txdata_var.datalen; c++) { LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *txdata_conv_28_conv = txdata_var.data[c]; @@ -8657,7 +9042,7 @@ void filtered_block_connected_LDKListen_jcall(const void* this_arg, const uint8_ FREE(txdata_var.data); int32_t height_conv = height; - js_invoke_function_3(j_calls->instance_ptr, 44, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 46, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv, 0, 0, 0); } void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uint32_t height) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg; @@ -8665,14 +9050,14 @@ void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uin int8_tArray block_arr = init_int8_tArray(block_var.datalen, __LINE__); memcpy(block_arr->elems, block_var.data, block_var.datalen); int32_t height_conv = height; - js_invoke_function_2(j_calls->instance_ptr, 45, (uint32_t)block_arr, (uint32_t)height_conv); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 47, (uint32_t)block_arr, (uint32_t)height_conv, 0, 0, 0, 0); } void block_disconnected_LDKListen_jcall(const void* this_arg, const uint8_t (* header)[80], uint32_t height) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg; int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); int32_t height_conv = height; - js_invoke_function_2(j_calls->instance_ptr, 46, (uint32_t)header_arr, (uint32_t)height_conv); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 48, (uint32_t)header_arr, (uint32_t)height_conv, 0, 0, 0, 0); } static void LDKListen_JCalls_cloned(LDKListen* new_obj) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) new_obj->this_arg; @@ -8711,7 +9096,7 @@ void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_List txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements"); else txdata_constr.data = NULL; - uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */; + uint32_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { uint32_t txdata_conv_28 = txdata_vals[c]; void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); @@ -8720,6 +9105,7 @@ void __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_List txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1)); txdata_constr.data[c] = txdata_conv_28_conv; } + FREE(txdata); (this_arg_conv->filtered_block_connected)(this_arg_conv->this_arg, header_ref, txdata_constr, height); } @@ -8729,8 +9115,9 @@ void __attribute__((export_name("TS_Listen_block_connected"))) TS_Listen_block_ LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; LDKu8slice block_ref; block_ref.datalen = block->arr_len; - block_ref.data = block->elems /* XXX block leaks */; + block_ref.data = block->elems; (this_arg_conv->block_connected)(this_arg_conv->this_arg, block_ref, height); + FREE(block); } void __attribute__((export_name("TS_Listen_block_disconnected"))) TS_Listen_block_disconnected(uint32_t this_arg, int8_tArray header, int32_t height) { @@ -8761,7 +9148,7 @@ void transactions_confirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t LDKCVec_C2Tuple_usizeTransactionZZ txdata_var = txdata; uint32_tArray txdata_arr = NULL; txdata_arr = init_uint32_tArray(txdata_var.datalen, __LINE__); - uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 4); + uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 8); for (size_t c = 0; c < txdata_var.datalen; c++) { LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *txdata_conv_28_conv = txdata_var.data[c]; @@ -8770,31 +9157,31 @@ void transactions_confirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t FREE(txdata_var.data); int32_t height_conv = height; - js_invoke_function_3(j_calls->instance_ptr, 47, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 49, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv, 0, 0, 0); } void transaction_unconfirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t (* txid)[32]) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; int8_tArray txid_arr = init_int8_tArray(32, __LINE__); memcpy(txid_arr->elems, *txid, 32); - js_invoke_function_1(j_calls->instance_ptr, 48, (uint32_t)txid_arr); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 50, (uint32_t)txid_arr, 0, 0, 0, 0, 0); } void best_block_updated_LDKConfirm_jcall(const void* this_arg, const uint8_t (* header)[80], uint32_t height) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); int32_t height_conv = height; - js_invoke_function_2(j_calls->instance_ptr, 49, (uint32_t)header_arr, (uint32_t)height_conv); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 51, (uint32_t)header_arr, (uint32_t)height_conv, 0, 0, 0, 0); } LDKCVec_TxidZ get_relevant_txids_LDKConfirm_jcall(const void* this_arg) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; - ptrArray ret = (ptrArray)js_invoke_function_0(j_calls->instance_ptr, 50); + ptrArray ret = (ptrArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 52, 0, 0, 0, 0, 0, 0); LDKCVec_TxidZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_TxidZ Elements"); else ret_constr.data = NULL; - int8_tArray* ret_vals = (void*) ret->elems /* XXX ret leaks */; + int8_tArray* ret_vals = (void*) ret->elems; for (size_t m = 0; m < ret_constr.datalen; m++) { int8_tArray ret_conv_12 = ret_vals[m]; LDKThirtyTwoBytes ret_conv_12_ref; @@ -8802,6 +9189,7 @@ LDKCVec_TxidZ get_relevant_txids_LDKConfirm_jcall(const void* this_arg) { memcpy(ret_conv_12_ref.data, ret_conv_12->elems, 32); FREE(ret_conv_12); ret_constr.data[m] = ret_conv_12_ref; } + FREE(ret); return ret_constr; } static void LDKConfirm_JCalls_cloned(LDKConfirm* new_obj) { @@ -8842,7 +9230,7 @@ void __attribute__((export_name("TS_Confirm_transactions_confirmed"))) TS_Confi txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements"); else txdata_constr.data = NULL; - uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */; + uint32_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { uint32_t txdata_conv_28 = txdata_vals[c]; void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); @@ -8851,6 +9239,7 @@ void __attribute__((export_name("TS_Confirm_transactions_confirmed"))) TS_Confi txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1)); txdata_constr.data[c] = txdata_conv_28_conv; } + FREE(txdata); (this_arg_conv->transactions_confirmed)(this_arg_conv->this_arg, header_ref, txdata_constr, height); } @@ -8883,7 +9272,7 @@ ptrArray __attribute__((export_name("TS_Confirm_get_relevant_txids"))) TS_Confi LDKCVec_TxidZ ret_var = (this_arg_conv->get_relevant_txids)(this_arg_conv->this_arg); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { int8_tArray ret_conv_12_arr = init_int8_tArray(32, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].data, 32); @@ -8934,7 +9323,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con if (update_id_var.is_owned) { update_id_ref |= 1; } - uint32_t ret = js_invoke_function_3(j_calls->instance_ptr, 51, (uint32_t)channel_id_ref, (uint32_t)data_ref, (uint32_t)update_id_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 53, (uint32_t)channel_id_ref, (uint32_t)data_ref, (uint32_t)update_id_ref, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); @@ -8983,7 +9372,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal if (update_id_var.is_owned) { update_id_ref |= 1; } - uint32_t ret = js_invoke_function_4(j_calls->instance_ptr, 52, (uint32_t)channel_id_ref, (uint32_t)update_ref, (uint32_t)data_ref, (uint32_t)update_id_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 54, (uint32_t)channel_id_ref, (uint32_t)update_ref, (uint32_t)data_ref, (uint32_t)update_id_ref, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); @@ -9096,7 +9485,7 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_3(j_calls->instance_ptr, 53, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); } void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKAcceptChannel * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9121,7 +9510,7 @@ void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg, if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_3(j_calls->instance_ptr, 54, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); } void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingCreated * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9137,7 +9526,7 @@ void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg, if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9153,7 +9542,7 @@ void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg, if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_channel_ready_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReady * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9169,7 +9558,7 @@ void handle_channel_ready_LDKChannelMessageHandler_jcall(const void* this_arg, L if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInitFeatures * their_features, const LDKShutdown * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9195,7 +9584,7 @@ void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPub if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_3(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref, 0, 0, 0); } void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKClosingSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9211,7 +9600,7 @@ void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg, if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateAddHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9227,7 +9616,7 @@ void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFulfillHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9243,7 +9632,7 @@ void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_ if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9259,7 +9648,7 @@ void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailMalformedHTLC * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9275,7 +9664,7 @@ void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 65, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKCommitmentSigned * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9291,7 +9680,7 @@ void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_ar if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 66, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKRevokeAndACK * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9307,7 +9696,7 @@ void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg, if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 65, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 67, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFee * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9323,7 +9712,7 @@ void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKP if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 66, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 68, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKAnnouncementSignatures * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9339,14 +9728,14 @@ void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* t if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 67, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 69, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void peer_disconnected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, bool no_connection_possible) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); jboolean no_connection_possible_conv = no_connection_possible; - js_invoke_function_2(j_calls->instance_ptr, 68, (uint32_t)their_node_id_arr, (uint32_t)no_connection_possible_conv); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, (uint32_t)no_connection_possible_conv, 0, 0, 0, 0); } void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9362,7 +9751,7 @@ void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPubl if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 69, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReestablish * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9378,7 +9767,7 @@ void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_ if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelUpdate * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9394,7 +9783,7 @@ void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg, if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 73, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKErrorMessage * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; @@ -9410,7 +9799,7 @@ void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublic if (msg_var.is_owned) { msg_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 74, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); } static void LDKChannelMessageHandler_JCalls_cloned(LDKChannelMessageHandler* new_obj) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) new_obj->this_arg; @@ -9768,7 +10157,7 @@ LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 73, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 75, (uint32_t)msg_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); @@ -9787,7 +10176,7 @@ LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHand if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 74, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 76, (uint32_t)msg_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); @@ -9806,7 +10195,7 @@ LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jc if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 75, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 77, (uint32_t)msg_ref, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); @@ -9817,14 +10206,14 @@ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; int64_t starting_point_conv = starting_point; int8_t batch_amount_conv = batch_amount; - uint32_tArray ret = (uint32_tArray)js_invoke_function_2(j_calls->instance_ptr, 76, (uint32_t)starting_point_conv, (uint32_t)batch_amount_conv); + uint32_tArray ret = (uint32_tArray)js_invoke_function_buuuuu(j_calls->instance_ptr, 78, (uint32_t)starting_point_conv, (uint32_t)batch_amount_conv, 0, 0, 0, 0); LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems /* XXX ret leaks */; + uint32_t* ret_vals = ret->elems; for (size_t h = 0; h < ret_constr.datalen; h++) { uint32_t ret_conv_59 = ret_vals[h]; void* ret_conv_59_ptr = (void*)(((uintptr_t)ret_conv_59) & ~1); @@ -9833,6 +10222,7 @@ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel FREE((void*)ret_conv_59); ret_constr.data[h] = ret_conv_59_conv; } + FREE(ret); return ret_constr; } LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey starting_point, uint8_t batch_amount) { @@ -9840,14 +10230,14 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j int8_tArray starting_point_arr = init_int8_tArray(33, __LINE__); memcpy(starting_point_arr->elems, starting_point.compressed_form, 33); int8_t batch_amount_conv = batch_amount; - uint32_tArray ret = (uint32_tArray)js_invoke_function_2(j_calls->instance_ptr, 77, (uint32_t)starting_point_arr, (uint32_t)batch_amount_conv); + uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 79, (uint32_t)starting_point_arr, (uint32_t)batch_amount_conv, 0, 0, 0, 0); LDKCVec_NodeAnnouncementZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems /* XXX ret leaks */; + uint32_t* ret_vals = ret->elems; for (size_t s = 0; s < ret_constr.datalen; s++) { uint32_t ret_conv_18 = ret_vals[s]; LDKNodeAnnouncement ret_conv_18_conv; @@ -9856,6 +10246,7 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_conv); ret_constr.data[s] = ret_conv_18_conv; } + FREE(ret); return ret_constr; } void peer_connected_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * init) { @@ -9872,7 +10263,7 @@ void peer_connected_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPubl if (init_var.is_owned) { init_ref |= 1; } - js_invoke_function_2(j_calls->instance_ptr, 78, (uint32_t)their_node_id_arr, (uint32_t)init_ref); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 80, (uint32_t)their_node_id_arr, (uint32_t)init_ref, 0, 0, 0, 0); } LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyChannelRange msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; @@ -9887,7 +10278,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandl if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 79, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 81, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); @@ -9907,7 +10298,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 80, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 82, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); @@ -9927,7 +10318,7 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 81, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 83, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); @@ -9947,7 +10338,7 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageH if (msg_var.is_owned) { msg_ref |= 1; } - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 82, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 84, (uint32_t)their_node_id_arr, (uint32_t)msg_ref, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); @@ -10033,7 +10424,7 @@ uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_cha LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret_var = (this_arg_conv->get_next_channel_announcements)(this_arg_conv->this_arg, starting_point, batch_amount); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t h = 0; h < ret_var.datalen; h++) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv_59_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv_59_conv = ret_var.data[h]; @@ -10054,7 +10445,7 @@ uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_nod LDKCVec_NodeAnnouncementZ ret_var = (this_arg_conv->get_next_node_announcements)(this_arg_conv->this_arg, starting_point_ref, batch_amount); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t s = 0; s < ret_var.datalen; s++) { LDKNodeAnnouncement ret_conv_18_var = ret_var.data[s]; uint32_t ret_conv_18_ref = 0; @@ -10170,7 +10561,7 @@ LDKCResult_COption_TypeZDecodeErrorZ read_LDKCustomMessageReader_jcall(const voi LDKu8slice buffer_var = buffer; int8_tArray buffer_arr = init_int8_tArray(buffer_var.datalen, __LINE__); memcpy(buffer_arr->elems, buffer_var.data, buffer_var.datalen); - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 83, (uint32_t)message_type_conv, (uint32_t)buffer_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 85, (uint32_t)message_type_conv, (uint32_t)buffer_arr, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_COption_TypeZDecodeErrorZ ret_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(ret_ptr); @@ -10204,9 +10595,10 @@ uint32_t __attribute__((export_name("TS_CustomMessageReader_read"))) TS_CustomM LDKCustomMessageReader* this_arg_conv = (LDKCustomMessageReader*)this_arg_ptr; LDKu8slice buffer_ref; buffer_ref.datalen = buffer->arr_len; - buffer_ref.data = buffer->elems /* XXX buffer leaks */; + buffer_ref.data = buffer->elems; LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = (this_arg_conv->read)(this_arg_conv->this_arg, message_type, buffer_ref); + FREE(buffer); return (uint32_t)ret_conv; } @@ -10227,7 +10619,7 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca *msg_ret = msg; int8_tArray sender_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(sender_node_id_arr->elems, sender_node_id.compressed_form, 33); - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 84, (uint32_t)(uint32_t)msg_ret, (uint32_t)sender_node_id_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 86, (uint32_t)(uint32_t)msg_ret, (uint32_t)sender_node_id_arr, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); @@ -10236,14 +10628,14 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca } LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandler_jcall(const void* this_arg) { LDKCustomMessageHandler_JCalls *j_calls = (LDKCustomMessageHandler_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 85); + uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 87, 0, 0, 0, 0, 0, 0); LDKCVec_C2Tuple_PublicKeyTypeZZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems /* XXX ret leaks */; + uint32_t* ret_vals = ret->elems; for (size_t z = 0; z < ret_constr.datalen; z++) { uint32_t ret_conv_25 = ret_vals[z]; void* ret_conv_25_ptr = (void*)(((uintptr_t)ret_conv_25) & ~1); @@ -10252,6 +10644,7 @@ LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandle FREE((void*)ret_conv_25); ret_constr.data[z] = ret_conv_25_conv; } + FREE(ret); return ret_constr; } static void LDKCustomMessageHandler_JCalls_cloned(LDKCustomMessageHandler* new_obj) { @@ -10305,7 +10698,7 @@ uint32_tArray __attribute__((export_name("TS_CustomMessageHandler_get_and_clear LDKCVec_C2Tuple_PublicKeyTypeZZ ret_var = (this_arg_conv->get_and_clear_pending_msg)(this_arg_conv->this_arg); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t z = 0; z < ret_var.datalen; z++) { LDKC2Tuple_PublicKeyTypeZ* ret_conv_25_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv_25_conv = ret_var.data[z]; @@ -10332,21 +10725,21 @@ uintptr_t send_data_LDKSocketDescriptor_jcall(void* this_arg, LDKu8slice data, b int8_tArray data_arr = init_int8_tArray(data_var.datalen, __LINE__); memcpy(data_arr->elems, data_var.data, data_var.datalen); jboolean resume_read_conv = resume_read; - return js_invoke_function_2(j_calls->instance_ptr, 86, (uint32_t)data_arr, (uint32_t)resume_read_conv); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 88, (uint32_t)data_arr, (uint32_t)resume_read_conv, 0, 0, 0, 0); } void disconnect_socket_LDKSocketDescriptor_jcall(void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; - js_invoke_function_0(j_calls->instance_ptr, 87); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 89, 0, 0, 0, 0, 0, 0); } bool eq_LDKSocketDescriptor_jcall(const void* this_arg, const LDKSocketDescriptor * other_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; LDKSocketDescriptor *other_arg_clone = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *other_arg_clone = SocketDescriptor_clone(other_arg); - return js_invoke_function_1(j_calls->instance_ptr, 88, (uint32_t)(uint32_t)other_arg_clone); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 90, (uint32_t)(uint32_t)other_arg_clone, 0, 0, 0, 0, 0); } uint64_t hash_LDKSocketDescriptor_jcall(const void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; - return js_invoke_function_0(j_calls->instance_ptr, 89); + return js_invoke_function_uuuuuu(j_calls->instance_ptr, 91, 0, 0, 0, 0, 0, 0); } static void LDKSocketDescriptor_JCalls_cloned(LDKSocketDescriptor* new_obj) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) new_obj->this_arg; @@ -10379,8 +10772,9 @@ uint32_t __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_Socke LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; - data_ref.data = data->elems /* XXX data leaks */; + data_ref.data = data->elems; uint32_t ret_conv = (this_arg_conv->send_data)(this_arg_conv->this_arg, data_ref, resume_read); + FREE(data); return ret_conv; } @@ -10428,6 +10822,12 @@ int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_capacity_m int64_t capacity_msat_conv = obj->total.capacity_msat; return capacity_msat_conv; } +uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat"))) TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat(uint32_t ptr) { + LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1); + assert(obj->tag == LDKEffectiveCapacity_Total); + uint32_t htlc_maximum_msat_ref = ((uintptr_t)&obj->total.htlc_maximum_msat) | 1; + return htlc_maximum_msat_ref; +} typedef struct LDKLockableScore_JCalls { atomic_size_t refcnt; uint32_t instance_ptr; @@ -10440,7 +10840,7 @@ static void LDKLockableScore_JCalls_free(void* this_arg) { } LDKScore lock_LDKLockableScore_jcall(const void* this_arg) { LDKLockableScore_JCalls *j_calls = (LDKLockableScore_JCalls*) this_arg; - uint32_t ret = js_invoke_function_0(j_calls->instance_ptr, 90); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 92, 0, 0, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKScore ret_conv = *(LDKScore*)(ret_ptr); @@ -10530,7 +10930,7 @@ static void LDKPayer_JCalls_free(void* this_arg) { } LDKPublicKey node_id_LDKPayer_jcall(const void* this_arg) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; - int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 91); + int8_tArray ret = (int8_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 93, 0, 0, 0, 0, 0, 0); LDKPublicKey ret_ref; CHECK(ret->arr_len == 33); memcpy(ret_ref.compressed_form, ret->elems, 33); FREE(ret); @@ -10538,14 +10938,14 @@ LDKPublicKey node_id_LDKPayer_jcall(const void* this_arg) { } LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; - uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 92); + uint32_tArray ret = (uint32_tArray)js_invoke_function_uuuuuu(j_calls->instance_ptr, 94, 0, 0, 0, 0, 0, 0); LDKCVec_ChannelDetailsZ ret_constr; ret_constr.datalen = ret->arr_len; if (ret_constr.datalen > 0) ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems /* XXX ret leaks */; + uint32_t* ret_vals = ret->elems; for (size_t q = 0; q < ret_constr.datalen; q++) { uint32_t ret_conv_16 = ret_vals[q]; LDKChannelDetails ret_conv_16_conv; @@ -10554,6 +10954,7 @@ LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) { CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_conv); ret_constr.data[q] = ret_conv_16_conv; } + FREE(ret); return ret_constr; } LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_hash, LDKThirtyTwoBytes payment_secret) { @@ -10572,7 +10973,7 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void* memcpy(payment_hash_arr->elems, payment_hash.data, 32); int8_tArray payment_secret_arr = init_int8_tArray(32, __LINE__); memcpy(payment_secret_arr->elems, payment_secret.data, 32); - uint32_t ret = js_invoke_function_3(j_calls->instance_ptr, 93, (uint32_t)route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 95, (uint32_t)route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr); @@ -10593,7 +10994,7 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_spontaneous_payment_LDKPayer_jcall( } int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__); memcpy(payment_preimage_arr->elems, payment_preimage.data, 32); - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 94, (uint32_t)route_ref, (uint32_t)payment_preimage_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 96, (uint32_t)route_ref, (uint32_t)payment_preimage_arr, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr); @@ -10614,7 +11015,7 @@ LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this } int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, payment_id.data, 32); - uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 95, (uint32_t)route_ref, (uint32_t)payment_id_arr); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 97, (uint32_t)route_ref, (uint32_t)payment_id_arr, 0, 0, 0, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NonePaymentSendFailureZ ret_conv = *(LDKCResult_NonePaymentSendFailureZ*)(ret_ptr); @@ -10625,7 +11026,7 @@ void abandon_payment_LDKPayer_jcall(const void* this_arg, LDKThirtyTwoBytes paym LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg; int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, payment_id.data, 32); - js_invoke_function_1(j_calls->instance_ptr, 96, (uint32_t)payment_id_arr); + js_invoke_function_uuuuuu(j_calls->instance_ptr, 98, (uint32_t)payment_id_arr, 0, 0, 0, 0, 0); } static void LDKPayer_JCalls_cloned(LDKPayer* new_obj) { LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) new_obj->this_arg; @@ -10669,7 +11070,7 @@ uint32_tArray __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_firs LDKCVec_ChannelDetailsZ ret_var = (this_arg_conv->first_hops)(this_arg_conv->this_arg); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; uint32_t ret_conv_16_ref = 0; @@ -10779,7 +11180,7 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg, if (first_hops != NULL) { LDKCVec_ChannelDetailsZ first_hops_var = *first_hops_var_ptr; first_hops_arr = init_uint32_tArray(first_hops_var.datalen, __LINE__); - uint32_t *first_hops_arr_ptr = (uint32_t*)(((uint8_t*)first_hops_arr) + 4); + uint32_t *first_hops_arr_ptr = (uint32_t*)(((uint8_t*)first_hops_arr) + 8); for (size_t q = 0; q < first_hops_var.datalen; q++) { LDKChannelDetails first_hops_conv_16_var = first_hops_var.data[q]; uint32_t first_hops_conv_16_ref = 0; @@ -10796,7 +11197,7 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg, } // WARNING: This object doesn't live past this scope, needs clone! uint32_t ret_scorer = ((uintptr_t)scorer) | 1; - uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 97, (uint32_t)payer_arr, (uint32_t)route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, (uint32_t)ret_scorer); + uint32_t ret = js_invoke_function_uuuuuu(j_calls->instance_ptr, 99, (uint32_t)payer_arr, (uint32_t)route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, (uint32_t)ret_scorer, 0); void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_RouteLightningErrorZ ret_conv = *(LDKCResult_RouteLightningErrorZ*)(ret_ptr); @@ -10847,7 +11248,7 @@ uint32_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_ro first_hops_constr.data = MALLOC(first_hops_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else first_hops_constr.data = NULL; - uint32_t* first_hops_vals = first_hops->elems /* XXX first_hops leaks */; + uint32_t* first_hops_vals = first_hops->elems; for (size_t q = 0; q < first_hops_constr.datalen; q++) { uint32_t first_hops_conv_16 = first_hops_vals[q]; LDKChannelDetails first_hops_conv_16_conv; @@ -10856,6 +11257,7 @@ uint32_t __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_ro CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv); first_hops_constr.data[q] = first_hops_conv_16_conv; } + FREE(first_hops); first_hops_ptr = &first_hops_constr; } void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1); @@ -11563,7 +11965,7 @@ void __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else _res_constr.data = NULL; - int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; + int8_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKSignature _res_conv_12_ref; @@ -11571,6 +11973,7 @@ void __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ memcpy(_res_conv_12_ref.compact_form, _res_conv_12->elems, 64); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } + FREE(_res); CVec_SignatureZ_free(_res_constr); } @@ -11810,7 +12213,7 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_ o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else o_constr.data = NULL; - int8_tArray* o_vals = (void*) o->elems /* XXX o leaks */; + int8_tArray* o_vals = (void*) o->elems; for (size_t m = 0; m < o_constr.datalen; m++) { int8_tArray o_conv_12 = o_vals[m]; LDKSignature o_conv_12_ref; @@ -11818,6 +12221,7 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_ memcpy(o_conv_12_ref.compact_form, o_conv_12->elems, 64); FREE(o_conv_12); o_constr.data[m] = o_conv_12_ref; } + FREE(o); LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_ok(o_constr); return (uint32_t)ret_conv; @@ -12034,7 +12438,7 @@ void __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_f _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { uint32_t _res_conv_10 = _res_vals[k]; LDKRouteHop _res_conv_10_conv; @@ -12043,6 +12447,7 @@ void __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_f CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv); _res_constr.data[k] = _res_conv_10_conv; } + FREE(_res); CVec_RouteHopZ_free(_res_constr); } @@ -12053,7 +12458,7 @@ void __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_ _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCVec_RouteHopZ), "LDKCVec_CVec_RouteHopZZ Elements"); else _res_constr.data = NULL; - uint32_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; + uint32_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { uint32_tArray _res_conv_12 = _res_vals[m]; LDKCVec_RouteHopZ _res_conv_12_constr; @@ -12062,7 +12467,7 @@ void __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_ _res_conv_12_constr.data = MALLOC(_res_conv_12_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else _res_conv_12_constr.data = NULL; - uint32_t* _res_conv_12_vals = _res_conv_12->elems /* XXX _res_conv_12 leaks */; + uint32_t* _res_conv_12_vals = _res_conv_12->elems; for (size_t k = 0; k < _res_conv_12_constr.datalen; k++) { uint32_t _res_conv_12_conv_10 = _res_conv_12_vals[k]; LDKRouteHop _res_conv_12_conv_10_conv; @@ -12071,8 +12476,10 @@ void __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_ CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_12_conv_10_conv); _res_conv_12_constr.data[k] = _res_conv_12_conv_10_conv; } + FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_constr; } + FREE(_res); CVec_CVec_RouteHopZZ_free(_res_constr); } @@ -12193,7 +12600,7 @@ void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t l = 0; l < _res_constr.datalen; l++) { uint32_t _res_conv_11 = _res_vals[l]; LDKRouteHint _res_conv_11_conv; @@ -12202,6 +12609,7 @@ void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_11_conv); _res_constr.data[l] = _res_conv_11_conv; } + FREE(_res); CVec_RouteHintZ_free(_res_constr); } @@ -12248,6 +12656,22 @@ uint32_t __attribute__((export_name("TS_COption_u64Z_clone"))) TS_COption_u64Z_ return ret_ref; } +void __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_tArray _res) { + LDKCVec_u64Z _res_constr; + _res_constr.datalen = _res->arr_len; + if (_res_constr.datalen > 0) + _res_constr.data = MALLOC(_res_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); + else + _res_constr.data = NULL; + int64_t* _res_vals = _res->elems; + for (size_t i = 0; i < _res_constr.datalen; i++) { + int64_t _res_conv_8 = _res_vals[i]; + _res_constr.data[i] = _res_conv_8; + } + FREE(_res); + CVec_u64Z_free(_res_constr); +} + uint32_t __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_ok(uint32_t o) { LDKPaymentParameters o_conv; o_conv.inner = (void*)(o & (~1)); @@ -12310,7 +12734,7 @@ void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHi _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { uint32_t _res_conv_14 = _res_vals[o]; LDKRouteHintHop _res_conv_14_conv; @@ -12319,6 +12743,7 @@ void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHi CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv); _res_constr.data[o] = _res_conv_14_conv; } + FREE(_res); CVec_RouteHintHopZ_free(_res_constr); } @@ -12439,7 +12864,7 @@ void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_Chann _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { uint32_t _res_conv_16 = _res_vals[q]; LDKChannelDetails _res_conv_16_conv; @@ -12448,6 +12873,7 @@ void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_Chann CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } + FREE(_res); CVec_ChannelDetailsZ_free(_res_constr); } @@ -12513,7 +12939,7 @@ void __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPublicKey), "LDKCVec_PublicKeyZ Elements"); else _res_constr.data = NULL; - int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; + int8_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKPublicKey _res_conv_12_ref; @@ -12521,6 +12947,7 @@ void __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ memcpy(_res_conv_12_ref.compressed_form, _res_conv_12->elems, 33); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } + FREE(_res); CVec_PublicKeyZ_free(_res_constr); } @@ -12679,6 +13106,107 @@ uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr return (uint32_t)ret_conv; } +uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_some"))) TS_COption_HTLCDestinationZ_some(uint32_t o) { + void* o_ptr = (void*)(((uintptr_t)o) & ~1); + CHECK_ACCESS(o_ptr); + LDKHTLCDestination o_conv = *(LDKHTLCDestination*)(o_ptr); + o_conv = HTLCDestination_clone((LDKHTLCDestination*)(((uintptr_t)o) & ~1)); + LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); + *ret_copy = COption_HTLCDestinationZ_some(o_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_none"))) TS_COption_HTLCDestinationZ_none() { + LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); + *ret_copy = COption_HTLCDestinationZ_none(); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +void __attribute__((export_name("TS_COption_HTLCDestinationZ_free"))) TS_COption_HTLCDestinationZ_free(uint32_t _res) { + if ((_res & 1) != 0) return; + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); + CHECK_ACCESS(_res_ptr); + LDKCOption_HTLCDestinationZ _res_conv = *(LDKCOption_HTLCDestinationZ*)(_res_ptr); + FREE((void*)_res); + COption_HTLCDestinationZ_free(_res_conv); +} + +static inline uintptr_t COption_HTLCDestinationZ_clone_ptr(LDKCOption_HTLCDestinationZ *NONNULL_PTR arg) { + LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); + *ret_copy = COption_HTLCDestinationZ_clone(arg); +uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} +uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone_ptr"))) TS_COption_HTLCDestinationZ_clone_ptr(uint32_t arg) { + LDKCOption_HTLCDestinationZ* arg_conv = (LDKCOption_HTLCDestinationZ*)arg; + uint32_t ret_conv = COption_HTLCDestinationZ_clone_ptr(arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_COption_HTLCDestinationZ_clone"))) TS_COption_HTLCDestinationZ_clone(uint32_t orig) { + LDKCOption_HTLCDestinationZ* orig_conv = (LDKCOption_HTLCDestinationZ*)orig; + LDKCOption_HTLCDestinationZ *ret_copy = MALLOC(sizeof(LDKCOption_HTLCDestinationZ), "LDKCOption_HTLCDestinationZ"); + *ret_copy = COption_HTLCDestinationZ_clone(orig_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_ok(uint32_t o) { + void* o_ptr = (void*)(((uintptr_t)o) & ~1); + CHECK_ACCESS(o_ptr); + LDKCOption_HTLCDestinationZ o_conv = *(LDKCOption_HTLCDestinationZ*)(o_ptr); + o_conv = COption_HTLCDestinationZ_clone((LDKCOption_HTLCDestinationZ*)(((uintptr_t)o) & ~1)); + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); + *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_ok(o_conv); + return (uint32_t)ret_conv; +} + +uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_err(uint32_t e) { + LDKDecodeError e_conv; + e_conv.inner = (void*)(e & (~1)); + e_conv.is_owned = (e & 1) || (e == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); + e_conv = DecodeError_clone(&e_conv); + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); + *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_err(e_conv); + return (uint32_t)ret_conv; +} + +jboolean __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(uint32_t o) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* o_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(o & ~1); + jboolean ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_is_ok(o_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_free(uint32_t _res) { + if ((_res & 1) != 0) return; + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); + CHECK_ACCESS(_res_ptr); + LDKCResult_COption_HTLCDestinationZDecodeErrorZ _res_conv = *(LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(_res_ptr); + FREE((void*)_res); + CResult_COption_HTLCDestinationZDecodeErrorZ_free(_res_conv); +} + +static inline uintptr_t CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(LDKCResult_COption_HTLCDestinationZDecodeErrorZ *NONNULL_PTR arg) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); + *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone(arg); + return (uint32_t)ret_conv; +} +uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(uint32_t arg) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* arg_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(arg & ~1); + uint32_t ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone_ptr(arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone"))) TS_CResult_COption_HTLCDestinationZDecodeErrorZ_clone(uint32_t orig) { + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* orig_conv = (LDKCResult_COption_HTLCDestinationZDecodeErrorZ*)(orig & ~1); + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); + *ret_conv = CResult_COption_HTLCDestinationZDecodeErrorZ_clone(orig_conv); + return (uint32_t)ret_conv; +} + uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COption_NetworkUpdateZ_some(uint32_t o) { void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); @@ -12733,7 +13261,7 @@ void __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t b = 0; b < _res_constr.datalen; b++) { uint32_t _res_conv_27 = _res_vals[b]; void* _res_conv_27_ptr = (void*)(((uintptr_t)_res_conv_27) & ~1); @@ -12742,6 +13270,7 @@ void __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS FREE((void*)_res_conv_27); _res_constr.data[b] = _res_conv_27_conv; } + FREE(_res); CVec_SpendableOutputDescriptorZ_free(_res_constr); } @@ -12853,7 +13382,7 @@ void __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_Mes _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t s = 0; s < _res_constr.datalen; s++) { uint32_t _res_conv_18 = _res_vals[s]; void* _res_conv_18_ptr = (void*)(((uintptr_t)_res_conv_18) & ~1); @@ -12862,6 +13391,7 @@ void __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_Mes FREE((void*)_res_conv_18); _res_constr.data[s] = _res_conv_18_conv; } + FREE(_res); CVec_MessageSendEventZ_free(_res_constr); } @@ -12960,7 +13490,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t c = 0; c < _res_constr.datalen; c++) { uint32_t _res_conv_28 = _res_vals[c]; void* _res_conv_28_ptr = (void*)(((uintptr_t)_res_conv_28) & ~1); @@ -12969,6 +13499,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS FREE((void*)_res_conv_28); _res_constr.data[c] = _res_conv_28_conv; } + FREE(_res); CVec_C2Tuple_usizeTransactionZZ_free(_res_constr); } @@ -12979,7 +13510,7 @@ void __attribute__((export_name("TS_CVec_TxidZ_free"))) TS_CVec_TxidZ_free(ptrA _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_TxidZ Elements"); else _res_constr.data = NULL; - int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; + int8_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKThirtyTwoBytes _res_conv_12_ref; @@ -12987,6 +13518,7 @@ void __attribute__((export_name("TS_CVec_TxidZ_free"))) TS_CVec_TxidZ_free(ptrA memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } + FREE(_res); CVec_TxidZ_free(_res_constr); } @@ -13043,7 +13575,7 @@ void __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_Monitor _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { uint32_t _res_conv_14 = _res_vals[o]; void* _res_conv_14_ptr = (void*)(((uintptr_t)_res_conv_14) & ~1); @@ -13052,28 +13584,29 @@ void __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_Monitor FREE((void*)_res_conv_14); _res_constr.data[o] = _res_conv_14_conv; } + FREE(_res); CVec_MonitorEventZ_free(_res_constr); } -static inline uintptr_t C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr(LDKC2Tuple_OutPointCVec_MonitorEventZZ *NONNULL_PTR arg) { - LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ"); - *ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_clone(arg); +static inline uintptr_t C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ *NONNULL_PTR arg) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); + *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(arg); return ((uint32_t)ret_conv); } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr(uint32_t arg) { - LDKC2Tuple_OutPointCVec_MonitorEventZZ* arg_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(arg & ~1); - uint32_t ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr(arg_conv); +uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(uint32_t arg) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* arg_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(arg & ~1); + uint32_t ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone_ptr(arg_conv); return ret_conv; } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone(uint32_t orig) { - LDKC2Tuple_OutPointCVec_MonitorEventZZ* orig_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(orig & ~1); - LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ"); - *ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_clone(orig_conv); +uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(uint32_t orig) { + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* orig_conv = (LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(orig & ~1); + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); + *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_clone(orig_conv); return ((uint32_t)ret_conv); } -uint32_t __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_new"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_new(uint32_t a, uint32_tArray b) { +uint32_t __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(uint32_t a, uint32_tArray b, int8_tArray c) { LDKOutPoint a_conv; a_conv.inner = (void*)(a & (~1)); a_conv.is_owned = (a & 1) || (a == 0); @@ -13085,7 +13618,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_new b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems /* XXX b leaks */; + uint32_t* b_vals = b->elems; for (size_t o = 0; o < b_constr.datalen; o++) { uint32_t b_conv_14 = b_vals[o]; void* b_conv_14_ptr = (void*)(((uintptr_t)b_conv_14) & ~1); @@ -13094,37 +13627,42 @@ uint32_t __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_new b_conv_14_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)b_conv_14) & ~1)); b_constr.data[o] = b_conv_14_conv; } - LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ"); - *ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_new(a_conv, b_constr); + FREE(b); + LDKPublicKey c_ref; + CHECK(c->arr_len == 33); + memcpy(c_ref.compressed_form, c->elems, 33); FREE(c); + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ"); + *ret_conv = C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_new(a_conv, b_constr, c_ref); return ((uint32_t)ret_conv); } -void __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_free"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_free(uint32_t _res) { +void __attribute__((export_name("TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free"))) TS_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(uint32_t _res) { if ((_res & 1) != 0) return; void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); - LDKC2Tuple_OutPointCVec_MonitorEventZZ _res_conv = *(LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(_res_ptr); + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ _res_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(_res_ptr); FREE((void*)_res); - C2Tuple_OutPointCVec_MonitorEventZZ_free(_res_conv); + C3Tuple_OutPointCVec_MonitorEventZPublicKeyZ_free(_res_conv); } -void __attribute__((export_name("TS_CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_free"))) TS_CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_free(uint32_tArray _res) { - LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ _res_constr; +void __attribute__((export_name("TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free"))) TS_CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(uint32_tArray _res) { + LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ _res_constr; _res_constr.datalen = _res->arr_len; if (_res_constr.datalen > 0) - _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ Elements"); + _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ), "LDKCVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; - for (size_t m = 0; m < _res_constr.datalen; m++) { - uint32_t _res_conv_38 = _res_vals[m]; - void* _res_conv_38_ptr = (void*)(((uintptr_t)_res_conv_38) & ~1); - CHECK_ACCESS(_res_conv_38_ptr); - LDKC2Tuple_OutPointCVec_MonitorEventZZ _res_conv_38_conv = *(LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(_res_conv_38_ptr); - FREE((void*)_res_conv_38); - _res_constr.data[m] = _res_conv_38_conv; + uint32_t* _res_vals = _res->elems; + for (size_t x = 0; x < _res_constr.datalen; x++) { + uint32_t _res_conv_49 = _res_vals[x]; + void* _res_conv_49_ptr = (void*)(((uintptr_t)_res_conv_49) & ~1); + CHECK_ACCESS(_res_conv_49_ptr); + LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ _res_conv_49_conv = *(LDKC3Tuple_OutPointCVec_MonitorEventZPublicKeyZ*)(_res_conv_49_ptr); + FREE((void*)_res_conv_49); + _res_constr.data[x] = _res_conv_49_conv; } - CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_free(_res_constr); + FREE(_res); + CVec_C3Tuple_OutPointCVec_MonitorEventZPublicKeyZZ_free(_res_constr); } uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint32_t o) { @@ -13229,6 +13767,106 @@ uint32_t __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_ return (uint32_t)ret_conv; } +static inline uintptr_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg) { + LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); + *ret_conv = C2Tuple_u64u64Z_clone(arg); + return ((uint32_t)ret_conv); +} +uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone_ptr"))) TS_C2Tuple_u64u64Z_clone_ptr(uint32_t arg) { + LDKC2Tuple_u64u64Z* arg_conv = (LDKC2Tuple_u64u64Z*)(arg & ~1); + uint32_t ret_conv = C2Tuple_u64u64Z_clone_ptr(arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_clone"))) TS_C2Tuple_u64u64Z_clone(uint32_t orig) { + LDKC2Tuple_u64u64Z* orig_conv = (LDKC2Tuple_u64u64Z*)(orig & ~1); + LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); + *ret_conv = C2Tuple_u64u64Z_clone(orig_conv); + return ((uint32_t)ret_conv); +} + +uint32_t __attribute__((export_name("TS_C2Tuple_u64u64Z_new"))) TS_C2Tuple_u64u64Z_new(int64_t a, int64_t b) { + LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z"); + *ret_conv = C2Tuple_u64u64Z_new(a, b); + return ((uint32_t)ret_conv); +} + +void __attribute__((export_name("TS_C2Tuple_u64u64Z_free"))) TS_C2Tuple_u64u64Z_free(uint32_t _res) { + if ((_res & 1) != 0) return; + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); + CHECK_ACCESS(_res_ptr); + LDKC2Tuple_u64u64Z _res_conv = *(LDKC2Tuple_u64u64Z*)(_res_ptr); + FREE((void*)_res); + C2Tuple_u64u64Z_free(_res_conv); +} + +uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_some"))) TS_COption_C2Tuple_u64u64ZZ_some(uint32_t o) { + void* o_ptr = (void*)(((uintptr_t)o) & ~1); + CHECK_ACCESS(o_ptr); + LDKC2Tuple_u64u64Z o_conv = *(LDKC2Tuple_u64u64Z*)(o_ptr); + o_conv = C2Tuple_u64u64Z_clone((LDKC2Tuple_u64u64Z*)(((uintptr_t)o) & ~1)); + LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); + *ret_copy = COption_C2Tuple_u64u64ZZ_some(o_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_none"))) TS_COption_C2Tuple_u64u64ZZ_none() { + LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); + *ret_copy = COption_C2Tuple_u64u64ZZ_none(); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +void __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_free"))) TS_COption_C2Tuple_u64u64ZZ_free(uint32_t _res) { + if ((_res & 1) != 0) return; + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); + CHECK_ACCESS(_res_ptr); + LDKCOption_C2Tuple_u64u64ZZ _res_conv = *(LDKCOption_C2Tuple_u64u64ZZ*)(_res_ptr); + FREE((void*)_res); + COption_C2Tuple_u64u64ZZ_free(_res_conv); +} + +static inline uintptr_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg) { + LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); + *ret_copy = COption_C2Tuple_u64u64ZZ_clone(arg); +uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} +uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone_ptr"))) TS_COption_C2Tuple_u64u64ZZ_clone_ptr(uint32_t arg) { + LDKCOption_C2Tuple_u64u64ZZ* arg_conv = (LDKCOption_C2Tuple_u64u64ZZ*)arg; + uint32_t ret_conv = COption_C2Tuple_u64u64ZZ_clone_ptr(arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone"))) TS_COption_C2Tuple_u64u64ZZ_clone(uint32_t orig) { + LDKCOption_C2Tuple_u64u64ZZ* orig_conv = (LDKCOption_C2Tuple_u64u64ZZ*)orig; + LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); + *ret_copy = COption_C2Tuple_u64u64ZZ_clone(orig_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +void __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free(uint32_tArray _res) { + LDKCVec_NodeIdZ _res_constr; + _res_constr.datalen = _res->arr_len; + if (_res_constr.datalen > 0) + _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements"); + else + _res_constr.data = NULL; + uint32_t* _res_vals = _res->elems; + for (size_t i = 0; i < _res_constr.datalen; i++) { + uint32_t _res_conv_8 = _res_vals[i]; + LDKNodeId _res_conv_8_conv; + _res_conv_8_conv.inner = (void*)(_res_conv_8 & (~1)); + _res_conv_8_conv.is_owned = (_res_conv_8 & 1) || (_res_conv_8 == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_8_conv); + _res_constr.data[i] = _res_conv_8_conv; + } + FREE(_res); + CVec_NodeIdZ_free(_res_constr); +} + uint32_t __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_ok(uint32_t o) { LDKProbabilisticScorer o_conv; o_conv.inner = (void*)(o & (~1)); @@ -13785,7 +14423,7 @@ void __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpda _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { uint32_t _res_conv_59 = _res_vals[h]; void* _res_conv_59_ptr = (void*)(((uintptr_t)_res_conv_59) & ~1); @@ -13794,6 +14432,7 @@ void __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpda FREE((void*)_res_conv_59); _res_constr.data[h] = _res_conv_59_conv; } + FREE(_res); CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(_res_constr); } @@ -13804,7 +14443,7 @@ void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_Nod _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t s = 0; s < _res_constr.datalen; s++) { uint32_t _res_conv_18 = _res_vals[s]; LDKNodeAnnouncement _res_conv_18_conv; @@ -13813,6 +14452,7 @@ void __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_Nod CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_18_conv); _res_constr.data[s] = _res_conv_18_conv; } + FREE(_res); CVec_NodeAnnouncementZ_free(_res_constr); } @@ -14038,7 +14678,7 @@ void __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddres _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { uint32_t _res_conv_12 = _res_vals[m]; void* _res_conv_12_ptr = (void*)(((uintptr_t)_res_conv_12) & ~1); @@ -14047,6 +14687,7 @@ void __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddres FREE((void*)_res_conv_12); _res_constr.data[m] = _res_conv_12_conv; } + FREE(_res); CVec_NetAddressZ_free(_res_constr); } @@ -14105,19 +14746,59 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError return (uint32_t)ret_conv; } -void __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_tArray _res) { - LDKCVec_u64Z _res_constr; - _res_constr.datalen = _res->arr_len; - if (_res_constr.datalen > 0) - _res_constr.data = MALLOC(_res_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); - else - _res_constr.data = NULL; - int64_t* _res_vals = _res->elems /* XXX _res leaks */; - for (size_t i = 0; i < _res_constr.datalen; i++) { - int64_t _res_conv_8 = _res_vals[i]; - _res_constr.data[i] = _res_conv_8; - } - CVec_u64Z_free(_res_constr); +uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_ok"))) TS_CResult_NodeAliasDecodeErrorZ_ok(uint32_t o) { + LDKNodeAlias o_conv; + o_conv.inner = (void*)(o & (~1)); + o_conv.is_owned = (o & 1) || (o == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv); + o_conv = NodeAlias_clone(&o_conv); + LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); + *ret_conv = CResult_NodeAliasDecodeErrorZ_ok(o_conv); + return (uint32_t)ret_conv; +} + +uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_err"))) TS_CResult_NodeAliasDecodeErrorZ_err(uint32_t e) { + LDKDecodeError e_conv; + e_conv.inner = (void*)(e & (~1)); + e_conv.is_owned = (e & 1) || (e == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv); + e_conv = DecodeError_clone(&e_conv); + LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); + *ret_conv = CResult_NodeAliasDecodeErrorZ_err(e_conv); + return (uint32_t)ret_conv; +} + +jboolean __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_is_ok"))) TS_CResult_NodeAliasDecodeErrorZ_is_ok(uint32_t o) { + LDKCResult_NodeAliasDecodeErrorZ* o_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(o & ~1); + jboolean ret_conv = CResult_NodeAliasDecodeErrorZ_is_ok(o_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_free"))) TS_CResult_NodeAliasDecodeErrorZ_free(uint32_t _res) { + if ((_res & 1) != 0) return; + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); + CHECK_ACCESS(_res_ptr); + LDKCResult_NodeAliasDecodeErrorZ _res_conv = *(LDKCResult_NodeAliasDecodeErrorZ*)(_res_ptr); + FREE((void*)_res); + CResult_NodeAliasDecodeErrorZ_free(_res_conv); +} + +static inline uintptr_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg) { + LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); + *ret_conv = CResult_NodeAliasDecodeErrorZ_clone(arg); + return (uint32_t)ret_conv; +} +uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAliasDecodeErrorZ_clone_ptr(uint32_t arg) { + LDKCResult_NodeAliasDecodeErrorZ* arg_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(arg & ~1); + uint32_t ret_conv = CResult_NodeAliasDecodeErrorZ_clone_ptr(arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone"))) TS_CResult_NodeAliasDecodeErrorZ_clone(uint32_t orig) { + LDKCResult_NodeAliasDecodeErrorZ* orig_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(orig & ~1); + LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); + *ret_conv = CResult_NodeAliasDecodeErrorZ_clone(orig_conv); + return (uint32_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint32_t o) { @@ -14219,7 +14900,7 @@ uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_C o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else o_constr.data = NULL; - uint32_t* o_vals = o->elems /* XXX o leaks */; + uint32_t* o_vals = o->elems; for (size_t m = 0; m < o_constr.datalen; m++) { uint32_t o_conv_12 = o_vals[m]; void* o_conv_12_ptr = (void*)(((uintptr_t)o_conv_12) & ~1); @@ -14228,6 +14909,7 @@ uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_C o_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o_conv_12) & ~1)); o_constr.data[m] = o_conv_12_conv; } + FREE(o); LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_some(o_constr); uint32_t ret_ref = (uintptr_t)ret_copy; @@ -14441,7 +15123,7 @@ void __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_Paym _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_PaymentPreimageZ Elements"); else _res_constr.data = NULL; - int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; + int8_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKThirtyTwoBytes _res_conv_12_ref; @@ -14449,6 +15131,7 @@ void __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_Paym memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } + FREE(_res); CVec_PaymentPreimageZ_free(_res_constr); } @@ -14480,7 +15163,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new") b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else b_constr.data = NULL; - int8_tArray* b_vals = (void*) b->elems /* XXX b leaks */; + int8_tArray* b_vals = (void*) b->elems; for (size_t m = 0; m < b_constr.datalen; m++) { int8_tArray b_conv_12 = b_vals[m]; LDKSignature b_conv_12_ref; @@ -14488,6 +15171,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new") memcpy(b_conv_12_ref.compact_form, b_conv_12->elems, 64); FREE(b_conv_12); b_constr.data[m] = b_conv_12_ref; } + FREE(b); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_constr); return ((uint32_t)ret_conv); @@ -14799,12 +15483,13 @@ void __attribute__((export_name("TS_CVec_u5Z_free"))) TS_CVec_u5Z_free(ptrArray _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKu5), "LDKCVec_u5Z Elements"); else _res_constr.data = NULL; - int8_t* _res_vals = (void*) _res->elems /* XXX _res leaks */; + int8_t* _res_vals = (void*) _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { int8_t _res_conv_7 = _res_vals[h]; _res_constr.data[h] = (LDKu5){ ._0 = _res_conv_7 }; } + FREE(_res); CVec_u5Z_free(_res_constr); } @@ -14871,7 +15556,7 @@ void __attribute__((export_name("TS_CVec_CVec_u8ZZ_free"))) TS_CVec_CVec_u8ZZ_f _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCVec_u8Z), "LDKCVec_CVec_u8ZZ Elements"); else _res_constr.data = NULL; - int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; + int8_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKCVec_u8Z _res_conv_12_ref; @@ -14880,6 +15565,7 @@ void __attribute__((export_name("TS_CVec_CVec_u8ZZ_free"))) TS_CVec_CVec_u8ZZ_f memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } + FREE(_res); CVec_CVec_u8ZZ_free(_res_constr); } @@ -14890,7 +15576,7 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_C o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKCVec_u8Z), "LDKCVec_CVec_u8ZZ Elements"); else o_constr.data = NULL; - int8_tArray* o_vals = (void*) o->elems /* XXX o leaks */; + int8_tArray* o_vals = (void*) o->elems; for (size_t m = 0; m < o_constr.datalen; m++) { int8_tArray o_conv_12 = o_vals[m]; LDKCVec_u8Z o_conv_12_ref; @@ -14899,6 +15585,7 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_C memcpy(o_conv_12_ref.data, o_conv_12->elems, o_conv_12_ref.datalen); FREE(o_conv_12); o_constr.data[m] = o_conv_12_ref; } + FREE(o); LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = CResult_CVec_CVec_u8ZZNoneZ_ok(o_constr); return (uint32_t)ret_conv; @@ -15005,7 +15692,7 @@ void __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(ui _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { uint32_t _res_conv_7 = _res_vals[h]; void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); @@ -15014,6 +15701,7 @@ void __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(ui FREE((void*)_res_conv_7); _res_constr.data[h] = _res_conv_7_conv; } + FREE(_res); CVec_TxOutZ_free(_res_constr); } @@ -15166,7 +15854,7 @@ void __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVe _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCResult_NoneAPIErrorZ), "LDKCVec_CResult_NoneAPIErrorZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t w = 0; w < _res_constr.datalen; w++) { uint32_t _res_conv_22 = _res_vals[w]; void* _res_conv_22_ptr = (void*)(((uintptr_t)_res_conv_22) & ~1); @@ -15175,6 +15863,7 @@ void __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVe FREE((void*)_res_conv_22); _res_constr.data[w] = _res_conv_22_conv; } + FREE(_res); CVec_CResult_NoneAPIErrorZZ_free(_res_constr); } @@ -15185,7 +15874,7 @@ void __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_f _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { uint32_t _res_conv_10 = _res_vals[k]; void* _res_conv_10_ptr = (void*)(((uintptr_t)_res_conv_10) & ~1); @@ -15194,6 +15883,7 @@ void __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_f FREE((void*)_res_conv_10); _res_constr.data[k] = _res_conv_10_conv; } + FREE(_res); CVec_APIErrorZ_free(_res_constr); } @@ -15442,6 +16132,25 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa return (uint32_t)ret_conv; } +void __attribute__((export_name("TS_CVec_ThirtyTwoBytesZ_free"))) TS_CVec_ThirtyTwoBytesZ_free(ptrArray _res) { + LDKCVec_ThirtyTwoBytesZ _res_constr; + _res_constr.datalen = _res->arr_len; + if (_res_constr.datalen > 0) + _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_ThirtyTwoBytesZ Elements"); + else + _res_constr.data = NULL; + int8_tArray* _res_vals = (void*) _res->elems; + for (size_t m = 0; m < _res_constr.datalen; m++) { + int8_tArray _res_conv_12 = _res_vals[m]; + LDKThirtyTwoBytes _res_conv_12_ref; + CHECK(_res_conv_12->arr_len == 32); + memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12); + _res_constr.data[m] = _res_conv_12_ref; + } + FREE(_res); + CVec_ThirtyTwoBytesZ_free(_res_constr); +} + static inline uintptr_t C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR arg) { LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(arg); @@ -15962,7 +16671,7 @@ void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_Chann _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelMonitor), "LDKCVec_ChannelMonitorZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { uint32_t _res_conv_16 = _res_vals[q]; LDKChannelMonitor _res_conv_16_conv; @@ -15971,6 +16680,7 @@ void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_Chann CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } + FREE(_res); CVec_ChannelMonitorZ_free(_res_constr); } @@ -16561,7 +17271,7 @@ void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_Private _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPrivateRoute), "LDKCVec_PrivateRouteZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { uint32_t _res_conv_14 = _res_vals[o]; LDKPrivateRoute _res_conv_14_conv; @@ -16570,6 +17280,7 @@ void __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_Private CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv); _res_constr.data[o] = _res_conv_14_conv; } + FREE(_res); CVec_PrivateRouteZ_free(_res_constr); } @@ -17167,7 +17878,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t v = 0; v < _res_constr.datalen; v++) { uint32_t _res_conv_21 = _res_vals[v]; void* _res_conv_21_ptr = (void*)(((uintptr_t)_res_conv_21) & ~1); @@ -17176,6 +17887,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C FREE((void*)_res_conv_21); _res_constr.data[v] = _res_conv_21_conv; } + FREE(_res); CVec_C2Tuple_u32ScriptZZ_free(_res_constr); } @@ -17207,7 +17919,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_n b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems /* XXX b leaks */; + uint32_t* b_vals = b->elems; for (size_t v = 0; v < b_constr.datalen; v++) { uint32_t b_conv_21 = b_vals[v]; void* b_conv_21_ptr = (void*)(((uintptr_t)b_conv_21) & ~1); @@ -17216,6 +17928,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_n b_conv_21_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)(((uintptr_t)b_conv_21) & ~1)); b_constr.data[v] = b_conv_21_conv; } + FREE(b); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a_ref, b_constr); return ((uint32_t)ret_conv); @@ -17237,7 +17950,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t o = 0; o < _res_constr.datalen; o++) { uint32_t _res_conv_40 = _res_vals[o]; void* _res_conv_40_ptr = (void*)(((uintptr_t)_res_conv_40) & ~1); @@ -17246,6 +17959,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ FREE((void*)_res_conv_40); _res_constr.data[o] = _res_conv_40_conv; } + FREE(_res); CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(_res_constr); } @@ -17256,7 +17970,7 @@ void __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(ui _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKEvent), "LDKCVec_EventZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t h = 0; h < _res_constr.datalen; h++) { uint32_t _res_conv_7 = _res_vals[h]; void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); @@ -17265,6 +17979,7 @@ void __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(ui FREE((void*)_res_conv_7); _res_constr.data[h] = _res_conv_7_conv; } + FREE(_res); CVec_EventZ_free(_res_constr); } @@ -17275,7 +17990,7 @@ void __attribute__((export_name("TS_CVec_TransactionZ_free"))) TS_CVec_Transact _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTransaction), "LDKCVec_TransactionZ Elements"); else _res_constr.data = NULL; - int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; + int8_tArray* _res_vals = (void*) _res->elems; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKTransaction _res_conv_12_ref; @@ -17285,6 +18000,7 @@ void __attribute__((export_name("TS_CVec_TransactionZ_free"))) TS_CVec_Transact _res_conv_12_ref.data_is_owned = true; _res_constr.data[m] = _res_conv_12_ref; } + FREE(_res); CVec_TransactionZ_free(_res_constr); } @@ -17332,7 +18048,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2 _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t u = 0; u < _res_constr.datalen; u++) { uint32_t _res_conv_20 = _res_vals[u]; void* _res_conv_20_ptr = (void*)(((uintptr_t)_res_conv_20) & ~1); @@ -17341,6 +18057,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2 FREE((void*)_res_conv_20); _res_constr.data[u] = _res_conv_20_conv; } + FREE(_res); CVec_C2Tuple_u32TxOutZZ_free(_res_constr); } @@ -17372,7 +18089,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_ne b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements"); else b_constr.data = NULL; - uint32_t* b_vals = b->elems /* XXX b leaks */; + uint32_t* b_vals = b->elems; for (size_t u = 0; u < b_constr.datalen; u++) { uint32_t b_conv_20 = b_vals[u]; void* b_conv_20_ptr = (void*)(((uintptr_t)b_conv_20) & ~1); @@ -17381,6 +18098,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_ne b_conv_20_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)(((uintptr_t)b_conv_20) & ~1)); b_constr.data[u] = b_conv_20_conv; } + FREE(b); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a_ref, b_constr); return ((uint32_t)ret_conv); @@ -17402,7 +18120,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_ _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t n = 0; n < _res_constr.datalen; n++) { uint32_t _res_conv_39 = _res_vals[n]; void* _res_conv_39_ptr = (void*)(((uintptr_t)_res_conv_39) & ~1); @@ -17411,6 +18129,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_ FREE((void*)_res_conv_39); _res_constr.data[n] = _res_conv_39_conv; } + FREE(_res); CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(_res_constr); } @@ -17421,7 +18140,7 @@ void __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_fre _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKBalance), "LDKCVec_BalanceZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t j = 0; j < _res_constr.datalen; j++) { uint32_t _res_conv_9 = _res_vals[j]; void* _res_conv_9_ptr = (void*)(((uintptr_t)_res_conv_9) & ~1); @@ -17430,6 +18149,7 @@ void __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_fre FREE((void*)_res_conv_9); _res_constr.data[j] = _res_conv_9_conv; } + FREE(_res); CVec_BalanceZ_free(_res_constr); } @@ -17578,7 +18298,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CV _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t z = 0; z < _res_constr.datalen; z++) { uint32_t _res_conv_25 = _res_vals[z]; void* _res_conv_25_ptr = (void*)(((uintptr_t)_res_conv_25) & ~1); @@ -17587,6 +18307,7 @@ void __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CV FREE((void*)_res_conv_25); _res_constr.data[z] = _res_conv_25_conv; } + FREE(_res); CVec_C2Tuple_PublicKeyTypeZZ_free(_res_constr); } @@ -17898,7 +18619,7 @@ void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_Update _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t p = 0; p < _res_constr.datalen; p++) { uint32_t _res_conv_15 = _res_vals[p]; LDKUpdateAddHTLC _res_conv_15_conv; @@ -17907,6 +18628,7 @@ void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_Update CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_15_conv); _res_constr.data[p] = _res_conv_15_conv; } + FREE(_res); CVec_UpdateAddHTLCZ_free(_res_constr); } @@ -17917,7 +18639,7 @@ void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_Up _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t t = 0; t < _res_constr.datalen; t++) { uint32_t _res_conv_19 = _res_vals[t]; LDKUpdateFulfillHTLC _res_conv_19_conv; @@ -17926,6 +18648,7 @@ void __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_Up CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_19_conv); _res_constr.data[t] = _res_conv_19_conv; } + FREE(_res); CVec_UpdateFulfillHTLCZ_free(_res_constr); } @@ -17936,7 +18659,7 @@ void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_Updat _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t q = 0; q < _res_constr.datalen; q++) { uint32_t _res_conv_16 = _res_vals[q]; LDKUpdateFailHTLC _res_conv_16_conv; @@ -17945,6 +18668,7 @@ void __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_Updat CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv); _res_constr.data[q] = _res_conv_16_conv; } + FREE(_res); CVec_UpdateFailHTLCZ_free(_res_constr); } @@ -17955,7 +18679,7 @@ void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_C _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t z = 0; z < _res_constr.datalen; z++) { uint32_t _res_conv_25 = _res_vals[z]; LDKUpdateFailMalformedHTLC _res_conv_25_conv; @@ -17964,6 +18688,7 @@ void __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_C CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_25_conv); _res_constr.data[z] = _res_conv_25_conv; } + FREE(_res); CVec_UpdateFailMalformedHTLCZ_free(_res_constr); } @@ -19905,7 +20630,7 @@ void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_f _res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKOutPoint), "LDKCVec_OutPointZ Elements"); else _res_constr.data = NULL; - uint32_t* _res_vals = _res->elems /* XXX _res leaks */; + uint32_t* _res_vals = _res->elems; for (size_t k = 0; k < _res_constr.datalen; k++) { uint32_t _res_conv_10 = _res_vals[k]; LDKOutPoint _res_conv_10_conv; @@ -19914,6 +20639,7 @@ void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_f CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv); _res_constr.data[k] = _res_conv_10_conv; } + FREE(_res); CVec_OutPointZ_free(_res_constr); } @@ -19981,9 +20707,10 @@ int8_tArray __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentP uint32_t __attribute__((export_name("TS_PaymentPurpose_read"))) TS_PaymentPurpose_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ"); *ret_conv = PaymentPurpose_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -20086,9 +20813,88 @@ int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureRe uint32_t __attribute__((export_name("TS_ClosureReason_read"))) TS_ClosureReason_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = ClosureReason_read(ser_ref); + FREE(ser); + return (uint32_t)ret_conv; +} + +void __attribute__((export_name("TS_HTLCDestination_free"))) TS_HTLCDestination_free(uint32_t this_ptr) { + if ((this_ptr & 1) != 0) return; + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); + CHECK_ACCESS(this_ptr_ptr); + LDKHTLCDestination this_ptr_conv = *(LDKHTLCDestination*)(this_ptr_ptr); + FREE((void*)this_ptr); + HTLCDestination_free(this_ptr_conv); +} + +static inline uintptr_t HTLCDestination_clone_ptr(LDKHTLCDestination *NONNULL_PTR arg) { + LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); + *ret_copy = HTLCDestination_clone(arg); +uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} +uint32_t __attribute__((export_name("TS_HTLCDestination_clone_ptr"))) TS_HTLCDestination_clone_ptr(uint32_t arg) { + LDKHTLCDestination* arg_conv = (LDKHTLCDestination*)arg; + uint32_t ret_conv = HTLCDestination_clone_ptr(arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_HTLCDestination_clone"))) TS_HTLCDestination_clone(uint32_t orig) { + LDKHTLCDestination* orig_conv = (LDKHTLCDestination*)orig; + LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); + *ret_copy = HTLCDestination_clone(orig_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +uint32_t __attribute__((export_name("TS_HTLCDestination_next_hop_channel"))) TS_HTLCDestination_next_hop_channel(int8_tArray node_id, int8_tArray channel_id) { + LDKPublicKey node_id_ref; + CHECK(node_id->arr_len == 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); + LDKThirtyTwoBytes channel_id_ref; + CHECK(channel_id->arr_len == 32); + memcpy(channel_id_ref.data, channel_id->elems, 32); FREE(channel_id); + LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); + *ret_copy = HTLCDestination_next_hop_channel(node_id_ref, channel_id_ref); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +uint32_t __attribute__((export_name("TS_HTLCDestination_unknown_next_hop"))) TS_HTLCDestination_unknown_next_hop(int64_t requested_forward_scid) { + LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); + *ret_copy = HTLCDestination_unknown_next_hop(requested_forward_scid); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +uint32_t __attribute__((export_name("TS_HTLCDestination_failed_payment"))) TS_HTLCDestination_failed_payment(int8_tArray payment_hash) { + LDKThirtyTwoBytes payment_hash_ref; + CHECK(payment_hash->arr_len == 32); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + LDKHTLCDestination *ret_copy = MALLOC(sizeof(LDKHTLCDestination), "LDKHTLCDestination"); + *ret_copy = HTLCDestination_failed_payment(payment_hash_ref); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +int8_tArray __attribute__((export_name("TS_HTLCDestination_write"))) TS_HTLCDestination_write(uint32_t obj) { + LDKHTLCDestination* obj_conv = (LDKHTLCDestination*)obj; + LDKCVec_u8Z ret_var = HTLCDestination_write(obj_conv); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); + memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); + CVec_u8Z_free(ret_var); + return ret_arr; +} + +uint32_t __attribute__((export_name("TS_HTLCDestination_read"))) TS_HTLCDestination_read(int8_tArray ser) { + LDKu8slice ser_ref; + ser_ref.datalen = ser->arr_len; + ser_ref.data = ser->elems; + LDKCResult_COption_HTLCDestinationZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_HTLCDestinationZDecodeErrorZ), "LDKCResult_COption_HTLCDestinationZDecodeErrorZ"); + *ret_conv = HTLCDestination_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -20212,7 +21018,7 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Ev path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems /* XXX path leaks */; + uint32_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -20222,6 +21028,7 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Ev path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } + FREE(path); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_path_successful(payment_id_ref, payment_hash_ref, path_constr); uint32_t ret_ref = (uintptr_t)ret_copy; @@ -20245,7 +21052,7 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_ path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else path_constr.data = NULL; - uint32_t* path_vals = path->elems /* XXX path leaks */; + uint32_t* path_vals = path->elems; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -20255,6 +21062,7 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_ path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); path_constr.data[k] = path_conv_10_conv; } + FREE(path); void* short_channel_id_ptr = (void*)(((uintptr_t)short_channel_id) & ~1); CHECK_ACCESS(short_channel_id_ptr); LDKCOption_u64Z short_channel_id_conv = *(LDKCOption_u64Z*)(short_channel_id_ptr); @@ -20270,6 +21078,70 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_ return ret_ref; } +uint32_t __attribute__((export_name("TS_Event_probe_successful"))) TS_Event_probe_successful(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path) { + LDKThirtyTwoBytes payment_id_ref; + CHECK(payment_id->arr_len == 32); + memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); + LDKThirtyTwoBytes payment_hash_ref; + CHECK(payment_hash->arr_len == 32); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + LDKCVec_RouteHopZ path_constr; + path_constr.datalen = path->arr_len; + if (path_constr.datalen > 0) + path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); + else + path_constr.data = NULL; + uint32_t* path_vals = path->elems; + for (size_t k = 0; k < path_constr.datalen; k++) { + uint32_t path_conv_10 = path_vals[k]; + LDKRouteHop path_conv_10_conv; + path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); + path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); + path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); + path_constr.data[k] = path_conv_10_conv; + } + FREE(path); + LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); + *ret_copy = Event_probe_successful(payment_id_ref, payment_hash_ref, path_constr); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +uint32_t __attribute__((export_name("TS_Event_probe_failed"))) TS_Event_probe_failed(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path, uint32_t short_channel_id) { + LDKThirtyTwoBytes payment_id_ref; + CHECK(payment_id->arr_len == 32); + memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); + LDKThirtyTwoBytes payment_hash_ref; + CHECK(payment_hash->arr_len == 32); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + LDKCVec_RouteHopZ path_constr; + path_constr.datalen = path->arr_len; + if (path_constr.datalen > 0) + path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); + else + path_constr.data = NULL; + uint32_t* path_vals = path->elems; + for (size_t k = 0; k < path_constr.datalen; k++) { + uint32_t path_conv_10 = path_vals[k]; + LDKRouteHop path_conv_10_conv; + path_conv_10_conv.inner = (void*)(path_conv_10 & (~1)); + path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv); + path_conv_10_conv = RouteHop_clone(&path_conv_10_conv); + path_constr.data[k] = path_conv_10_conv; + } + FREE(path); + void* short_channel_id_ptr = (void*)(((uintptr_t)short_channel_id) & ~1); + CHECK_ACCESS(short_channel_id_ptr); + LDKCOption_u64Z short_channel_id_conv = *(LDKCOption_u64Z*)(short_channel_id_ptr); + short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id) & ~1)); + LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); + *ret_copy = Event_probe_failed(payment_id_ref, payment_hash_ref, path_constr, short_channel_id_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + uint32_t __attribute__((export_name("TS_Event_pending_htlcs_forwardable"))) TS_Event_pending_htlcs_forwardable(int64_t time_forwardable) { LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_pending_htlcs_forwardable(time_forwardable); @@ -20284,7 +21156,7 @@ uint32_t __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_sp outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */; + uint32_t* outputs_vals = outputs->elems; for (size_t b = 0; b < outputs_constr.datalen; b++) { uint32_t outputs_conv_27 = outputs_vals[b]; void* outputs_conv_27_ptr = (void*)(((uintptr_t)outputs_conv_27) & ~1); @@ -20293,6 +21165,7 @@ uint32_t __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_sp outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)outputs_conv_27) & ~1)); outputs_constr.data[b] = outputs_conv_27_conv; } + FREE(outputs); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_spendable_outputs(outputs_constr); uint32_t ret_ref = (uintptr_t)ret_copy; @@ -20363,6 +21236,20 @@ uint32_t __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event return ret_ref; } +uint32_t __attribute__((export_name("TS_Event_htlchandling_failed"))) TS_Event_htlchandling_failed(int8_tArray prev_channel_id, uint32_t failed_next_destination) { + LDKThirtyTwoBytes prev_channel_id_ref; + CHECK(prev_channel_id->arr_len == 32); + memcpy(prev_channel_id_ref.data, prev_channel_id->elems, 32); FREE(prev_channel_id); + void* failed_next_destination_ptr = (void*)(((uintptr_t)failed_next_destination) & ~1); + CHECK_ACCESS(failed_next_destination_ptr); + LDKHTLCDestination failed_next_destination_conv = *(LDKHTLCDestination*)(failed_next_destination_ptr); + failed_next_destination_conv = HTLCDestination_clone((LDKHTLCDestination*)(((uintptr_t)failed_next_destination) & ~1)); + LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); + *ret_copy = Event_htlchandling_failed(prev_channel_id_ref, failed_next_destination_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint32_t obj) { LDKEvent* obj_conv = (LDKEvent*)obj; LDKCVec_u8Z ret_var = Event_write(obj_conv); @@ -20375,9 +21262,10 @@ int8_tArray __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint3 uint32_t __attribute__((export_name("TS_Event_read"))) TS_Event_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = Event_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -20850,61 +21738,121 @@ uint32_t __attribute__((export_name("TS_BigSize_new"))) TS_BigSize_new(int64_t return ret_ref; } +void __attribute__((export_name("TS_Hostname_free"))) TS_Hostname_free(uint32_t this_obj) { + LDKHostname this_obj_conv; + this_obj_conv.inner = (void*)(this_obj & (~1)); + this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); + Hostname_free(this_obj_conv); +} + +static inline uintptr_t Hostname_clone_ptr(LDKHostname *NONNULL_PTR arg) { + LDKHostname ret_var = Hostname_clone(arg); +uint32_t ret_ref = 0; +CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. +CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); +ret_ref = (uintptr_t)ret_var.inner; +if (ret_var.is_owned) { + ret_ref |= 1; +} + return ret_ref; +} +uint32_t __attribute__((export_name("TS_Hostname_clone_ptr"))) TS_Hostname_clone_ptr(uint32_t arg) { + LDKHostname arg_conv; + arg_conv.inner = (void*)(arg & (~1)); + arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); + uint32_t ret_conv = Hostname_clone_ptr(&arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_Hostname_clone"))) TS_Hostname_clone(uint32_t orig) { + LDKHostname orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + LDKHostname ret_var = Hostname_clone(&orig_conv); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + +int8_t __attribute__((export_name("TS_Hostname_len"))) TS_Hostname_len(uint32_t this_arg) { + LDKHostname this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + int8_t ret_conv = Hostname_len(&this_arg_conv); + return ret_conv; +} + uint32_t __attribute__((export_name("TS_sign"))) TS_sign(int8_tArray msg, int8_tArray sk) { LDKu8slice msg_ref; msg_ref.datalen = msg->arr_len; - msg_ref.data = msg->elems /* XXX msg leaks */; + msg_ref.data = msg->elems; unsigned char sk_arr[32]; CHECK(sk->arr_len == 32); memcpy(sk_arr, sk->elems, 32); FREE(sk); unsigned char (*sk_ref)[32] = &sk_arr; LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = sign(msg_ref, sk_ref); + FREE(msg); return (uint32_t)ret_conv; } uint32_t __attribute__((export_name("TS_recover_pk"))) TS_recover_pk(int8_tArray msg, jstring sig) { LDKu8slice msg_ref; msg_ref.datalen = msg->arr_len; - msg_ref.data = msg->elems /* XXX msg leaks */; + msg_ref.data = msg->elems; LDKStr sig_conv = str_ref_to_owned_c(sig); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = recover_pk(msg_ref, sig_conv); + FREE(msg); return (uint32_t)ret_conv; } jboolean __attribute__((export_name("TS_verify"))) TS_verify(int8_tArray msg, jstring sig, int8_tArray pk) { LDKu8slice msg_ref; msg_ref.datalen = msg->arr_len; - msg_ref.data = msg->elems /* XXX msg leaks */; + msg_ref.data = msg->elems; LDKStr sig_conv = str_ref_to_owned_c(sig); LDKPublicKey pk_ref; CHECK(pk->arr_len == 33); memcpy(pk_ref.compressed_form, pk->elems, 33); FREE(pk); jboolean ret_conv = verify(msg_ref, sig_conv, pk_ref); + FREE(msg); return ret_conv; } int8_tArray __attribute__((export_name("TS_construct_invoice_preimage"))) TS_construct_invoice_preimage(int8_tArray hrp_bytes, ptrArray data_without_signature) { LDKu8slice hrp_bytes_ref; hrp_bytes_ref.datalen = hrp_bytes->arr_len; - hrp_bytes_ref.data = hrp_bytes->elems /* XXX hrp_bytes leaks */; + hrp_bytes_ref.data = hrp_bytes->elems; LDKCVec_u5Z data_without_signature_constr; data_without_signature_constr.datalen = data_without_signature->arr_len; if (data_without_signature_constr.datalen > 0) data_without_signature_constr.data = MALLOC(data_without_signature_constr.datalen * sizeof(LDKu5), "LDKCVec_u5Z Elements"); else data_without_signature_constr.data = NULL; - int8_t* data_without_signature_vals = (void*) data_without_signature->elems /* XXX data_without_signature leaks */; + int8_t* data_without_signature_vals = (void*) data_without_signature->elems; for (size_t h = 0; h < data_without_signature_constr.datalen; h++) { int8_t data_without_signature_conv_7 = data_without_signature_vals[h]; data_without_signature_constr.data[h] = (LDKu5){ ._0 = data_without_signature_conv_7 }; } + FREE(data_without_signature); LDKCVec_u8Z ret_var = construct_invoice_preimage(hrp_bytes_ref, data_without_signature_constr); int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); CVec_u8Z_free(ret_var); + FREE(hrp_bytes); return ret_arr; } @@ -21214,8 +22162,42 @@ void __attribute__((export_name("TS_ChannelHandshakeConfig_set_negotiate_scid_p ChannelHandshakeConfig_set_negotiate_scid_privacy(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg, int8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, jboolean negotiate_scid_privacy_arg) { - LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg); +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_announced_channel"))) TS_ChannelHandshakeConfig_get_announced_channel(uint32_t this_ptr) { + LDKChannelHandshakeConfig this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + jboolean ret_conv = ChannelHandshakeConfig_get_announced_channel(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_announced_channel"))) TS_ChannelHandshakeConfig_set_announced_channel(uint32_t this_ptr, jboolean val) { + LDKChannelHandshakeConfig this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + ChannelHandshakeConfig_set_announced_channel(&this_ptr_conv, val); +} + +jboolean __attribute__((export_name("TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(uint32_t this_ptr) { + LDKChannelHandshakeConfig this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + jboolean ret_conv = ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(uint32_t this_ptr, jboolean val) { + LDKChannelHandshakeConfig this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(&this_ptr_conv, val); +} + +uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg, int8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, jboolean negotiate_scid_privacy_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg) { + LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -21579,40 +22561,6 @@ void __attribute__((export_name("TS_ChannelConfig_set_cltv_expiry_delta"))) TS_ ChannelConfig_set_cltv_expiry_delta(&this_ptr_conv, val); } -jboolean __attribute__((export_name("TS_ChannelConfig_get_announced_channel"))) TS_ChannelConfig_get_announced_channel(uint32_t this_ptr) { - LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; - CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - jboolean ret_conv = ChannelConfig_get_announced_channel(&this_ptr_conv); - return ret_conv; -} - -void __attribute__((export_name("TS_ChannelConfig_set_announced_channel"))) TS_ChannelConfig_set_announced_channel(uint32_t this_ptr, jboolean val) { - LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; - CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - ChannelConfig_set_announced_channel(&this_ptr_conv, val); -} - -jboolean __attribute__((export_name("TS_ChannelConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelConfig_get_commit_upfront_shutdown_pubkey(uint32_t this_ptr) { - LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; - CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - jboolean ret_conv = ChannelConfig_get_commit_upfront_shutdown_pubkey(&this_ptr_conv); - return ret_conv; -} - -void __attribute__((export_name("TS_ChannelConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelConfig_set_commit_upfront_shutdown_pubkey(uint32_t this_ptr, jboolean val) { - LDKChannelConfig this_ptr_conv; - this_ptr_conv.inner = (void*)(this_ptr & (~1)); - this_ptr_conv.is_owned = false; - CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - ChannelConfig_set_commit_upfront_shutdown_pubkey(&this_ptr_conv, val); -} - int64_t __attribute__((export_name("TS_ChannelConfig_get_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_get_max_dust_htlc_exposure_msat(uint32_t this_ptr) { LDKChannelConfig this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -21647,8 +22595,8 @@ void __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max ChannelConfig_set_force_close_avoidance_max_fee_satoshis(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) { - LDKChannelConfig ret_var = ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg); +uint32_t __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) { + LDKChannelConfig ret_var = ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -21726,9 +22674,10 @@ int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelCo uint32_t __attribute__((export_name("TS_ChannelConfig_read"))) TS_ChannelConfig_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = ChannelConfig_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -21740,12 +22689,12 @@ void __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint UserConfig_free(this_obj_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_own_channel_config"))) TS_UserConfig_get_own_channel_config(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_config"))) TS_UserConfig_get_channel_handshake_config(uint32_t this_ptr) { LDKUserConfig this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - LDKChannelHandshakeConfig ret_var = UserConfig_get_own_channel_config(&this_ptr_conv); + LDKChannelHandshakeConfig ret_var = UserConfig_get_channel_handshake_config(&this_ptr_conv); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -21757,7 +22706,7 @@ uint32_t __attribute__((export_name("TS_UserConfig_get_own_channel_config"))) T return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_own_channel_config"))) TS_UserConfig_set_own_channel_config(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_handshake_config"))) TS_UserConfig_set_channel_handshake_config(uint32_t this_ptr, uint32_t val) { LDKUserConfig this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; @@ -21767,15 +22716,15 @@ void __attribute__((export_name("TS_UserConfig_set_own_channel_config"))) TS_Us val_conv.is_owned = (val & 1) || (val == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelHandshakeConfig_clone(&val_conv); - UserConfig_set_own_channel_config(&this_ptr_conv, val_conv); + UserConfig_set_channel_handshake_config(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_peer_channel_config_limits"))) TS_UserConfig_get_peer_channel_config_limits(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_UserConfig_get_channel_handshake_limits"))) TS_UserConfig_get_channel_handshake_limits(uint32_t this_ptr) { LDKUserConfig this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - LDKChannelHandshakeLimits ret_var = UserConfig_get_peer_channel_config_limits(&this_ptr_conv); + LDKChannelHandshakeLimits ret_var = UserConfig_get_channel_handshake_limits(&this_ptr_conv); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -21787,7 +22736,7 @@ uint32_t __attribute__((export_name("TS_UserConfig_get_peer_channel_config_limi return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_peer_channel_config_limits"))) TS_UserConfig_set_peer_channel_config_limits(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_handshake_limits"))) TS_UserConfig_set_channel_handshake_limits(uint32_t this_ptr, uint32_t val) { LDKUserConfig this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; @@ -21797,15 +22746,15 @@ void __attribute__((export_name("TS_UserConfig_set_peer_channel_config_limits") val_conv.is_owned = (val & 1) || (val == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelHandshakeLimits_clone(&val_conv); - UserConfig_set_peer_channel_config_limits(&this_ptr_conv, val_conv); + UserConfig_set_channel_handshake_limits(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_UserConfig_get_channel_options"))) TS_UserConfig_get_channel_options(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_UserConfig_get_channel_config"))) TS_UserConfig_get_channel_config(uint32_t this_ptr) { LDKUserConfig this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - LDKChannelConfig ret_var = UserConfig_get_channel_options(&this_ptr_conv); + LDKChannelConfig ret_var = UserConfig_get_channel_config(&this_ptr_conv); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -21817,7 +22766,7 @@ uint32_t __attribute__((export_name("TS_UserConfig_get_channel_options"))) TS_U return ret_ref; } -void __attribute__((export_name("TS_UserConfig_set_channel_options"))) TS_UserConfig_set_channel_options(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_UserConfig_set_channel_config"))) TS_UserConfig_set_channel_config(uint32_t this_ptr, uint32_t val) { LDKUserConfig this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; @@ -21827,7 +22776,7 @@ void __attribute__((export_name("TS_UserConfig_set_channel_options"))) TS_UserC val_conv.is_owned = (val & 1) || (val == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); val_conv = ChannelConfig_clone(&val_conv); - UserConfig_set_channel_options(&this_ptr_conv, val_conv); + UserConfig_set_channel_config(&this_ptr_conv, val_conv); } jboolean __attribute__((export_name("TS_UserConfig_get_accept_forwards_to_priv_channels"))) TS_UserConfig_get_accept_forwards_to_priv_channels(uint32_t this_ptr) { @@ -21881,23 +22830,23 @@ void __attribute__((export_name("TS_UserConfig_set_manually_accept_inbound_chan UserConfig_set_manually_accept_inbound_channels(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint32_t own_channel_config_arg, uint32_t peer_channel_config_limits_arg, uint32_t channel_options_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) { - 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); - CHECK_INNER_FIELD_ACCESS_OR_NULL(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); - CHECK_INNER_FIELD_ACCESS_OR_NULL(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); - CHECK_INNER_FIELD_ACCESS_OR_NULL(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, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg); +uint32_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint32_t channel_handshake_config_arg, uint32_t channel_handshake_limits_arg, uint32_t channel_config_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) { + LDKChannelHandshakeConfig channel_handshake_config_arg_conv; + channel_handshake_config_arg_conv.inner = (void*)(channel_handshake_config_arg & (~1)); + channel_handshake_config_arg_conv.is_owned = (channel_handshake_config_arg & 1) || (channel_handshake_config_arg == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_config_arg_conv); + channel_handshake_config_arg_conv = ChannelHandshakeConfig_clone(&channel_handshake_config_arg_conv); + LDKChannelHandshakeLimits channel_handshake_limits_arg_conv; + channel_handshake_limits_arg_conv.inner = (void*)(channel_handshake_limits_arg & (~1)); + channel_handshake_limits_arg_conv.is_owned = (channel_handshake_limits_arg & 1) || (channel_handshake_limits_arg == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_limits_arg_conv); + channel_handshake_limits_arg_conv = ChannelHandshakeLimits_clone(&channel_handshake_limits_arg_conv); + LDKChannelConfig channel_config_arg_conv; + channel_config_arg_conv.inner = (void*)(channel_config_arg & (~1)); + channel_config_arg_conv.is_owned = (channel_config_arg & 1) || (channel_config_arg == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_config_arg_conv); + channel_config_arg_conv = ChannelConfig_clone(&channel_config_arg_conv); + LDKUserConfig ret_var = UserConfig_new(channel_handshake_config_arg_conv, channel_handshake_limits_arg_conv, channel_config_arg_conv, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -22488,7 +23437,7 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balance ignored_channels_constr.data = MALLOC(ignored_channels_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else ignored_channels_constr.data = NULL; - uint32_t* ignored_channels_vals = ignored_channels->elems /* XXX ignored_channels leaks */; + uint32_t* ignored_channels_vals = ignored_channels->elems; for (size_t q = 0; q < ignored_channels_constr.datalen; q++) { uint32_t ignored_channels_conv_16 = ignored_channels_vals[q]; LDKChannelDetails ignored_channels_conv_16_conv; @@ -22498,10 +23447,11 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balance ignored_channels_conv_16_conv = ChannelDetails_clone(&ignored_channels_conv_16_conv); ignored_channels_constr.data[q] = ignored_channels_conv_16_conv; } + FREE(ignored_channels); LDKCVec_BalanceZ ret_var = ChainMonitor_get_claimable_balances(&this_arg_conv, ignored_channels_constr); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t j = 0; j < ret_var.datalen; j++) { LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_conv_9_copy = ret_var.data[j]; @@ -22536,7 +23486,7 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ LDKCVec_OutPointZ ret_var = ChainMonitor_list_monitors(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t k = 0; k < ret_var.datalen; k++) { LDKOutPoint ret_conv_10_var = ret_var.data[k]; uint32_t ret_conv_10_ref = 0; @@ -22692,9 +23642,10 @@ int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_Ch uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_read"))) TS_ChannelMonitorUpdate_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = ChannelMonitorUpdate_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -22787,9 +23738,10 @@ int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEve uint32_t __attribute__((export_name("TS_MonitorEvent_read"))) TS_MonitorEvent_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = MonitorEvent_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -22854,9 +23806,10 @@ int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_w uint32_t __attribute__((export_name("TS_HTLCUpdate_read"))) TS_HTLCUpdate_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = HTLCUpdate_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -22995,8 +23948,12 @@ uint32_t __attribute__((export_name("TS_ChannelMonitor_update_monitor"))) TS_Ch if (!(broadcaster & 1)) { CHECK_ACCESS(broadcaster_ptr); } LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster_ptr; void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); - if (!(fee_estimator & 1)) { CHECK_ACCESS(fee_estimator_ptr); } - LDKFeeEstimator* fee_estimator_conv = (LDKFeeEstimator*)fee_estimator_ptr; + CHECK_ACCESS(fee_estimator_ptr); + LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); + if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) { + // If this_arg is a JCalls struct, then we need to increment the refcnt in it. + LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv); + } void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); } LDKLogger* logger_conv = (LDKLogger*)logger_ptr; @@ -23032,7 +23989,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watc LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ ret_var = ChannelMonitor_get_outputs_to_watch(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv_40_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ"); *ret_conv_40_conv = ret_var.data[o]; @@ -23062,7 +24019,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi LDKCVec_MonitorEventZ ret_var = ChannelMonitor_get_and_clear_pending_monitor_events(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_conv_14_copy = ret_var.data[o]; @@ -23082,7 +24039,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi LDKCVec_EventZ ret_var = ChannelMonitor_get_and_clear_pending_events(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t h = 0; h < ret_var.datalen; h++) { LDKEvent *ret_conv_7_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_conv_7_copy = ret_var.data[h]; @@ -23094,6 +24051,16 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi return ret_arr; } +int8_tArray __attribute__((export_name("TS_ChannelMonitor_get_counterparty_node_id"))) TS_ChannelMonitor_get_counterparty_node_id(uint32_t this_arg) { + LDKChannelMonitor this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); + memcpy(ret_arr->elems, ChannelMonitor_get_counterparty_node_id(&this_arg_conv).compressed_form, 33); + return ret_arr; +} + ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commitment_txn"))) TS_ChannelMonitor_get_latest_holder_commitment_txn(uint32_t this_arg, uint32_t logger) { LDKChannelMonitor this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); @@ -23105,7 +24072,7 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commit LDKCVec_TransactionZ ret_var = ChannelMonitor_get_latest_holder_commitment_txn(&this_arg_conv, logger_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKTransaction ret_conv_12_var = ret_var.data[m]; int8_tArray ret_conv_12_arr = init_int8_tArray(ret_conv_12_var.datalen, __LINE__); @@ -23133,7 +24100,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements"); else txdata_constr.data = NULL; - uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */; + uint32_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { uint32_t txdata_conv_28 = txdata_vals[c]; void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); @@ -23142,6 +24109,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1)); txdata_constr.data[c] = txdata_conv_28_conv; } + FREE(txdata); void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); @@ -23166,7 +24134,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) 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 = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; @@ -23225,7 +24193,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confir txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements"); else txdata_constr.data = NULL; - uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */; + uint32_t* txdata_vals = txdata->elems; for (size_t c = 0; c < txdata_constr.datalen; c++) { uint32_t txdata_conv_28 = txdata_vals[c]; void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); @@ -23234,6 +24202,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confir txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1)); txdata_constr.data[c] = txdata_conv_28_conv; } + FREE(txdata); void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); @@ -23258,7 +24227,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confir LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_transactions_confirmed(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; @@ -23335,7 +24304,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated" LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_best_block_updated(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t n = 0; n < ret_var.datalen; n++) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv_39_conv = ret_var.data[n]; @@ -23354,7 +24323,7 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) T LDKCVec_TxidZ ret_var = ChannelMonitor_get_relevant_txids(&this_arg_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { int8_tArray ret_conv_12_arr = init_int8_tArray(32, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].data, 32); @@ -23390,7 +24359,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balan LDKCVec_BalanceZ ret_var = ChannelMonitor_get_claimable_balances(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t j = 0; j < ret_var.datalen; j++) { LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_conv_9_copy = ret_var.data[j]; @@ -23405,12 +24374,13 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balan uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_read"))) TS_C2Tuple_BlockHashChannelMonitorZ_read(int8_tArray ser, uint32_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); } LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg_ptr; LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_read(ser_ref, arg_conv); + FREE(ser); return (uint32_t)ret_conv; } @@ -23561,9 +24531,10 @@ int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write uint32_t __attribute__((export_name("TS_OutPoint_read"))) TS_OutPoint_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = OutPoint_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -23643,6 +24614,16 @@ void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_to_self_ DelayedPaymentOutputDescriptor_set_to_self_delay(&this_ptr_conv, val); } +uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_output"))) TS_DelayedPaymentOutputDescriptor_get_output(uint32_t this_ptr) { + LDKDelayedPaymentOutputDescriptor this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); + *ret_ref = DelayedPaymentOutputDescriptor_get_output(&this_ptr_conv); + return (uint32_t)ret_ref; +} + void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_output"))) TS_DelayedPaymentOutputDescriptor_set_output(uint32_t this_ptr, uint32_t val) { LDKDelayedPaymentOutputDescriptor this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -23798,9 +24779,10 @@ int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_read"))) TS_DelayedPaymentOutputDescriptor_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = DelayedPaymentOutputDescriptor_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -23842,6 +24824,16 @@ void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_outpoint" StaticPaymentOutputDescriptor_set_outpoint(&this_ptr_conv, val_conv); } +uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_output"))) TS_StaticPaymentOutputDescriptor_get_output(uint32_t this_ptr) { + LDKStaticPaymentOutputDescriptor this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); + *ret_ref = StaticPaymentOutputDescriptor_get_output(&this_ptr_conv); + return (uint32_t)ret_ref; +} + void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_output"))) TS_StaticPaymentOutputDescriptor_set_output(uint32_t this_ptr, uint32_t val) { LDKStaticPaymentOutputDescriptor this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -23970,9 +24962,10 @@ int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write" uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_read"))) TS_StaticPaymentOutputDescriptor_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = StaticPaymentOutputDescriptor_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -24057,9 +25050,10 @@ int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_read"))) TS_SpendableOutputDescriptor_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = SpendableOutputDescriptor_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -24497,12 +25491,13 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemory uint32_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySigner_read(int8_tArray ser, int8_tArray arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKSecretKey arg_ref; CHECK(arg->arr_len == 32); memcpy(arg_ref.bytes, arg->elems, 32); FREE(arg); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = InMemorySigner_read(ser_ref, arg_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -24563,7 +25558,7 @@ uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else descriptors_constr.data = NULL; - uint32_t* descriptors_vals = descriptors->elems /* XXX descriptors leaks */; + uint32_t* descriptors_vals = descriptors->elems; for (size_t b = 0; b < descriptors_constr.datalen; b++) { uint32_t descriptors_conv_27 = descriptors_vals[b]; void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1); @@ -24572,13 +25567,14 @@ uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1)); descriptors_constr.data[b] = descriptors_conv_27_conv; } + FREE(descriptors); LDKCVec_TxOutZ outputs_constr; outputs_constr.datalen = outputs->arr_len; if (outputs_constr.datalen > 0) outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */; + uint32_t* outputs_vals = outputs->elems; for (size_t h = 0; h < outputs_constr.datalen; h++) { uint32_t outputs_conv_7 = outputs_vals[h]; void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1); @@ -24587,6 +25583,7 @@ uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1)); outputs_constr.data[h] = outputs_conv_7_conv; } + FREE(outputs); LDKCVec_u8Z change_destination_script_ref; change_destination_script_ref.datalen = change_destination_script->arr_len; change_destination_script_ref.data = MALLOC(change_destination_script_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -24656,7 +25653,7 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements"); else descriptors_constr.data = NULL; - uint32_t* descriptors_vals = descriptors->elems /* XXX descriptors leaks */; + uint32_t* descriptors_vals = descriptors->elems; for (size_t b = 0; b < descriptors_constr.datalen; b++) { uint32_t descriptors_conv_27 = descriptors_vals[b]; void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1); @@ -24665,13 +25662,14 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1)); descriptors_constr.data[b] = descriptors_conv_27_conv; } + FREE(descriptors); LDKCVec_TxOutZ outputs_constr; outputs_constr.datalen = outputs->arr_len; if (outputs_constr.datalen > 0) outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */; + uint32_t* outputs_vals = outputs->elems; for (size_t h = 0; h < outputs_constr.datalen; h++) { uint32_t outputs_conv_7 = outputs_vals[h]; void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1); @@ -24680,6 +25678,7 @@ uint32_t __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1)); outputs_constr.data[h] = outputs_conv_7_conv; } + FREE(outputs); LDKCVec_u8Z change_destination_script_ref; change_destination_script_ref.datalen = change_destination_script->arr_len; change_destination_script_ref.data = MALLOC(change_destination_script_ref.datalen, "LDKCVec_u8Z Bytes"); @@ -25644,7 +26643,39 @@ void __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_maximum_msa ChannelDetails_set_inbound_htlc_maximum_msat(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t channel_type_arg, uint32_t short_channel_id_arg, uint32_t outbound_scid_alias_arg, uint32_t inbound_scid_alias_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t next_outbound_htlc_limit_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_channel_ready_arg, jboolean is_usable_arg, jboolean is_public_arg, uint32_t inbound_htlc_minimum_msat_arg, uint32_t inbound_htlc_maximum_msat_arg) { +uint32_t __attribute__((export_name("TS_ChannelDetails_get_config"))) TS_ChannelDetails_get_config(uint32_t this_ptr) { + LDKChannelDetails this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKChannelConfig ret_var = ChannelDetails_get_config(&this_ptr_conv); + uint32_t ret_ref = 0; + if ((uintptr_t)ret_var.inner > 4096) { + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + } + return ret_ref; +} + +void __attribute__((export_name("TS_ChannelDetails_set_config"))) TS_ChannelDetails_set_config(uint32_t this_ptr, uint32_t val) { + LDKChannelDetails this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKChannelConfig val_conv; + val_conv.inner = (void*)(val & (~1)); + val_conv.is_owned = (val & 1) || (val == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); + val_conv = ChannelConfig_clone(&val_conv); + ChannelDetails_set_config(&this_ptr_conv, val_conv); +} + +uint32_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t channel_type_arg, uint32_t short_channel_id_arg, uint32_t outbound_scid_alias_arg, uint32_t inbound_scid_alias_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t next_outbound_htlc_limit_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_channel_ready_arg, jboolean is_usable_arg, jboolean is_public_arg, uint32_t inbound_htlc_minimum_msat_arg, uint32_t inbound_htlc_maximum_msat_arg, uint32_t config_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); @@ -25694,7 +26725,12 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetail CHECK_ACCESS(inbound_htlc_maximum_msat_arg_ptr); LDKCOption_u64Z inbound_htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(inbound_htlc_maximum_msat_arg_ptr); inbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_htlc_maximum_msat_arg) & ~1)); - LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, channel_type_arg_conv, short_channel_id_arg_conv, outbound_scid_alias_arg_conv, inbound_scid_alias_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg_conv, inbound_htlc_maximum_msat_arg_conv); + LDKChannelConfig config_arg_conv; + config_arg_conv.inner = (void*)(config_arg & (~1)); + config_arg_conv.is_owned = (config_arg & 1) || (config_arg == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(config_arg_conv); + config_arg_conv = ChannelConfig_clone(&config_arg_conv); + LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, channel_type_arg_conv, short_channel_id_arg_conv, outbound_scid_alias_arg_conv, inbound_scid_alias_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg_conv, inbound_htlc_maximum_msat_arg_conv, config_arg_conv); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -25813,7 +26849,7 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error a_constr.data = MALLOC(a_constr.datalen * sizeof(LDKCResult_NoneAPIErrorZ), "LDKCVec_CResult_NoneAPIErrorZZ Elements"); else a_constr.data = NULL; - uint32_t* a_vals = a->elems /* XXX a leaks */; + uint32_t* a_vals = a->elems; for (size_t w = 0; w < a_constr.datalen; w++) { uint32_t a_conv_22 = a_vals[w]; void* a_conv_22_ptr = (void*)(((uintptr_t)a_conv_22) & ~1); @@ -25822,6 +26858,7 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error a_conv_22_conv = CResult_NoneAPIErrorZ_clone((LDKCResult_NoneAPIErrorZ*)(((uintptr_t)a_conv_22) & ~1)); a_constr.data[w] = a_conv_22_conv; } + FREE(a); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_path_parameter_error(a_constr); uint32_t ret_ref = (uintptr_t)ret_copy; @@ -25835,7 +26872,7 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_saf a_constr.data = MALLOC(a_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements"); else a_constr.data = NULL; - uint32_t* a_vals = a->elems /* XXX a leaks */; + uint32_t* a_vals = a->elems; for (size_t k = 0; k < a_constr.datalen; k++) { uint32_t a_conv_10 = a_vals[k]; void* a_conv_10_ptr = (void*)(((uintptr_t)a_conv_10) & ~1); @@ -25844,6 +26881,7 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_saf a_conv_10_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a_conv_10) & ~1)); a_constr.data[k] = a_conv_10_conv; } + FREE(a); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_all_failed_retry_safe(a_constr); uint32_t ret_ref = (uintptr_t)ret_copy; @@ -25857,7 +26895,7 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) results_constr.data = MALLOC(results_constr.datalen * sizeof(LDKCResult_NoneAPIErrorZ), "LDKCVec_CResult_NoneAPIErrorZZ Elements"); else results_constr.data = NULL; - uint32_t* results_vals = results->elems /* XXX results leaks */; + uint32_t* results_vals = results->elems; for (size_t w = 0; w < results_constr.datalen; w++) { uint32_t results_conv_22 = results_vals[w]; void* results_conv_22_ptr = (void*)(((uintptr_t)results_conv_22) & ~1); @@ -25865,6 +26903,7 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) LDKCResult_NoneAPIErrorZ results_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(results_conv_22_ptr); results_constr.data[w] = results_conv_22_conv; } + FREE(results); LDKRouteParameters failed_paths_retry_conv; failed_paths_retry_conv.inner = (void*)(failed_paths_retry & (~1)); failed_paths_retry_conv.is_owned = (failed_paths_retry & 1) || (failed_paths_retry == 0); @@ -25895,7 +26934,7 @@ uint32_tArray __attribute__((export_name("TS_PhantomRouteHints_get_channels"))) LDKCVec_ChannelDetailsZ ret_var = PhantomRouteHints_get_channels(&this_ptr_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; uint32_t ret_conv_16_ref = 0; @@ -25924,7 +26963,7 @@ void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_Phant val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t q = 0; q < val_constr.datalen; q++) { uint32_t val_conv_16 = val_vals[q]; LDKChannelDetails val_conv_16_conv; @@ -25934,6 +26973,7 @@ void __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_Phant val_conv_16_conv = ChannelDetails_clone(&val_conv_16_conv); val_constr.data[q] = val_conv_16_conv; } + FREE(val); PhantomRouteHints_set_channels(&this_ptr_conv, val_constr); } @@ -25982,7 +27022,7 @@ uint32_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRou channels_arg_constr.data = MALLOC(channels_arg_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else channels_arg_constr.data = NULL; - uint32_t* channels_arg_vals = channels_arg->elems /* XXX channels_arg leaks */; + uint32_t* channels_arg_vals = channels_arg->elems; for (size_t q = 0; q < channels_arg_constr.datalen; q++) { uint32_t channels_arg_conv_16 = channels_arg_vals[q]; LDKChannelDetails channels_arg_conv_16_conv; @@ -25992,6 +27032,7 @@ uint32_t __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRou channels_arg_conv_16_conv = ChannelDetails_clone(&channels_arg_conv_16_conv); channels_arg_constr.data[q] = channels_arg_conv_16_conv; } + FREE(channels_arg); LDKPublicKey real_node_pubkey_arg_ref; CHECK(real_node_pubkey_arg->arr_len == 33); memcpy(real_node_pubkey_arg_ref.compressed_form, real_node_pubkey_arg->elems, 33); FREE(real_node_pubkey_arg); @@ -26146,7 +27187,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) T LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_channels(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; uint32_t ret_conv_16_ref = 0; @@ -26172,7 +27213,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channel LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_usable_channels(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; uint32_t ret_conv_16_ref = 0; @@ -26224,7 +27265,24 @@ uint32_t __attribute__((export_name("TS_ChannelManager_close_channel_with_targe return (uint32_t)ret_conv; } -uint32_t __attribute__((export_name("TS_ChannelManager_force_close_channel"))) TS_ChannelManager_force_close_channel(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { +uint32_t __attribute__((export_name("TS_ChannelManager_force_close_broadcasting_latest_txn"))) TS_ChannelManager_force_close_broadcasting_latest_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { + LDKChannelManager this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + unsigned char channel_id_arr[32]; + CHECK(channel_id->arr_len == 32); + memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); + unsigned char (*channel_id_ref)[32] = &channel_id_arr; + LDKPublicKey counterparty_node_id_ref; + CHECK(counterparty_node_id->arr_len == 33); + memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); + LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); + *ret_conv = ChannelManager_force_close_broadcasting_latest_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); + return (uint32_t)ret_conv; +} + +uint32_t __attribute__((export_name("TS_ChannelManager_force_close_without_broadcasting_txn"))) TS_ChannelManager_force_close_without_broadcasting_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) { LDKChannelManager this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; @@ -26237,16 +27295,24 @@ uint32_t __attribute__((export_name("TS_ChannelManager_force_close_channel"))) CHECK(counterparty_node_id->arr_len == 33); memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); - *ret_conv = ChannelManager_force_close_channel(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); + *ret_conv = ChannelManager_force_close_without_broadcasting_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref); return (uint32_t)ret_conv; } -void __attribute__((export_name("TS_ChannelManager_force_close_all_channels"))) TS_ChannelManager_force_close_all_channels(uint32_t this_arg) { +void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn"))) TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn(uint32_t this_arg) { LDKChannelManager this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - ChannelManager_force_close_all_channels(&this_arg_conv); + ChannelManager_force_close_all_channels_broadcasting_latest_txn(&this_arg_conv); +} + +void __attribute__((export_name("TS_ChannelManager_force_close_all_channels_without_broadcasting_txn"))) TS_ChannelManager_force_close_all_channels_without_broadcasting_txn(uint32_t this_arg) { + LDKChannelManager this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + ChannelManager_force_close_all_channels_without_broadcasting_txn(&this_arg_conv); } uint32_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_ChannelManager_send_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_hash, int8_tArray payment_secret) { @@ -26314,6 +27380,33 @@ uint32_t __attribute__((export_name("TS_ChannelManager_send_spontaneous_payment return (uint32_t)ret_conv; } +uint32_t __attribute__((export_name("TS_ChannelManager_send_probe"))) TS_ChannelManager_send_probe(uint32_t this_arg, uint32_tArray hops) { + LDKChannelManager this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKCVec_RouteHopZ hops_constr; + hops_constr.datalen = hops->arr_len; + if (hops_constr.datalen > 0) + hops_constr.data = MALLOC(hops_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); + else + hops_constr.data = NULL; + uint32_t* hops_vals = hops->elems; + for (size_t k = 0; k < hops_constr.datalen; k++) { + uint32_t hops_conv_10 = hops_vals[k]; + LDKRouteHop hops_conv_10_conv; + hops_conv_10_conv.inner = (void*)(hops_conv_10 & (~1)); + hops_conv_10_conv.is_owned = (hops_conv_10 & 1) || (hops_conv_10 == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(hops_conv_10_conv); + hops_conv_10_conv = RouteHop_clone(&hops_conv_10_conv); + hops_constr.data[k] = hops_conv_10_conv; + } + FREE(hops); + LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); + *ret_conv = ChannelManager_send_probe(&this_arg_conv, hops_constr); + return (uint32_t)ret_conv; +} + uint32_t __attribute__((export_name("TS_ChannelManager_funding_transaction_generated"))) TS_ChannelManager_funding_transaction_generated(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int8_tArray funding_transaction) { LDKChannelManager this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); @@ -26353,7 +27446,7 @@ void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement" addresses_constr.data = MALLOC(addresses_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else addresses_constr.data = NULL; - uint32_t* addresses_vals = addresses->elems /* XXX addresses leaks */; + uint32_t* addresses_vals = addresses->elems; for (size_t m = 0; m < addresses_constr.datalen; m++) { uint32_t addresses_conv_12 = addresses_vals[m]; void* addresses_conv_12_ptr = (void*)(((uintptr_t)addresses_conv_12) & ~1); @@ -26361,9 +27454,42 @@ void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement" LDKNetAddress addresses_conv_12_conv = *(LDKNetAddress*)(addresses_conv_12_ptr); addresses_constr.data[m] = addresses_conv_12_conv; } + FREE(addresses); ChannelManager_broadcast_node_announcement(&this_arg_conv, rgb_ref, alias_ref, addresses_constr); } +uint32_t __attribute__((export_name("TS_ChannelManager_update_channel_config"))) TS_ChannelManager_update_channel_config(uint32_t this_arg, int8_tArray counterparty_node_id, ptrArray channel_ids, uint32_t config) { + LDKChannelManager this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKPublicKey counterparty_node_id_ref; + CHECK(counterparty_node_id->arr_len == 33); + memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id); + LDKCVec_ThirtyTwoBytesZ channel_ids_constr; + channel_ids_constr.datalen = channel_ids->arr_len; + if (channel_ids_constr.datalen > 0) + channel_ids_constr.data = MALLOC(channel_ids_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_ThirtyTwoBytesZ Elements"); + else + channel_ids_constr.data = NULL; + int8_tArray* channel_ids_vals = (void*) channel_ids->elems; + for (size_t m = 0; m < channel_ids_constr.datalen; m++) { + int8_tArray channel_ids_conv_12 = channel_ids_vals[m]; + LDKThirtyTwoBytes channel_ids_conv_12_ref; + CHECK(channel_ids_conv_12->arr_len == 32); + memcpy(channel_ids_conv_12_ref.data, channel_ids_conv_12->elems, 32); FREE(channel_ids_conv_12); + channel_ids_constr.data[m] = channel_ids_conv_12_ref; + } + FREE(channel_ids); + LDKChannelConfig config_conv; + config_conv.inner = (void*)(config & (~1)); + config_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(config_conv); + LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); + *ret_conv = ChannelManager_update_channel_config(&this_arg_conv, counterparty_node_id_ref, channel_ids_constr, &config_conv); + return (uint32_t)ret_conv; +} + void __attribute__((export_name("TS_ChannelManager_process_pending_htlc_forwards"))) TS_ChannelManager_process_pending_htlc_forwards(uint32_t this_arg) { LDKChannelManager this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); @@ -26641,9 +27767,10 @@ int8_tArray __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_read"))) TS_CounterpartyForwardingInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ"); *ret_conv = CounterpartyForwardingInfo_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -26662,9 +27789,10 @@ int8_tArray __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_Cha uint32_t __attribute__((export_name("TS_ChannelCounterparty_read"))) TS_ChannelCounterparty_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ"); *ret_conv = ChannelCounterparty_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -26683,9 +27811,10 @@ int8_tArray __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelD uint32_t __attribute__((export_name("TS_ChannelDetails_read"))) TS_ChannelDetails_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ"); *ret_conv = ChannelDetails_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -26704,9 +27833,10 @@ int8_tArray __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_Phant uint32_t __attribute__((export_name("TS_PhantomRouteHints_read"))) TS_PhantomRouteHints_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ"); *ret_conv = PhantomRouteHints_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -26932,7 +28062,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann channel_monitors_constr.data = MALLOC(channel_monitors_constr.datalen * sizeof(LDKChannelMonitor), "LDKCVec_ChannelMonitorZ Elements"); else channel_monitors_constr.data = NULL; - uint32_t* channel_monitors_vals = channel_monitors->elems /* XXX channel_monitors leaks */; + uint32_t* channel_monitors_vals = channel_monitors->elems; for (size_t q = 0; q < channel_monitors_constr.datalen; q++) { uint32_t channel_monitors_conv_16 = channel_monitors_vals[q]; LDKChannelMonitor channel_monitors_conv_16_conv; @@ -26941,6 +28071,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_monitors_conv_16_conv); channel_monitors_constr.data[q] = channel_monitors_conv_16_conv; } + FREE(channel_monitors); 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); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -26956,7 +28087,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read"))) TS_C2Tuple_BlockHashChannelManagerZ_read(int8_tArray ser, uint32_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKChannelManagerReadArgs arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = (arg & 1) || (arg == 0); @@ -26964,6 +28095,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read") // 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); + FREE(ser); return (uint32_t)ret_conv; } @@ -29580,6 +30712,25 @@ void __attribute__((export_name("TS_CommitmentSigned_set_signature"))) TS_Commi CommitmentSigned_set_signature(&this_ptr_conv, val_ref); } +ptrArray __attribute__((export_name("TS_CommitmentSigned_get_htlc_signatures"))) TS_CommitmentSigned_get_htlc_signatures(uint32_t this_ptr) { + LDKCommitmentSigned this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_SignatureZ ret_var = CommitmentSigned_get_htlc_signatures(&this_ptr_conv); + ptrArray ret_arr = NULL; + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); + for (size_t m = 0; m < ret_var.datalen; m++) { + int8_tArray ret_conv_12_arr = init_int8_tArray(64, __LINE__); + memcpy(ret_conv_12_arr->elems, ret_var.data[m].compact_form, 64); + ret_arr_ptr[m] = ret_conv_12_arr; + } + + FREE(ret_var.data); + return ret_arr; +} + void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS_CommitmentSigned_set_htlc_signatures(uint32_t this_ptr, ptrArray val) { LDKCommitmentSigned this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -29591,7 +30742,7 @@ void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else val_constr.data = NULL; - int8_tArray* val_vals = (void*) val->elems /* XXX val leaks */; + int8_tArray* val_vals = (void*) val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { int8_tArray val_conv_12 = val_vals[m]; LDKSignature val_conv_12_ref; @@ -29599,6 +30750,7 @@ void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); FREE(val_conv_12); val_constr.data[m] = val_conv_12_ref; } + FREE(val); CommitmentSigned_set_htlc_signatures(&this_ptr_conv, val_constr); } @@ -29615,7 +30767,7 @@ uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS htlc_signatures_arg_constr.data = MALLOC(htlc_signatures_arg_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else htlc_signatures_arg_constr.data = NULL; - int8_tArray* htlc_signatures_arg_vals = (void*) htlc_signatures_arg->elems /* XXX htlc_signatures_arg leaks */; + int8_tArray* htlc_signatures_arg_vals = (void*) htlc_signatures_arg->elems; for (size_t m = 0; m < htlc_signatures_arg_constr.datalen; m++) { int8_tArray htlc_signatures_arg_conv_12 = htlc_signatures_arg_vals[m]; LDKSignature htlc_signatures_arg_conv_12_ref; @@ -29623,6 +30775,7 @@ uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS memcpy(htlc_signatures_arg_conv_12_ref.compact_form, htlc_signatures_arg_conv_12->elems, 64); FREE(htlc_signatures_arg_conv_12); htlc_signatures_arg_constr.data[m] = htlc_signatures_arg_conv_12_ref; } + FREE(htlc_signatures_arg); LDKCommitmentSigned ret_var = CommitmentSigned_new(channel_id_arg_ref, signature_arg_ref, htlc_signatures_arg_constr); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -30329,6 +31482,18 @@ uint32_t __attribute__((export_name("TS_NetAddress_onion_v3"))) TS_NetAddress_o return ret_ref; } +uint32_t __attribute__((export_name("TS_NetAddress_hostname"))) TS_NetAddress_hostname(uint32_t hostname, int16_t port) { + LDKHostname hostname_conv; + hostname_conv.inner = (void*)(hostname & (~1)); + hostname_conv.is_owned = (hostname & 1) || (hostname == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(hostname_conv); + hostname_conv = Hostname_clone(&hostname_conv); + LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); + *ret_copy = NetAddress_hostname(hostname_conv, port); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_write(uint32_t obj) { LDKNetAddress* obj_conv = (LDKNetAddress*)obj; LDKCVec_u8Z ret_var = NetAddress_write(obj_conv); @@ -30341,9 +31506,10 @@ int8_tArray __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_w uint32_t __attribute__((export_name("TS_NetAddress_read"))) TS_NetAddress_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = NetAddress_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -30465,6 +31631,26 @@ void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_alias"))) TS_U UnsignedNodeAnnouncement_set_alias(&this_ptr_conv, val_ref); } +uint32_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_addresses"))) TS_UnsignedNodeAnnouncement_get_addresses(uint32_t this_ptr) { + LDKUnsignedNodeAnnouncement this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_NetAddressZ ret_var = UnsignedNodeAnnouncement_get_addresses(&this_ptr_conv); + uint32_tArray ret_arr = NULL; + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + for (size_t m = 0; m < ret_var.datalen; m++) { + LDKNetAddress *ret_conv_12_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); + *ret_conv_12_copy = ret_var.data[m]; + uint32_t ret_conv_12_ref = (uintptr_t)ret_conv_12_copy; + ret_arr_ptr[m] = ret_conv_12_ref; + } + + FREE(ret_var.data); + return ret_arr; +} + void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) TS_UnsignedNodeAnnouncement_set_addresses(uint32_t this_ptr, uint32_tArray val) { LDKUnsignedNodeAnnouncement this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -30476,7 +31662,7 @@ void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { uint32_t val_conv_12 = val_vals[m]; void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); @@ -30485,6 +31671,7 @@ void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); val_constr.data[m] = val_conv_12_conv; } + FREE(val); UnsignedNodeAnnouncement_set_addresses(&this_ptr_conv, val_constr); } @@ -31146,6 +32333,23 @@ void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_minimum_msat UnsignedChannelUpdate_set_htlc_minimum_msat(&this_ptr_conv, val); } +int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_get_htlc_maximum_msat(uint32_t this_ptr) { + LDKUnsignedChannelUpdate this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + int64_t ret_conv = UnsignedChannelUpdate_get_htlc_maximum_msat(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_maximum_msat"))) TS_UnsignedChannelUpdate_set_htlc_maximum_msat(uint32_t this_ptr, int64_t val) { + LDKUnsignedChannelUpdate this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + UnsignedChannelUpdate_set_htlc_maximum_msat(&this_ptr_conv, val); +} + int32_t __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_base_msat"))) TS_UnsignedChannelUpdate_get_fee_base_msat(uint32_t this_ptr) { LDKUnsignedChannelUpdate this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -31180,6 +32384,18 @@ void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_ UnsignedChannelUpdate_set_fee_proportional_millionths(&this_ptr_conv, val); } +int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_excess_data"))) TS_UnsignedChannelUpdate_get_excess_data(uint32_t this_ptr) { + LDKUnsignedChannelUpdate this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_u8Z ret_var = UnsignedChannelUpdate_get_excess_data(&this_ptr_conv); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); + memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); + CVec_u8Z_free(ret_var); + return ret_arr; +} + void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) TS_UnsignedChannelUpdate_set_excess_data(uint32_t this_ptr, int8_tArray val) { LDKUnsignedChannelUpdate this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -31192,6 +32408,26 @@ void __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) T UnsignedChannelUpdate_set_excess_data(&this_ptr_conv, val_ref); } +uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_new"))) TS_UnsignedChannelUpdate_new(int8_tArray chain_hash_arg, int64_t short_channel_id_arg, int32_t timestamp_arg, int8_t flags_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, int32_t fee_base_msat_arg, int32_t fee_proportional_millionths_arg, int8_tArray excess_data_arg) { + LDKThirtyTwoBytes chain_hash_arg_ref; + CHECK(chain_hash_arg->arr_len == 32); + memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); + LDKCVec_u8Z excess_data_arg_ref; + excess_data_arg_ref.datalen = excess_data_arg->arr_len; + excess_data_arg_ref.data = MALLOC(excess_data_arg_ref.datalen, "LDKCVec_u8Z Bytes"); + memcpy(excess_data_arg_ref.data, excess_data_arg->elems, excess_data_arg_ref.datalen); FREE(excess_data_arg); + LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_new(chain_hash_arg_ref, short_channel_id_arg, timestamp_arg, flags_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fee_base_msat_arg, fee_proportional_millionths_arg, excess_data_arg_ref); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + static inline uintptr_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) { LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(arg); uint32_t ret_ref = 0; @@ -31545,6 +32781,24 @@ void __attribute__((export_name("TS_ReplyChannelRange_set_sync_complete"))) TS_ ReplyChannelRange_set_sync_complete(&this_ptr_conv, val); } +int64_tArray __attribute__((export_name("TS_ReplyChannelRange_get_short_channel_ids"))) TS_ReplyChannelRange_get_short_channel_ids(uint32_t this_ptr) { + LDKReplyChannelRange this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_u64Z ret_var = ReplyChannelRange_get_short_channel_ids(&this_ptr_conv); + int64_tArray ret_arr = NULL; + ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); + int64_t *ret_arr_ptr = (int64_t*)(((uint8_t*)ret_arr) + 8); + for (size_t i = 0; i < ret_var.datalen; i++) { + int64_t ret_conv_8_conv = ret_var.data[i]; + ret_arr_ptr[i] = ret_conv_8_conv; + } + + FREE(ret_var.data); + return ret_arr; +} + void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) TS_ReplyChannelRange_set_short_channel_ids(uint32_t this_ptr, int64_tArray val) { LDKReplyChannelRange this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -31556,11 +32810,12 @@ void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) val_constr.data = MALLOC(val_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); else val_constr.data = NULL; - int64_t* val_vals = val->elems /* XXX val leaks */; + int64_t* val_vals = val->elems; for (size_t i = 0; i < val_constr.datalen; i++) { int64_t val_conv_8 = val_vals[i]; val_constr.data[i] = val_conv_8; } + FREE(val); ReplyChannelRange_set_short_channel_ids(&this_ptr_conv, val_constr); } @@ -31574,11 +32829,12 @@ uint32_t __attribute__((export_name("TS_ReplyChannelRange_new"))) TS_ReplyChann short_channel_ids_arg_constr.data = MALLOC(short_channel_ids_arg_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); else short_channel_ids_arg_constr.data = NULL; - int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems /* XXX short_channel_ids_arg leaks */; + int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems; for (size_t i = 0; i < short_channel_ids_arg_constr.datalen; i++) { int64_t short_channel_ids_arg_conv_8 = short_channel_ids_arg_vals[i]; short_channel_ids_arg_constr.data[i] = short_channel_ids_arg_conv_8; } + FREE(short_channel_ids_arg); LDKReplyChannelRange ret_var = ReplyChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, short_channel_ids_arg_constr); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -31658,6 +32914,24 @@ void __attribute__((export_name("TS_QueryShortChannelIds_set_chain_hash"))) TS_ QueryShortChannelIds_set_chain_hash(&this_ptr_conv, val_ref); } +int64_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_short_channel_ids"))) TS_QueryShortChannelIds_get_short_channel_ids(uint32_t this_ptr) { + LDKQueryShortChannelIds this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_u64Z ret_var = QueryShortChannelIds_get_short_channel_ids(&this_ptr_conv); + int64_tArray ret_arr = NULL; + ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); + int64_t *ret_arr_ptr = (int64_t*)(((uint8_t*)ret_arr) + 8); + for (size_t i = 0; i < ret_var.datalen; i++) { + int64_t ret_conv_8_conv = ret_var.data[i]; + ret_arr_ptr[i] = ret_conv_8_conv; + } + + FREE(ret_var.data); + return ret_arr; +} + void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids"))) TS_QueryShortChannelIds_set_short_channel_ids(uint32_t this_ptr, int64_tArray val) { LDKQueryShortChannelIds this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -31669,11 +32943,12 @@ void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids" val_constr.data = MALLOC(val_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); else val_constr.data = NULL; - int64_t* val_vals = val->elems /* XXX val leaks */; + int64_t* val_vals = val->elems; for (size_t i = 0; i < val_constr.datalen; i++) { int64_t val_conv_8 = val_vals[i]; val_constr.data[i] = val_conv_8; } + FREE(val); QueryShortChannelIds_set_short_channel_ids(&this_ptr_conv, val_constr); } @@ -31687,11 +32962,12 @@ uint32_t __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QuerySh short_channel_ids_arg_constr.data = MALLOC(short_channel_ids_arg_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); else short_channel_ids_arg_constr.data = NULL; - int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems /* XXX short_channel_ids_arg leaks */; + int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems; for (size_t i = 0; i < short_channel_ids_arg_constr.datalen; i++) { int64_t short_channel_ids_arg_conv_8 = short_channel_ids_arg_vals[i]; short_channel_ids_arg_constr.data[i] = short_channel_ids_arg_conv_8; } + FREE(short_channel_ids_arg); LDKQueryShortChannelIds ret_var = QueryShortChannelIds_new(chain_hash_arg_ref, short_channel_ids_arg_constr); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -32170,7 +33446,7 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_ht LDKCVec_UpdateAddHTLCZ ret_var = CommitmentUpdate_get_update_add_htlcs(&this_ptr_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t p = 0; p < ret_var.datalen; p++) { LDKUpdateAddHTLC ret_conv_15_var = ret_var.data[p]; uint32_t ret_conv_15_ref = 0; @@ -32199,7 +33475,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) T val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t p = 0; p < val_constr.datalen; p++) { uint32_t val_conv_15 = val_vals[p]; LDKUpdateAddHTLC val_conv_15_conv; @@ -32209,6 +33485,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) T val_conv_15_conv = UpdateAddHTLC_clone(&val_conv_15_conv); val_constr.data[p] = val_conv_15_conv; } + FREE(val); CommitmentUpdate_set_update_add_htlcs(&this_ptr_conv, val_constr); } @@ -32220,7 +33497,7 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfil LDKCVec_UpdateFulfillHTLCZ ret_var = CommitmentUpdate_get_update_fulfill_htlcs(&this_ptr_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t t = 0; t < ret_var.datalen; t++) { LDKUpdateFulfillHTLC ret_conv_19_var = ret_var.data[t]; uint32_t ret_conv_19_ref = 0; @@ -32249,7 +33526,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs") val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t t = 0; t < val_constr.datalen; t++) { uint32_t val_conv_19 = val_vals[t]; LDKUpdateFulfillHTLC val_conv_19_conv; @@ -32259,6 +33536,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs") val_conv_19_conv = UpdateFulfillHTLC_clone(&val_conv_19_conv); val_constr.data[t] = val_conv_19_conv; } + FREE(val); CommitmentUpdate_set_update_fulfill_htlcs(&this_ptr_conv, val_constr); } @@ -32270,7 +33548,7 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_h LDKCVec_UpdateFailHTLCZ ret_var = CommitmentUpdate_get_update_fail_htlcs(&this_ptr_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t q = 0; q < ret_var.datalen; q++) { LDKUpdateFailHTLC ret_conv_16_var = ret_var.data[q]; uint32_t ret_conv_16_ref = 0; @@ -32299,7 +33577,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t q = 0; q < val_constr.datalen; q++) { uint32_t val_conv_16 = val_vals[q]; LDKUpdateFailHTLC val_conv_16_conv; @@ -32309,6 +33587,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs"))) val_conv_16_conv = UpdateFailHTLC_clone(&val_conv_16_conv); val_constr.data[q] = val_conv_16_conv; } + FREE(val); CommitmentUpdate_set_update_fail_htlcs(&this_ptr_conv, val_constr); } @@ -32320,7 +33599,7 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_m LDKCVec_UpdateFailMalformedHTLCZ ret_var = CommitmentUpdate_get_update_fail_malformed_htlcs(&this_ptr_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t z = 0; z < ret_var.datalen; z++) { LDKUpdateFailMalformedHTLC ret_conv_25_var = ret_var.data[z]; uint32_t ret_conv_25_ref = 0; @@ -32349,7 +33628,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_ val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t z = 0; z < val_constr.datalen; z++) { uint32_t val_conv_25 = val_vals[z]; LDKUpdateFailMalformedHTLC val_conv_25_conv; @@ -32359,6 +33638,7 @@ void __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_ val_conv_25_conv = UpdateFailMalformedHTLC_clone(&val_conv_25_conv); val_constr.data[z] = val_conv_25_conv; } + FREE(val); CommitmentUpdate_set_update_fail_malformed_htlcs(&this_ptr_conv, val_constr); } @@ -32431,7 +33711,7 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU update_add_htlcs_arg_constr.data = MALLOC(update_add_htlcs_arg_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements"); else update_add_htlcs_arg_constr.data = NULL; - uint32_t* update_add_htlcs_arg_vals = update_add_htlcs_arg->elems /* XXX update_add_htlcs_arg leaks */; + uint32_t* update_add_htlcs_arg_vals = update_add_htlcs_arg->elems; for (size_t p = 0; p < update_add_htlcs_arg_constr.datalen; p++) { uint32_t update_add_htlcs_arg_conv_15 = update_add_htlcs_arg_vals[p]; LDKUpdateAddHTLC update_add_htlcs_arg_conv_15_conv; @@ -32441,13 +33721,14 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU update_add_htlcs_arg_conv_15_conv = UpdateAddHTLC_clone(&update_add_htlcs_arg_conv_15_conv); update_add_htlcs_arg_constr.data[p] = update_add_htlcs_arg_conv_15_conv; } + FREE(update_add_htlcs_arg); LDKCVec_UpdateFulfillHTLCZ update_fulfill_htlcs_arg_constr; update_fulfill_htlcs_arg_constr.datalen = update_fulfill_htlcs_arg->arr_len; if (update_fulfill_htlcs_arg_constr.datalen > 0) update_fulfill_htlcs_arg_constr.data = MALLOC(update_fulfill_htlcs_arg_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements"); else update_fulfill_htlcs_arg_constr.data = NULL; - uint32_t* update_fulfill_htlcs_arg_vals = update_fulfill_htlcs_arg->elems /* XXX update_fulfill_htlcs_arg leaks */; + uint32_t* update_fulfill_htlcs_arg_vals = update_fulfill_htlcs_arg->elems; for (size_t t = 0; t < update_fulfill_htlcs_arg_constr.datalen; t++) { uint32_t update_fulfill_htlcs_arg_conv_19 = update_fulfill_htlcs_arg_vals[t]; LDKUpdateFulfillHTLC update_fulfill_htlcs_arg_conv_19_conv; @@ -32457,13 +33738,14 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU update_fulfill_htlcs_arg_conv_19_conv = UpdateFulfillHTLC_clone(&update_fulfill_htlcs_arg_conv_19_conv); update_fulfill_htlcs_arg_constr.data[t] = update_fulfill_htlcs_arg_conv_19_conv; } + FREE(update_fulfill_htlcs_arg); LDKCVec_UpdateFailHTLCZ update_fail_htlcs_arg_constr; update_fail_htlcs_arg_constr.datalen = update_fail_htlcs_arg->arr_len; if (update_fail_htlcs_arg_constr.datalen > 0) update_fail_htlcs_arg_constr.data = MALLOC(update_fail_htlcs_arg_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements"); else update_fail_htlcs_arg_constr.data = NULL; - uint32_t* update_fail_htlcs_arg_vals = update_fail_htlcs_arg->elems /* XXX update_fail_htlcs_arg leaks */; + uint32_t* update_fail_htlcs_arg_vals = update_fail_htlcs_arg->elems; for (size_t q = 0; q < update_fail_htlcs_arg_constr.datalen; q++) { uint32_t update_fail_htlcs_arg_conv_16 = update_fail_htlcs_arg_vals[q]; LDKUpdateFailHTLC update_fail_htlcs_arg_conv_16_conv; @@ -32473,13 +33755,14 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU update_fail_htlcs_arg_conv_16_conv = UpdateFailHTLC_clone(&update_fail_htlcs_arg_conv_16_conv); update_fail_htlcs_arg_constr.data[q] = update_fail_htlcs_arg_conv_16_conv; } + FREE(update_fail_htlcs_arg); LDKCVec_UpdateFailMalformedHTLCZ update_fail_malformed_htlcs_arg_constr; update_fail_malformed_htlcs_arg_constr.datalen = update_fail_malformed_htlcs_arg->arr_len; if (update_fail_malformed_htlcs_arg_constr.datalen > 0) update_fail_malformed_htlcs_arg_constr.data = MALLOC(update_fail_malformed_htlcs_arg_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements"); else update_fail_malformed_htlcs_arg_constr.data = NULL; - uint32_t* update_fail_malformed_htlcs_arg_vals = update_fail_malformed_htlcs_arg->elems /* XXX update_fail_malformed_htlcs_arg leaks */; + uint32_t* update_fail_malformed_htlcs_arg_vals = update_fail_malformed_htlcs_arg->elems; for (size_t z = 0; z < update_fail_malformed_htlcs_arg_constr.datalen; z++) { uint32_t update_fail_malformed_htlcs_arg_conv_25 = update_fail_malformed_htlcs_arg_vals[z]; LDKUpdateFailMalformedHTLC update_fail_malformed_htlcs_arg_conv_25_conv; @@ -32489,6 +33772,7 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU update_fail_malformed_htlcs_arg_conv_25_conv = UpdateFailMalformedHTLC_clone(&update_fail_malformed_htlcs_arg_conv_25_conv); update_fail_malformed_htlcs_arg_constr.data[z] = update_fail_malformed_htlcs_arg_conv_25_conv; } + FREE(update_fail_malformed_htlcs_arg); 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); @@ -32582,9 +33866,10 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptCha uint32_t __attribute__((export_name("TS_AcceptChannel_read"))) TS_AcceptChannel_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = AcceptChannel_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32603,9 +33888,10 @@ int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_ uint32_t __attribute__((export_name("TS_AnnouncementSignatures_read"))) TS_AnnouncementSignatures_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = AnnouncementSignatures_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32624,9 +33910,10 @@ int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_Chan uint32_t __attribute__((export_name("TS_ChannelReestablish_read"))) TS_ChannelReestablish_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = ChannelReestablish_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32645,9 +33932,10 @@ int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSi uint32_t __attribute__((export_name("TS_ClosingSigned_read"))) TS_ClosingSigned_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = ClosingSigned_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32666,9 +33954,10 @@ int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_C uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_read"))) TS_ClosingSignedFeeRange_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = ClosingSignedFeeRange_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32687,9 +33976,10 @@ int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_Commit uint32_t __attribute__((export_name("TS_CommitmentSigned_read"))) TS_CommitmentSigned_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CommitmentSigned_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32708,9 +33998,10 @@ int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingC uint32_t __attribute__((export_name("TS_FundingCreated_read"))) TS_FundingCreated_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = FundingCreated_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32729,9 +34020,10 @@ int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSi uint32_t __attribute__((export_name("TS_FundingSigned_read"))) TS_FundingSigned_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = FundingSigned_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32750,9 +34042,10 @@ int8_tArray __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelRea uint32_t __attribute__((export_name("TS_ChannelReady_read"))) TS_ChannelReady_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ"); *ret_conv = ChannelReady_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32771,9 +34064,10 @@ int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_ uint32_t __attribute__((export_name("TS_Init_read"))) TS_Init_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = Init_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32792,9 +34086,10 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel uint32_t __attribute__((export_name("TS_OpenChannel_read"))) TS_OpenChannel_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = OpenChannel_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32813,9 +34108,10 @@ int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndA uint32_t __attribute__((export_name("TS_RevokeAndACK_read"))) TS_RevokeAndACK_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = RevokeAndACK_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32834,9 +34130,10 @@ int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write uint32_t __attribute__((export_name("TS_Shutdown_read"))) TS_Shutdown_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = Shutdown_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32855,9 +34152,10 @@ int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFa uint32_t __attribute__((export_name("TS_UpdateFailHTLC_read"))) TS_UpdateFailHTLC_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = UpdateFailHTLC_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32876,9 +34174,10 @@ int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_read"))) TS_UpdateFailMalformedHTLC_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = UpdateFailMalformedHTLC_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32897,9 +34196,10 @@ int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_wri uint32_t __attribute__((export_name("TS_UpdateFee_read"))) TS_UpdateFee_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = UpdateFee_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32918,9 +34218,10 @@ int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_Updat uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_read"))) TS_UpdateFulfillHTLC_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = UpdateFulfillHTLC_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32939,9 +34240,10 @@ int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAdd uint32_t __attribute__((export_name("TS_UpdateAddHTLC_read"))) TS_UpdateAddHTLC_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = UpdateAddHTLC_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32960,9 +34262,10 @@ int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_ uint32_t __attribute__((export_name("TS_Ping_read"))) TS_Ping_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = Ping_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -32981,9 +34284,10 @@ int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_ uint32_t __attribute__((export_name("TS_Pong_read"))) TS_Pong_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = Pong_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33002,9 +34306,10 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write")) uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_read"))) TS_UnsignedChannelAnnouncement_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = UnsignedChannelAnnouncement_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33023,9 +34328,10 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_Cha uint32_t __attribute__((export_name("TS_ChannelAnnouncement_read"))) TS_ChannelAnnouncement_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = ChannelAnnouncement_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33044,9 +34350,10 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_U uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_read"))) TS_UnsignedChannelUpdate_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = UnsignedChannelUpdate_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33065,9 +34372,10 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUp uint32_t __attribute__((export_name("TS_ChannelUpdate_read"))) TS_ChannelUpdate_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = ChannelUpdate_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33086,9 +34394,10 @@ int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessa uint32_t __attribute__((export_name("TS_ErrorMessage_read"))) TS_ErrorMessage_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = ErrorMessage_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33107,9 +34416,10 @@ int8_tArray __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningM uint32_t __attribute__((export_name("TS_WarningMessage_read"))) TS_WarningMessage_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ"); *ret_conv = WarningMessage_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33128,9 +34438,10 @@ int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) T uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_read"))) TS_UnsignedNodeAnnouncement_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = UnsignedNodeAnnouncement_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33149,18 +34460,20 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAn uint32_t __attribute__((export_name("TS_NodeAnnouncement_read"))) TS_NodeAnnouncement_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = NodeAnnouncement_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } uint32_t __attribute__((export_name("TS_QueryShortChannelIds_read"))) TS_QueryShortChannelIds_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = QueryShortChannelIds_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33191,9 +34504,10 @@ int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_read"))) TS_ReplyShortChannelIdsEnd_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = ReplyShortChannelIdsEnd_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33221,18 +34535,20 @@ int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_Query uint32_t __attribute__((export_name("TS_QueryChannelRange_read"))) TS_QueryChannelRange_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = QueryChannelRange_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } uint32_t __attribute__((export_name("TS_ReplyChannelRange_read"))) TS_ReplyChannelRange_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = ReplyChannelRange_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33263,9 +34579,10 @@ int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_G uint32_t __attribute__((export_name("TS_GossipTimestampFilter_read"))) TS_GossipTimestampFilter_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = GossipTimestampFilter_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -33627,7 +34944,7 @@ ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_Pe LDKCVec_PublicKeyZ ret_var = PeerManager_get_peer_node_ids(&this_arg_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { int8_tArray ret_conv_12_arr = init_int8_tArray(33, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].compressed_form, 33); @@ -33704,9 +35021,10 @@ uint32_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManag LDKSocketDescriptor* peer_descriptor_conv = (LDKSocketDescriptor*)peer_descriptor_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; - data_ref.data = data->elems /* XXX data leaks */; + data_ref.data = data->elems; LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = PeerManager_read_event(&this_arg_conv, peer_descriptor_conv, data_ref); + FREE(data); return (uint32_t)ret_conv; } @@ -33903,9 +35221,10 @@ int8_tArray __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write" uint32_t __attribute__((export_name("TS_CounterpartyCommitmentSecrets_read"))) TS_CounterpartyCommitmentSecrets_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ"); *ret_conv = CounterpartyCommitmentSecrets_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -34154,9 +35473,10 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreati uint32_t __attribute__((export_name("TS_TxCreationKeys_read"))) TS_TxCreationKeys_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = TxCreationKeys_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -34354,9 +35674,10 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_Chann uint32_t __attribute__((export_name("TS_ChannelPublicKeys_read"))) TS_ChannelPublicKeys_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = ChannelPublicKeys_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -34588,9 +35909,10 @@ int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_ uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_read"))) TS_HTLCOutputInCommitment_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = HTLCOutputInCommitment_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -35047,9 +36369,10 @@ int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParame uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_read"))) TS_CounterpartyChannelTransactionParameters_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CounterpartyChannelTransactionParameters_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -35068,9 +36391,10 @@ int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write") uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_read"))) TS_ChannelTransactionParameters_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = ChannelTransactionParameters_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -35189,6 +36513,25 @@ void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart HolderCommitmentTransaction_set_counterparty_sig(&this_ptr_conv, val_ref); } +ptrArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_get_counterparty_htlc_sigs(uint32_t this_ptr) { + LDKHolderCommitmentTransaction this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_SignatureZ ret_var = HolderCommitmentTransaction_get_counterparty_htlc_sigs(&this_ptr_conv); + ptrArray ret_arr = NULL; + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); + int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 8); + for (size_t m = 0; m < ret_var.datalen; m++) { + int8_tArray ret_conv_12_arr = init_int8_tArray(64, __LINE__); + memcpy(ret_conv_12_arr->elems, ret_var.data[m].compact_form, 64); + ret_arr_ptr[m] = ret_conv_12_arr; + } + + FREE(ret_var.data); + return ret_arr; +} + void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs"))) TS_HolderCommitmentTransaction_set_counterparty_htlc_sigs(uint32_t this_ptr, ptrArray val) { LDKHolderCommitmentTransaction this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -35200,7 +36543,7 @@ void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else val_constr.data = NULL; - int8_tArray* val_vals = (void*) val->elems /* XXX val leaks */; + int8_tArray* val_vals = (void*) val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { int8_tArray val_conv_12 = val_vals[m]; LDKSignature val_conv_12_ref; @@ -35208,6 +36551,7 @@ void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); FREE(val_conv_12); val_constr.data[m] = val_conv_12_ref; } + FREE(val); HolderCommitmentTransaction_set_counterparty_htlc_sigs(&this_ptr_conv, val_constr); } @@ -35264,9 +36608,10 @@ int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write")) uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_read"))) TS_HolderCommitmentTransaction_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = HolderCommitmentTransaction_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -35285,7 +36630,7 @@ uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_ counterparty_htlc_sigs_constr.data = MALLOC(counterparty_htlc_sigs_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else counterparty_htlc_sigs_constr.data = NULL; - int8_tArray* counterparty_htlc_sigs_vals = (void*) counterparty_htlc_sigs->elems /* XXX counterparty_htlc_sigs leaks */; + int8_tArray* counterparty_htlc_sigs_vals = (void*) counterparty_htlc_sigs->elems; for (size_t m = 0; m < counterparty_htlc_sigs_constr.datalen; m++) { int8_tArray counterparty_htlc_sigs_conv_12 = counterparty_htlc_sigs_vals[m]; LDKSignature counterparty_htlc_sigs_conv_12_ref; @@ -35293,6 +36638,7 @@ uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_ memcpy(counterparty_htlc_sigs_conv_12_ref.compact_form, counterparty_htlc_sigs_conv_12->elems, 64); FREE(counterparty_htlc_sigs_conv_12); counterparty_htlc_sigs_constr.data[m] = counterparty_htlc_sigs_conv_12_ref; } + FREE(counterparty_htlc_sigs); LDKPublicKey holder_funding_key_ref; CHECK(holder_funding_key->arr_len == 33); memcpy(holder_funding_key_ref.compressed_form, holder_funding_key->elems, 33); FREE(holder_funding_key); @@ -35439,9 +36785,10 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_read"))) TS_BuiltCommitmentTransaction_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = BuiltCommitmentTransaction_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -35452,9 +36799,10 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sigha CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; - funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + funding_redeemscript_ref.data = funding_redeemscript->elems; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, BuiltCommitmentTransaction_get_sighash_all(&this_arg_conv, funding_redeemscript_ref, channel_value_satoshis).data, 32); + FREE(funding_redeemscript); return ret_arr; } @@ -35469,9 +36817,10 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) unsigned char (*funding_key_ref)[32] = &funding_key_arr; LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; - funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + funding_redeemscript_ref.data = funding_redeemscript->elems; int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, BuiltCommitmentTransaction_sign(&this_arg_conv, funding_key_ref, funding_redeemscript_ref, channel_value_satoshis).compact_form, 64); + FREE(funding_redeemscript); return ret_arr; } @@ -35655,9 +37004,10 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_get_sighas CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; - funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + funding_redeemscript_ref.data = funding_redeemscript->elems; int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, TrustedClosingTransaction_get_sighash_all(&this_arg_conv, funding_redeemscript_ref, channel_value_satoshis).data, 32); + FREE(funding_redeemscript); return ret_arr; } @@ -35672,9 +37022,10 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) T unsigned char (*funding_key_ref)[32] = &funding_key_arr; LDKu8slice funding_redeemscript_ref; funding_redeemscript_ref.datalen = funding_redeemscript->arr_len; - funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + funding_redeemscript_ref.data = funding_redeemscript->elems; int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, TrustedClosingTransaction_sign(&this_arg_conv, funding_key_ref, funding_redeemscript_ref, channel_value_satoshis).compact_form, 64); + FREE(funding_redeemscript); return ret_arr; } @@ -35739,9 +37090,10 @@ int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_C uint32_t __attribute__((export_name("TS_CommitmentTransaction_read"))) TS_CommitmentTransaction_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CommitmentTransaction_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -36395,9 +37747,10 @@ int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatur uint32_t __attribute__((export_name("TS_InitFeatures_read"))) TS_InitFeatures_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = InitFeatures_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -36416,9 +37769,10 @@ int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_Channel uint32_t __attribute__((export_name("TS_ChannelFeatures_read"))) TS_ChannelFeatures_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = ChannelFeatures_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -36437,9 +37791,10 @@ int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatur uint32_t __attribute__((export_name("TS_NodeFeatures_read"))) TS_NodeFeatures_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = NodeFeatures_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -36458,9 +37813,10 @@ int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_Invoice uint32_t __attribute__((export_name("TS_InvoiceFeatures_read"))) TS_InvoiceFeatures_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = InvoiceFeatures_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -36479,9 +37835,10 @@ int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_Cha uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_read"))) TS_ChannelTypeFeatures_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = ChannelTypeFeatures_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -37711,9 +39068,10 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_Shutdown uint32_t __attribute__((export_name("TS_ShutdownScript_read"))) TS_ShutdownScript_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = ShutdownScript_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -37755,9 +39113,10 @@ uint32_t __attribute__((export_name("TS_ShutdownScript_new_witness_program"))) LDKu8slice program_ref; program_ref.datalen = program->arr_len; - program_ref.data = program->elems /* XXX program leaks */; + program_ref.data = program->elems; LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = ShutdownScript_new_witness_program((LDKWitnessVersion){ ._0 = version }, program_ref); + FREE(program); return (uint32_t)ret_conv; } @@ -37934,9 +39293,10 @@ int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uin uint32_t __attribute__((export_name("TS_NodeId_read"))) TS_NodeId_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = NodeId_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -38026,9 +39386,10 @@ int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUp uint32_t __attribute__((export_name("TS_NetworkUpdate_read"))) TS_NetworkUpdate_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = NetworkUpdate_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -38200,27 +39561,21 @@ void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_minimum_msat"))) ChannelUpdateInfo_set_htlc_minimum_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_maximum_msat"))) TS_ChannelUpdateInfo_get_htlc_maximum_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_maximum_msat"))) TS_ChannelUpdateInfo_get_htlc_maximum_msat(uint32_t this_ptr) { LDKChannelUpdateInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); - *ret_copy = ChannelUpdateInfo_get_htlc_maximum_msat(&this_ptr_conv); - uint32_t ret_ref = (uintptr_t)ret_copy; - return ret_ref; + int64_t ret_conv = ChannelUpdateInfo_get_htlc_maximum_msat(&this_ptr_conv); + return ret_conv; } -void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_maximum_msat"))) TS_ChannelUpdateInfo_set_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) { +void __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_maximum_msat"))) TS_ChannelUpdateInfo_set_htlc_maximum_msat(uint32_t this_ptr, int64_t val) { LDKChannelUpdateInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - void* val_ptr = (void*)(((uintptr_t)val) & ~1); - CHECK_ACCESS(val_ptr); - LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr); - val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); - ChannelUpdateInfo_set_htlc_maximum_msat(&this_ptr_conv, val_conv); + ChannelUpdateInfo_set_htlc_maximum_msat(&this_ptr_conv, val); } uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_get_fees"))) TS_ChannelUpdateInfo_get_fees(uint32_t this_ptr) { @@ -38285,11 +39640,7 @@ void __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update_message") ChannelUpdateInfo_set_last_update_message(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpdateInfo_new(int32_t last_update_arg, jboolean enabled_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, uint32_t htlc_maximum_msat_arg, uint32_t fees_arg, uint32_t last_update_message_arg) { - void* htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)htlc_maximum_msat_arg) & ~1); - CHECK_ACCESS(htlc_maximum_msat_arg_ptr); - LDKCOption_u64Z htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_arg_ptr); - htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat_arg) & ~1)); +uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpdateInfo_new(int32_t last_update_arg, jboolean enabled_arg, int16_t cltv_expiry_delta_arg, int64_t htlc_minimum_msat_arg, int64_t htlc_maximum_msat_arg, uint32_t fees_arg, uint32_t last_update_message_arg) { LDKRoutingFees fees_arg_conv; fees_arg_conv.inner = (void*)(fees_arg & (~1)); fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0); @@ -38300,7 +39651,7 @@ uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpd last_update_message_arg_conv.is_owned = (last_update_message_arg & 1) || (last_update_message_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(last_update_message_arg_conv); last_update_message_arg_conv = ChannelUpdate_clone(&last_update_message_arg_conv); - LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg_conv, fees_arg_conv, last_update_message_arg_conv); + LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg, fees_arg_conv, last_update_message_arg_conv); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -38365,9 +39716,10 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_Chann uint32_t __attribute__((export_name("TS_ChannelUpdateInfo_read"))) TS_ChannelUpdateInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ"); *ret_conv = ChannelUpdateInfo_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -38660,9 +40012,10 @@ int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo uint32_t __attribute__((export_name("TS_ChannelInfo_read"))) TS_ChannelInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = ChannelInfo_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -38811,9 +40164,13 @@ uint32_t __attribute__((export_name("TS_EffectiveCapacity_maximum_htlc"))) TS_E return ret_ref; } -uint32_t __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat) { +uint32_t __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat, uint32_t htlc_maximum_msat) { + void* htlc_maximum_msat_ptr = (void*)(((uintptr_t)htlc_maximum_msat) & ~1); + CHECK_ACCESS(htlc_maximum_msat_ptr); + LDKCOption_u64Z htlc_maximum_msat_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_ptr); + htlc_maximum_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat) & ~1)); LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity"); - *ret_copy = EffectiveCapacity_total(capacity_msat); + *ret_copy = EffectiveCapacity_total(capacity_msat, htlc_maximum_msat_conv); uint32_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -38968,9 +40325,10 @@ int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees uint32_t __attribute__((export_name("TS_RoutingFees_read"))) TS_RoutingFees_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = RoutingFees_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -39050,25 +40408,54 @@ void __attribute__((export_name("TS_NodeAnnouncementInfo_set_rgb"))) TS_NodeAnn NodeAnnouncementInfo_set_rgb(&this_ptr_conv, val_ref); } -int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint32_t this_ptr) { +uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint32_t this_ptr) { LDKNodeAnnouncementInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - int8_tArray ret_arr = init_int8_tArray(32, __LINE__); - memcpy(ret_arr->elems, *NodeAnnouncementInfo_get_alias(&this_ptr_conv), 32); - return ret_arr; + LDKNodeAlias ret_var = NodeAnnouncementInfo_get_alias(&this_ptr_conv); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; } -void __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint32_t this_ptr, int8_tArray val) { +void __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint32_t this_ptr, uint32_t val) { LDKNodeAnnouncementInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - LDKThirtyTwoBytes val_ref; - CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); FREE(val); - NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_ref); + LDKNodeAlias val_conv; + val_conv.inner = (void*)(val & (~1)); + val_conv.is_owned = (val & 1) || (val == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv); + val_conv = NodeAlias_clone(&val_conv); + NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_conv); +} + +uint32_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_addresses"))) TS_NodeAnnouncementInfo_get_addresses(uint32_t this_ptr) { + LDKNodeAnnouncementInfo this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_NetAddressZ ret_var = NodeAnnouncementInfo_get_addresses(&this_ptr_conv); + uint32_tArray ret_arr = NULL; + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + for (size_t m = 0; m < ret_var.datalen; m++) { + LDKNetAddress *ret_conv_12_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); + *ret_conv_12_copy = ret_var.data[m]; + uint32_t ret_conv_12_ref = (uintptr_t)ret_conv_12_copy; + ret_arr_ptr[m] = ret_conv_12_ref; + } + + FREE(ret_var.data); + return ret_arr; } void __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_NodeAnnouncementInfo_set_addresses(uint32_t this_ptr, uint32_tArray val) { @@ -39082,7 +40469,7 @@ void __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_N val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { uint32_t val_conv_12 = val_vals[m]; void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); @@ -39091,6 +40478,7 @@ void __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_N val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); val_constr.data[m] = val_conv_12_conv; } + FREE(val); NodeAnnouncementInfo_set_addresses(&this_ptr_conv, val_constr); } @@ -39126,7 +40514,7 @@ void __attribute__((export_name("TS_NodeAnnouncementInfo_set_announcement_messa NodeAnnouncementInfo_set_announcement_message(&this_ptr_conv, val_conv); } -uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint32_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, int8_tArray alias_arg, uint32_tArray addresses_arg, uint32_t announcement_message_arg) { +uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint32_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, uint32_t alias_arg, uint32_tArray addresses_arg, uint32_t announcement_message_arg) { LDKNodeFeatures features_arg_conv; features_arg_conv.inner = (void*)(features_arg & (~1)); features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); @@ -39135,16 +40523,18 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn LDKThreeBytes rgb_arg_ref; CHECK(rgb_arg->arr_len == 3); memcpy(rgb_arg_ref.data, rgb_arg->elems, 3); FREE(rgb_arg); - LDKThirtyTwoBytes alias_arg_ref; - CHECK(alias_arg->arr_len == 32); - memcpy(alias_arg_ref.data, alias_arg->elems, 32); FREE(alias_arg); + LDKNodeAlias alias_arg_conv; + alias_arg_conv.inner = (void*)(alias_arg & (~1)); + alias_arg_conv.is_owned = (alias_arg & 1) || (alias_arg == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(alias_arg_conv); + alias_arg_conv = NodeAlias_clone(&alias_arg_conv); LDKCVec_NetAddressZ addresses_arg_constr; addresses_arg_constr.datalen = addresses_arg->arr_len; if (addresses_arg_constr.datalen > 0) addresses_arg_constr.data = MALLOC(addresses_arg_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else addresses_arg_constr.data = NULL; - uint32_t* addresses_arg_vals = addresses_arg->elems /* XXX addresses_arg leaks */; + uint32_t* addresses_arg_vals = addresses_arg->elems; for (size_t m = 0; m < addresses_arg_constr.datalen; m++) { uint32_t addresses_arg_conv_12 = addresses_arg_vals[m]; void* addresses_arg_conv_12_ptr = (void*)(((uintptr_t)addresses_arg_conv_12) & ~1); @@ -39152,12 +40542,13 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn LDKNetAddress addresses_arg_conv_12_conv = *(LDKNetAddress*)(addresses_arg_conv_12_ptr); addresses_arg_constr.data[m] = addresses_arg_conv_12_conv; } + FREE(addresses_arg); LDKNodeAnnouncement announcement_message_arg_conv; announcement_message_arg_conv.inner = (void*)(announcement_message_arg & (~1)); announcement_message_arg_conv.is_owned = (announcement_message_arg & 1) || (announcement_message_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(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); + LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_ref, alias_arg_conv, addresses_arg_constr, announcement_message_arg_conv); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -39222,9 +40613,115 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_No uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_read"))) TS_NodeAnnouncementInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = NodeAnnouncementInfo_read(ser_ref); + FREE(ser); + return (uint32_t)ret_conv; +} + +void __attribute__((export_name("TS_NodeAlias_free"))) TS_NodeAlias_free(uint32_t this_obj) { + LDKNodeAlias this_obj_conv; + this_obj_conv.inner = (void*)(this_obj & (~1)); + this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv); + NodeAlias_free(this_obj_conv); +} + +int8_tArray __attribute__((export_name("TS_NodeAlias_get_a"))) TS_NodeAlias_get_a(uint32_t this_ptr) { + LDKNodeAlias this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); + memcpy(ret_arr->elems, *NodeAlias_get_a(&this_ptr_conv), 32); + return ret_arr; +} + +void __attribute__((export_name("TS_NodeAlias_set_a"))) TS_NodeAlias_set_a(uint32_t this_ptr, int8_tArray val) { + LDKNodeAlias this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKThirtyTwoBytes val_ref; + CHECK(val->arr_len == 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); + NodeAlias_set_a(&this_ptr_conv, val_ref); +} + +uint32_t __attribute__((export_name("TS_NodeAlias_new"))) TS_NodeAlias_new(int8_tArray a_arg) { + LDKThirtyTwoBytes a_arg_ref; + CHECK(a_arg->arr_len == 32); + memcpy(a_arg_ref.data, a_arg->elems, 32); FREE(a_arg); + LDKNodeAlias ret_var = NodeAlias_new(a_arg_ref); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + +static inline uintptr_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg) { + LDKNodeAlias ret_var = NodeAlias_clone(arg); +uint32_t ret_ref = 0; +CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. +CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); +ret_ref = (uintptr_t)ret_var.inner; +if (ret_var.is_owned) { + ret_ref |= 1; +} + return ret_ref; +} +uint32_t __attribute__((export_name("TS_NodeAlias_clone_ptr"))) TS_NodeAlias_clone_ptr(uint32_t arg) { + LDKNodeAlias arg_conv; + arg_conv.inner = (void*)(arg & (~1)); + arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); + uint32_t ret_conv = NodeAlias_clone_ptr(&arg_conv); + return ret_conv; +} + +uint32_t __attribute__((export_name("TS_NodeAlias_clone"))) TS_NodeAlias_clone(uint32_t orig) { + LDKNodeAlias orig_conv; + orig_conv.inner = (void*)(orig & (~1)); + orig_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); + LDKNodeAlias ret_var = NodeAlias_clone(&orig_conv); + uint32_t ret_ref = 0; + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + return ret_ref; +} + +int8_tArray __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_write(uint32_t obj) { + LDKNodeAlias obj_conv; + obj_conv.inner = (void*)(obj & (~1)); + obj_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); + LDKCVec_u8Z ret_var = NodeAlias_write(&obj_conv); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); + memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); + CVec_u8Z_free(ret_var); + return ret_arr; +} + +uint32_t __attribute__((export_name("TS_NodeAlias_read"))) TS_NodeAlias_read(int8_tArray ser) { + LDKu8slice ser_ref; + ser_ref.datalen = ser->arr_len; + ser_ref.data = ser->elems; + LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ"); + *ret_conv = NodeAlias_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -39236,6 +40733,24 @@ void __attribute__((export_name("TS_NodeInfo_free"))) TS_NodeInfo_free(uint32_t NodeInfo_free(this_obj_conv); } +int64_tArray __attribute__((export_name("TS_NodeInfo_get_channels"))) TS_NodeInfo_get_channels(uint32_t this_ptr) { + LDKNodeInfo this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_u64Z ret_var = NodeInfo_get_channels(&this_ptr_conv); + int64_tArray ret_arr = NULL; + ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); + int64_t *ret_arr_ptr = (int64_t*)(((uint8_t*)ret_arr) + 8); + for (size_t i = 0; i < ret_var.datalen; i++) { + int64_t ret_conv_8_conv = ret_var.data[i]; + ret_arr_ptr[i] = ret_conv_8_conv; + } + + FREE(ret_var.data); + return ret_arr; +} + void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_channels(uint32_t this_ptr, int64_tArray val) { LDKNodeInfo this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -39247,11 +40762,12 @@ void __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_c val_constr.data = MALLOC(val_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); else val_constr.data = NULL; - int64_t* val_vals = val->elems /* XXX val leaks */; + int64_t* val_vals = val->elems; for (size_t i = 0; i < val_constr.datalen; i++) { int64_t val_conv_8 = val_vals[i]; val_constr.data[i] = val_conv_8; } + FREE(val); NodeInfo_set_channels(&this_ptr_conv, val_constr); } @@ -39326,11 +40842,12 @@ uint32_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_ channels_arg_constr.data = MALLOC(channels_arg_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); else channels_arg_constr.data = NULL; - int64_t* channels_arg_vals = channels_arg->elems /* XXX channels_arg leaks */; + int64_t* channels_arg_vals = channels_arg->elems; for (size_t i = 0; i < channels_arg_constr.datalen; i++) { int64_t channels_arg_conv_8 = channels_arg_vals[i]; channels_arg_constr.data[i] = channels_arg_conv_8; } + FREE(channels_arg); 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); @@ -39406,9 +40923,10 @@ int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write uint32_t __attribute__((export_name("TS_NodeInfo_read"))) TS_NodeInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = NodeInfo_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -39427,7 +40945,7 @@ int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGra uint32_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser, uint32_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); CHECK_ACCESS(arg_ptr); LDKLogger arg_conv = *(LDKLogger*)(arg_ptr); @@ -39437,6 +40955,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_r } LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = NetworkGraph_read(ser_ref, arg_conv); + FREE(ser); return (uint32_t)ret_conv; } @@ -39653,6 +41172,92 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned")) return (uint32_t)ret_conv; } +uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_channel"))) TS_ReadOnlyNetworkGraph_channel(uint32_t this_arg, int64_t short_channel_id) { + LDKReadOnlyNetworkGraph this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKChannelInfo ret_var = ReadOnlyNetworkGraph_channel(&this_arg_conv, short_channel_id); + uint32_t ret_ref = 0; + if ((uintptr_t)ret_var.inner > 4096) { + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + } + return ret_ref; +} + +int64_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_channels"))) TS_ReadOnlyNetworkGraph_list_channels(uint32_t this_arg) { + LDKReadOnlyNetworkGraph this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKCVec_u64Z ret_var = ReadOnlyNetworkGraph_list_channels(&this_arg_conv); + int64_tArray ret_arr = NULL; + ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); + int64_t *ret_arr_ptr = (int64_t*)(((uint8_t*)ret_arr) + 8); + for (size_t i = 0; i < ret_var.datalen; i++) { + int64_t ret_conv_8_conv = ret_var.data[i]; + ret_arr_ptr[i] = ret_conv_8_conv; + } + + FREE(ret_var.data); + return ret_arr; +} + +uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_node"))) TS_ReadOnlyNetworkGraph_node(uint32_t this_arg, uint32_t node_id) { + LDKReadOnlyNetworkGraph this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKNodeId node_id_conv; + node_id_conv.inner = (void*)(node_id & (~1)); + node_id_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + LDKNodeInfo ret_var = ReadOnlyNetworkGraph_node(&this_arg_conv, &node_id_conv); + uint32_t ret_ref = 0; + if ((uintptr_t)ret_var.inner > 4096) { + CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); + ret_ref = (uintptr_t)ret_var.inner; + if (ret_var.is_owned) { + ret_ref |= 1; + } + } + return ret_ref; +} + +uint32_tArray __attribute__((export_name("TS_ReadOnlyNetworkGraph_list_nodes"))) TS_ReadOnlyNetworkGraph_list_nodes(uint32_t this_arg) { + LDKReadOnlyNetworkGraph this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKCVec_NodeIdZ ret_var = ReadOnlyNetworkGraph_list_nodes(&this_arg_conv); + uint32_tArray ret_arr = NULL; + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); + for (size_t i = 0; i < ret_var.datalen; i++) { + LDKNodeId ret_conv_8_var = ret_var.data[i]; + uint32_t ret_conv_8_ref = 0; + CHECK((((uintptr_t)ret_conv_8_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_8_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_8_var); + ret_conv_8_ref = (uintptr_t)ret_conv_8_var.inner; + if (ret_conv_8_var.is_owned) { + ret_conv_8_ref |= 1; + } + ret_arr_ptr[i] = ret_conv_8_ref; + } + + FREE(ret_var.data); + return ret_arr; +} + uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) TS_ReadOnlyNetworkGraph_get_addresses(uint32_t this_arg, int8_tArray pubkey) { LDKReadOnlyNetworkGraph this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); @@ -39908,9 +41513,10 @@ int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write uint32_t __attribute__((export_name("TS_RouteHop_read"))) TS_RouteHop_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = RouteHop_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -39930,12 +41536,12 @@ ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths( LDKCVec_CVec_RouteHopZZ ret_var = Route_get_paths(&this_ptr_conv); ptrArray ret_arr = NULL; ret_arr = init_ptrArray(ret_var.datalen, __LINE__); - uint32_tArray *ret_arr_ptr = (uint32_tArray*)(((uint8_t*)ret_arr) + 4); + uint32_tArray *ret_arr_ptr = (uint32_tArray*)(((uint8_t*)ret_arr) + 8); for (size_t m = 0; m < ret_var.datalen; m++) { LDKCVec_RouteHopZ ret_conv_12_var = ret_var.data[m]; uint32_tArray ret_conv_12_arr = NULL; ret_conv_12_arr = init_uint32_tArray(ret_conv_12_var.datalen, __LINE__); - uint32_t *ret_conv_12_arr_ptr = (uint32_t*)(((uint8_t*)ret_conv_12_arr) + 4); + uint32_t *ret_conv_12_arr_ptr = (uint32_t*)(((uint8_t*)ret_conv_12_arr) + 8); for (size_t k = 0; k < ret_conv_12_var.datalen; k++) { LDKRouteHop ret_conv_12_conv_10_var = ret_conv_12_var.data[k]; uint32_t ret_conv_12_conv_10_ref = 0; @@ -39968,7 +41574,7 @@ void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKCVec_RouteHopZ), "LDKCVec_CVec_RouteHopZZ Elements"); else val_constr.data = NULL; - uint32_tArray* val_vals = (void*) val->elems /* XXX val leaks */; + uint32_tArray* val_vals = (void*) val->elems; for (size_t m = 0; m < val_constr.datalen; m++) { uint32_tArray val_conv_12 = val_vals[m]; LDKCVec_RouteHopZ val_conv_12_constr; @@ -39977,7 +41583,7 @@ void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint val_conv_12_constr.data = MALLOC(val_conv_12_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else val_conv_12_constr.data = NULL; - uint32_t* val_conv_12_vals = val_conv_12->elems /* XXX val_conv_12 leaks */; + uint32_t* val_conv_12_vals = val_conv_12->elems; for (size_t k = 0; k < val_conv_12_constr.datalen; k++) { uint32_t val_conv_12_conv_10 = val_conv_12_vals[k]; LDKRouteHop val_conv_12_conv_10_conv; @@ -39987,8 +41593,10 @@ void __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint val_conv_12_conv_10_conv = RouteHop_clone(&val_conv_12_conv_10_conv); val_conv_12_constr.data[k] = val_conv_12_conv_10_conv; } + FREE(val_conv_12); val_constr.data[m] = val_conv_12_constr; } + FREE(val); Route_set_paths(&this_ptr_conv, val_constr); } @@ -40031,7 +41639,7 @@ uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat paths_arg_constr.data = MALLOC(paths_arg_constr.datalen * sizeof(LDKCVec_RouteHopZ), "LDKCVec_CVec_RouteHopZZ Elements"); else paths_arg_constr.data = NULL; - uint32_tArray* paths_arg_vals = (void*) paths_arg->elems /* XXX paths_arg leaks */; + uint32_tArray* paths_arg_vals = (void*) paths_arg->elems; for (size_t m = 0; m < paths_arg_constr.datalen; m++) { uint32_tArray paths_arg_conv_12 = paths_arg_vals[m]; LDKCVec_RouteHopZ paths_arg_conv_12_constr; @@ -40040,7 +41648,7 @@ uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat paths_arg_conv_12_constr.data = MALLOC(paths_arg_conv_12_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements"); else paths_arg_conv_12_constr.data = NULL; - uint32_t* paths_arg_conv_12_vals = paths_arg_conv_12->elems /* XXX paths_arg_conv_12 leaks */; + uint32_t* paths_arg_conv_12_vals = paths_arg_conv_12->elems; for (size_t k = 0; k < paths_arg_conv_12_constr.datalen; k++) { uint32_t paths_arg_conv_12_conv_10 = paths_arg_conv_12_vals[k]; LDKRouteHop paths_arg_conv_12_conv_10_conv; @@ -40050,8 +41658,10 @@ uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat paths_arg_conv_12_conv_10_conv = RouteHop_clone(&paths_arg_conv_12_conv_10_conv); paths_arg_conv_12_constr.data[k] = paths_arg_conv_12_conv_10_conv; } + FREE(paths_arg_conv_12); paths_arg_constr.data[m] = paths_arg_conv_12_constr; } + FREE(paths_arg); LDKPaymentParameters payment_params_arg_conv; payment_params_arg_conv.inner = (void*)(payment_params_arg & (~1)); payment_params_arg_conv.is_owned = (payment_params_arg & 1) || (payment_params_arg == 0); @@ -40162,9 +41772,10 @@ int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint3 uint32_t __attribute__((export_name("TS_Route_read"))) TS_Route_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = Route_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -40311,9 +41922,10 @@ int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RoutePa uint32_t __attribute__((export_name("TS_RouteParameters_read"))) TS_RouteParameters_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = RouteParameters_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -40386,7 +41998,7 @@ uint32_tArray __attribute__((export_name("TS_PaymentParameters_get_route_hints" LDKCVec_RouteHintZ ret_var = PaymentParameters_get_route_hints(&this_ptr_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t l = 0; l < ret_var.datalen; l++) { LDKRouteHint ret_conv_11_var = ret_var.data[l]; uint32_t ret_conv_11_ref = 0; @@ -40415,7 +42027,7 @@ void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_Pa val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t l = 0; l < val_constr.datalen; l++) { uint32_t val_conv_11 = val_vals[l]; LDKRouteHint val_conv_11_conv; @@ -40425,6 +42037,7 @@ void __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_Pa val_conv_11_conv = RouteHint_clone(&val_conv_11_conv); val_constr.data[l] = val_conv_11_conv; } + FREE(val); PaymentParameters_set_route_hints(&this_ptr_conv, val_constr); } @@ -40468,7 +42081,79 @@ void __attribute__((export_name("TS_PaymentParameters_set_max_total_cltv_expiry PaymentParameters_set_max_total_cltv_expiry_delta(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint32_t features_arg, uint32_tArray route_hints_arg, uint32_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg) { +int8_t __attribute__((export_name("TS_PaymentParameters_get_max_path_count"))) TS_PaymentParameters_get_max_path_count(uint32_t this_ptr) { + LDKPaymentParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + int8_t ret_conv = PaymentParameters_get_max_path_count(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_PaymentParameters_set_max_path_count"))) TS_PaymentParameters_set_max_path_count(uint32_t this_ptr, int8_t val) { + LDKPaymentParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + PaymentParameters_set_max_path_count(&this_ptr_conv, val); +} + +int8_t __attribute__((export_name("TS_PaymentParameters_get_max_channel_saturation_power_of_half"))) TS_PaymentParameters_get_max_channel_saturation_power_of_half(uint32_t this_ptr) { + LDKPaymentParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + int8_t ret_conv = PaymentParameters_get_max_channel_saturation_power_of_half(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_PaymentParameters_set_max_channel_saturation_power_of_half"))) TS_PaymentParameters_set_max_channel_saturation_power_of_half(uint32_t this_ptr, int8_t val) { + LDKPaymentParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + PaymentParameters_set_max_channel_saturation_power_of_half(&this_ptr_conv, val); +} + +int64_tArray __attribute__((export_name("TS_PaymentParameters_get_previously_failed_channels"))) TS_PaymentParameters_get_previously_failed_channels(uint32_t this_ptr) { + LDKPaymentParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_u64Z ret_var = PaymentParameters_get_previously_failed_channels(&this_ptr_conv); + int64_tArray ret_arr = NULL; + ret_arr = init_int64_tArray(ret_var.datalen, __LINE__); + int64_t *ret_arr_ptr = (int64_t*)(((uint8_t*)ret_arr) + 8); + for (size_t i = 0; i < ret_var.datalen; i++) { + int64_t ret_conv_8_conv = ret_var.data[i]; + ret_arr_ptr[i] = ret_conv_8_conv; + } + + FREE(ret_var.data); + return ret_arr; +} + +void __attribute__((export_name("TS_PaymentParameters_set_previously_failed_channels"))) TS_PaymentParameters_set_previously_failed_channels(uint32_t this_ptr, int64_tArray val) { + LDKPaymentParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + LDKCVec_u64Z val_constr; + val_constr.datalen = val->arr_len; + if (val_constr.datalen > 0) + val_constr.data = MALLOC(val_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); + else + val_constr.data = NULL; + int64_t* val_vals = val->elems; + for (size_t i = 0; i < val_constr.datalen; i++) { + int64_t val_conv_8 = val_vals[i]; + val_constr.data[i] = val_conv_8; + } + FREE(val); + PaymentParameters_set_previously_failed_channels(&this_ptr_conv, val_constr); +} + +uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint32_t features_arg, uint32_tArray route_hints_arg, uint32_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg, int8_t max_path_count_arg, int8_t max_channel_saturation_power_of_half_arg, int64_tArray previously_failed_channels_arg) { LDKPublicKey payee_pubkey_arg_ref; CHECK(payee_pubkey_arg->arr_len == 33); memcpy(payee_pubkey_arg_ref.compressed_form, payee_pubkey_arg->elems, 33); FREE(payee_pubkey_arg); @@ -40483,7 +42168,7 @@ uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar route_hints_arg_constr.data = MALLOC(route_hints_arg_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else route_hints_arg_constr.data = NULL; - uint32_t* route_hints_arg_vals = route_hints_arg->elems /* XXX route_hints_arg leaks */; + uint32_t* route_hints_arg_vals = route_hints_arg->elems; for (size_t l = 0; l < route_hints_arg_constr.datalen; l++) { uint32_t route_hints_arg_conv_11 = route_hints_arg_vals[l]; LDKRouteHint route_hints_arg_conv_11_conv; @@ -40493,11 +42178,24 @@ uint32_t __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar route_hints_arg_conv_11_conv = RouteHint_clone(&route_hints_arg_conv_11_conv); route_hints_arg_constr.data[l] = route_hints_arg_conv_11_conv; } + FREE(route_hints_arg); void* expiry_time_arg_ptr = (void*)(((uintptr_t)expiry_time_arg) & ~1); CHECK_ACCESS(expiry_time_arg_ptr); LDKCOption_u64Z expiry_time_arg_conv = *(LDKCOption_u64Z*)(expiry_time_arg_ptr); expiry_time_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)expiry_time_arg) & ~1)); - LDKPaymentParameters ret_var = PaymentParameters_new(payee_pubkey_arg_ref, features_arg_conv, route_hints_arg_constr, expiry_time_arg_conv, max_total_cltv_expiry_delta_arg); + LDKCVec_u64Z previously_failed_channels_arg_constr; + previously_failed_channels_arg_constr.datalen = previously_failed_channels_arg->arr_len; + if (previously_failed_channels_arg_constr.datalen > 0) + previously_failed_channels_arg_constr.data = MALLOC(previously_failed_channels_arg_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); + else + previously_failed_channels_arg_constr.data = NULL; + int64_t* previously_failed_channels_arg_vals = previously_failed_channels_arg->elems; + for (size_t i = 0; i < previously_failed_channels_arg_constr.datalen; i++) { + int64_t previously_failed_channels_arg_conv_8 = previously_failed_channels_arg_vals[i]; + previously_failed_channels_arg_constr.data[i] = previously_failed_channels_arg_conv_8; + } + FREE(previously_failed_channels_arg); + LDKPaymentParameters ret_var = PaymentParameters_new(payee_pubkey_arg_ref, features_arg_conv, route_hints_arg_constr, expiry_time_arg_conv, max_total_cltv_expiry_delta_arg, max_path_count_arg, max_channel_saturation_power_of_half_arg, previously_failed_channels_arg_constr); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. @@ -40584,9 +42282,10 @@ int8_tArray __attribute__((export_name("TS_PaymentParameters_write"))) TS_Payme uint32_t __attribute__((export_name("TS_PaymentParameters_read"))) TS_PaymentParameters_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ"); *ret_conv = PaymentParameters_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -40638,7 +42337,7 @@ uint32_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_g LDKCVec_RouteHintHopZ ret_var = RouteHint_get_a(&this_ptr_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKRouteHintHop ret_conv_14_var = ret_var.data[o]; uint32_t ret_conv_14_ref = 0; @@ -40667,7 +42366,7 @@ void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems /* XXX val leaks */; + uint32_t* val_vals = val->elems; for (size_t o = 0; o < val_constr.datalen; o++) { uint32_t val_conv_14 = val_vals[o]; LDKRouteHintHop val_conv_14_conv; @@ -40677,6 +42376,7 @@ void __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint val_conv_14_conv = RouteHintHop_clone(&val_conv_14_conv); val_constr.data[o] = val_conv_14_conv; } + FREE(val); RouteHint_set_a(&this_ptr_conv, val_constr); } @@ -40687,7 +42387,7 @@ uint32_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint a_arg_constr.data = MALLOC(a_arg_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements"); else a_arg_constr.data = NULL; - uint32_t* a_arg_vals = a_arg->elems /* XXX a_arg leaks */; + uint32_t* a_arg_vals = a_arg->elems; for (size_t o = 0; o < a_arg_constr.datalen; o++) { uint32_t a_arg_conv_14 = a_arg_vals[o]; LDKRouteHintHop a_arg_conv_14_conv; @@ -40697,6 +42397,7 @@ uint32_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint a_arg_conv_14_conv = RouteHintHop_clone(&a_arg_conv_14_conv); a_arg_constr.data[o] = a_arg_conv_14_conv; } + FREE(a_arg); LDKRouteHint ret_var = RouteHint_new(a_arg_constr); uint32_t ret_ref = 0; CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. @@ -40784,9 +42485,10 @@ int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_wri uint32_t __attribute__((export_name("TS_RouteHint_read"))) TS_RouteHint_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = RouteHint_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -41033,9 +42735,10 @@ int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintH uint32_t __attribute__((export_name("TS_RouteHintHop_read"))) TS_RouteHintHop_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = RouteHintHop_read(ser_ref); + FREE(ser); return (uint32_t)ret_conv; } @@ -41059,7 +42762,7 @@ uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra first_hops_constr.data = MALLOC(first_hops_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements"); else first_hops_constr.data = NULL; - uint32_t* first_hops_vals = first_hops->elems /* XXX first_hops leaks */; + uint32_t* first_hops_vals = first_hops->elems; for (size_t q = 0; q < first_hops_constr.datalen; q++) { uint32_t first_hops_conv_16 = first_hops_vals[q]; LDKChannelDetails first_hops_conv_16_conv; @@ -41068,6 +42771,7 @@ uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv); first_hops_constr.data[q] = first_hops_conv_16_conv; } + FREE(first_hops); first_hops_ptr = &first_hops_constr; } void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); @@ -41100,7 +42804,7 @@ uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_rout hops_constr.data = MALLOC(hops_constr.datalen * sizeof(LDKPublicKey), "LDKCVec_PublicKeyZ Elements"); else hops_constr.data = NULL; - int8_tArray* hops_vals = (void*) hops->elems /* XXX hops leaks */; + int8_tArray* hops_vals = (void*) hops->elems; for (size_t m = 0; m < hops_constr.datalen; m++) { int8_tArray hops_conv_12 = hops_vals[m]; LDKPublicKey hops_conv_12_ref; @@ -41108,6 +42812,7 @@ uint32_t __attribute__((export_name("TS_build_route_from_hops"))) TS_build_rout memcpy(hops_conv_12_ref.compressed_form, hops_conv_12->elems, 33); FREE(hops_conv_12); hops_constr.data[m] = hops_conv_12_ref; } + FREE(hops); LDKRouteParameters route_params_conv; route_params_conv.inner = (void*)(route_params & (~1)); route_params_conv.is_owned = false; @@ -41394,9 +43099,10 @@ int8_tArray __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_Fixe uint32_t __attribute__((export_name("TS_FixedPenaltyScorer_read"))) TS_FixedPenaltyScorer_read(int8_tArray ser, int64_t arg) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ"); *ret_conv = FixedPenaltyScorer_read(ser_ref, arg); + FREE(ser); return (uint32_t)ret_conv; } @@ -41433,6 +43139,23 @@ void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_pen ProbabilisticScoringParameters_set_base_penalty_msat(&this_ptr_conv, val); } +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(uint32_t this_ptr) { + LDKProbabilisticScoringParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + int64_t ret_conv = ProbabilisticScoringParameters_get_base_penalty_amount_multiplier_msat(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(uint32_t this_ptr, int64_t val) { + LDKProbabilisticScoringParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + ProbabilisticScoringParameters_set_base_penalty_amount_multiplier_msat(&this_ptr_conv, val); +} + int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(uint32_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); @@ -41467,34 +43190,55 @@ void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidit ProbabilisticScoringParameters_set_liquidity_offset_half_life(&this_ptr_conv, val); } -int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_amount_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_amount_penalty_multiplier_msat(uint32_t this_ptr) { +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(uint32_t this_ptr) { LDKProbabilisticScoringParameters this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - int64_t ret_conv = ProbabilisticScoringParameters_get_amount_penalty_multiplier_msat(&this_ptr_conv); + int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_penalty_amount_multiplier_msat(&this_ptr_conv); return ret_conv; } -void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_amount_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_amount_penalty_multiplier_msat(uint32_t this_ptr, int64_t val) { +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(uint32_t this_ptr, int64_t val) { LDKProbabilisticScoringParameters this_ptr_conv; this_ptr_conv.inner = (void*)(this_ptr & (~1)); this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); - ProbabilisticScoringParameters_set_amount_penalty_multiplier_msat(&this_ptr_conv, val); + ProbabilisticScoringParameters_set_liquidity_penalty_amount_multiplier_msat(&this_ptr_conv, val); } -uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_new"))) TS_ProbabilisticScoringParameters_new(int64_t base_penalty_msat_arg, int64_t liquidity_penalty_multiplier_msat_arg, int64_t liquidity_offset_half_life_arg, int64_t amount_penalty_multiplier_msat_arg) { - LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_new(base_penalty_msat_arg, liquidity_penalty_multiplier_msat_arg, liquidity_offset_half_life_arg, amount_penalty_multiplier_msat_arg); - uint32_t ret_ref = 0; - CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. - CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var); - ret_ref = (uintptr_t)ret_var.inner; - if (ret_var.is_owned) { - ret_ref |= 1; - } - return ret_ref; +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat(uint32_t this_ptr) { + LDKProbabilisticScoringParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + int64_t ret_conv = ProbabilisticScoringParameters_get_anti_probing_penalty_msat(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat(uint32_t this_ptr, int64_t val) { + LDKProbabilisticScoringParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + ProbabilisticScoringParameters_set_anti_probing_penalty_msat(&this_ptr_conv, val); +} + +int64_t __attribute__((export_name("TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(uint32_t this_ptr) { + LDKProbabilisticScoringParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + int64_t ret_conv = ProbabilisticScoringParameters_get_considered_impossible_penalty_msat(&this_ptr_conv); + return ret_conv; +} + +void __attribute__((export_name("TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat"))) TS_ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(uint32_t this_ptr, int64_t val) { + LDKProbabilisticScoringParameters this_ptr_conv; + this_ptr_conv.inner = (void*)(this_ptr & (~1)); + this_ptr_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); + ProbabilisticScoringParameters_set_considered_impossible_penalty_msat(&this_ptr_conv, val); } static inline uintptr_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg) { @@ -41572,6 +43316,102 @@ void __attribute__((export_name("TS_ProbabilisticScorer_debug_log_liquidity_sta ProbabilisticScorer_debug_log_liquidity_stats(&this_arg_conv); } +uint32_t __attribute__((export_name("TS_ProbabilisticScorer_estimated_channel_liquidity_range"))) TS_ProbabilisticScorer_estimated_channel_liquidity_range(uint32_t this_arg, int64_t scid, uint32_t target) { + LDKProbabilisticScorer this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKNodeId target_conv; + target_conv.inner = (void*)(target & (~1)); + target_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv); + LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ"); + *ret_copy = ProbabilisticScorer_estimated_channel_liquidity_range(&this_arg_conv, scid, &target_conv); + uint32_t ret_ref = (uintptr_t)ret_copy; + return ret_ref; +} + +void __attribute__((export_name("TS_ProbabilisticScorer_add_banned"))) TS_ProbabilisticScorer_add_banned(uint32_t this_arg, uint32_t node_id) { + LDKProbabilisticScorer this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKNodeId node_id_conv; + node_id_conv.inner = (void*)(node_id & (~1)); + node_id_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + ProbabilisticScorer_add_banned(&this_arg_conv, &node_id_conv); +} + +void __attribute__((export_name("TS_ProbabilisticScorer_remove_banned"))) TS_ProbabilisticScorer_remove_banned(uint32_t this_arg, uint32_t node_id) { + LDKProbabilisticScorer this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKNodeId node_id_conv; + node_id_conv.inner = (void*)(node_id & (~1)); + node_id_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + ProbabilisticScorer_remove_banned(&this_arg_conv, &node_id_conv); +} + +void __attribute__((export_name("TS_ProbabilisticScorer_set_manual_penalty"))) TS_ProbabilisticScorer_set_manual_penalty(uint32_t this_arg, uint32_t node_id, int64_t penalty) { + LDKProbabilisticScorer this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKNodeId node_id_conv; + node_id_conv.inner = (void*)(node_id & (~1)); + node_id_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + ProbabilisticScorer_set_manual_penalty(&this_arg_conv, &node_id_conv, penalty); +} + +void __attribute__((export_name("TS_ProbabilisticScorer_remove_manual_penalty"))) TS_ProbabilisticScorer_remove_manual_penalty(uint32_t this_arg, uint32_t node_id) { + LDKProbabilisticScorer this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKNodeId node_id_conv; + node_id_conv.inner = (void*)(node_id & (~1)); + node_id_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv); + ProbabilisticScorer_remove_manual_penalty(&this_arg_conv, &node_id_conv); +} + +void __attribute__((export_name("TS_ProbabilisticScorer_clear_manual_penalties"))) TS_ProbabilisticScorer_clear_manual_penalties(uint32_t this_arg) { + LDKProbabilisticScorer this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + ProbabilisticScorer_clear_manual_penalties(&this_arg_conv); +} + +void __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_from_list"))) TS_ProbabilisticScoringParameters_add_banned_from_list(uint32_t this_arg, uint32_tArray node_ids) { + LDKProbabilisticScoringParameters this_arg_conv; + this_arg_conv.inner = (void*)(this_arg & (~1)); + this_arg_conv.is_owned = false; + CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); + LDKCVec_NodeIdZ node_ids_constr; + node_ids_constr.datalen = node_ids->arr_len; + if (node_ids_constr.datalen > 0) + node_ids_constr.data = MALLOC(node_ids_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements"); + else + node_ids_constr.data = NULL; + uint32_t* node_ids_vals = node_ids->elems; + for (size_t i = 0; i < node_ids_constr.datalen; i++) { + uint32_t node_ids_conv_8 = node_ids_vals[i]; + LDKNodeId node_ids_conv_8_conv; + node_ids_conv_8_conv.inner = (void*)(node_ids_conv_8 & (~1)); + node_ids_conv_8_conv.is_owned = (node_ids_conv_8 & 1) || (node_ids_conv_8 == 0); + CHECK_INNER_FIELD_ACCESS_OR_NULL(node_ids_conv_8_conv); + node_ids_conv_8_conv = NodeId_clone(&node_ids_conv_8_conv); + node_ids_constr.data[i] = node_ids_conv_8_conv; + } + FREE(node_ids); + ProbabilisticScoringParameters_add_banned_from_list(&this_arg_conv, node_ids_constr); +} + uint32_t __attribute__((export_name("TS_ProbabilisticScoringParameters_default"))) TS_ProbabilisticScoringParameters_default() { LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_default(); uint32_t ret_ref = 0; @@ -41610,7 +43450,7 @@ int8_tArray __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_Pro uint32_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_ProbabilisticScorer_read(int8_tArray ser, uint32_t arg_a, uint32_t arg_b, uint32_t arg_c) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems /* XXX ser leaks */; + ser_ref.data = ser->elems; LDKProbabilisticScoringParameters arg_a_conv; arg_a_conv.inner = (void*)(arg_a & (~1)); arg_a_conv.is_owned = (arg_a & 1) || (arg_a == 0); @@ -41629,6 +43469,7 @@ uint32_t __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_Probabi } LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ"); *ret_conv = ProbabilisticScorer_read(ser_ref, arg_a_conv, &arg_b_conv, arg_c_conv); + FREE(ser); return (uint32_t)ret_conv; } @@ -43124,7 +44965,7 @@ uint32_tArray __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_R LDKCVec_PrivateRouteZ ret_var = RawInvoice_private_routes(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKPrivateRoute ret_conv_14_var = ret_var.data[o]; uint32_t ret_conv_14_ref = 0; @@ -43334,7 +45175,7 @@ uint32_tArray __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invo LDKCVec_PrivateRouteZ ret_var = Invoice_private_routes(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t o = 0; o < ret_var.datalen; o++) { LDKPrivateRoute ret_conv_14_var = ret_var.data[o]; uint32_t ret_conv_14_ref = 0; @@ -43360,7 +45201,7 @@ uint32_tArray __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice LDKCVec_RouteHintZ ret_var = Invoice_route_hints(&this_arg_conv); uint32_tArray ret_arr = NULL; ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); - uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); + uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 8); for (size_t l = 0; l < ret_var.datalen; l++) { LDKRouteHint ret_conv_11_var = ret_var.data[l]; uint32_t ret_conv_11_ref = 0;