X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=ts%2Fbindings.c.body;h=8169a425e44d34ecf3d2ca5cff7a756eb47c1959;hp=3e655d013cd87bbd09e35981e269e9b10f94f7f0;hb=c629a01650402c8e2f9b9db8ced9ed63ce687727;hpb=d1d0121c000b713c10fd0bedd249eb8dda2e4db7 diff --git a/ts/bindings.c.body b/ts/bindings.c.body index 3e655d01..8169a425 100644 --- a/ts/bindings.c.body +++ b/ts/bindings.c.body @@ -21,6 +21,7 @@ void *malloc(size_t size); void free(void *ptr); #define MALLOC(a, _) malloc(a) +#define do_MALLOC(a, _b, _c) malloc(a) #define FREE(p) if ((unsigned long)(p) > 4096) { free(p); } #define DO_ASSERT(a) (void)(a) #define CHECK(a) @@ -40,8 +41,8 @@ _Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits"); ty elems[]; \ }; \ typedef struct name##array * name##Array; \ - static inline name##Array init_##name##Array(size_t arr_len) { \ - name##Array arr = (name##Array)MALLOC(arr_len * sizeof(ty) + sizeof(uint32_t), "##name array init"); \ + 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); \ arr->arr_len = arr_len; \ return arr; \ } @@ -54,7 +55,7 @@ DECL_ARR_TYPE(char, char); typedef charArray jstring; static inline jstring str_ref_to_ts(const char* chars, size_t len) { - charArray arr = init_charArray(len); + charArray arr = init_charArray(len, __LINE__); memcpy(arr->elems, chars, len); return arr; } @@ -78,6 +79,18 @@ uint32_t __attribute__((export_name("TS_malloc"))) TS_malloc(uint32_t size) { void __attribute__((export_name("TS_free"))) TS_free(uint32_t ptr) { FREE((void*)ptr); } + +jstring __attribute__((export_name("TS_get_ldk_c_bindings_version"))) TS_get_ldk_c_bindings_version() { + const char *res = check_get_ldk_bindings_version(); + if (res == NULL) return NULL; + return str_ref_to_ts(res, strlen(res)); +} +jstring __attribute__((export_name("TS_get_ldk_version"))) get_ldk_version() { + const char *res = check_get_ldk_version(); + if (res == NULL) return NULL; + return str_ref_to_ts(res, strlen(res)); +} +#include "version.c" static inline struct LDKThirtyTwoBytes ThirtyTwoBytes_clone(const struct LDKThirtyTwoBytes *orig) { struct LDKThirtyTwoBytes ret; memcpy(ret.data, orig->data, 32); return ret; } static inline LDKAccessError LDKAccessError_from_js(int32_t ord) { switch (ord) { @@ -213,7 +226,7 @@ static inline LDKCVec_u8Z CVec_u8Z_clone(const LDKCVec_u8Z *orig) { struct LDKCVec_u8Z TxOut_get_script_pubkey (struct LDKTxOut* thing) { return CVec_u8Z_clone(&thing->script_pubkey);}int8_tArray __attribute__((export_name("TS_TxOut_get_script_pubkey"))) TS_TxOut_get_script_pubkey(uint32_t thing) { LDKTxOut* thing_conv = (LDKTxOut*)(thing & ~1); LDKCVec_u8Z ret_var = TxOut_get_script_pubkey(thing_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -232,11 +245,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(owner & ~1); LDKChannelConfig ret_var = CResult_ChannelConfigDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -250,11 +263,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_err"))) TS_CResult_ChannelConfigDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelConfigDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -268,11 +281,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_ok"))) TS_CResult_OutPointDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)(owner & ~1); LDKOutPoint ret_var = CResult_OutPointDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -286,11 +299,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_err"))) TS_CResult_OutPointDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_OutPointDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -303,7 +316,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_SecretKeyErrorZ_get_ok"))) TS_CResult_SecretKeyErrorZ_get_ok(uint32_t owner) { LDKCResult_SecretKeyErrorZ* owner_conv = (LDKCResult_SecretKeyErrorZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_SecretKeyErrorZ_get_ok(owner_conv).bytes, 32); return ret_arr; } @@ -324,7 +337,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_PublicKeyErrorZ_get_ok"))) TS_CResult_PublicKeyErrorZ_get_ok(uint32_t owner) { LDKCResult_PublicKeyErrorZ* owner_conv = (LDKCResult_PublicKeyErrorZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, CResult_PublicKeyErrorZ_get_ok(owner_conv).compressed_form, 33); return ret_arr; } @@ -346,11 +359,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(owner & ~1); LDKTxCreationKeys ret_var = CResult_TxCreationKeysDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -364,11 +377,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_TxCreationKeysDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -382,11 +395,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(owner & ~1); LDKChannelPublicKeys ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -400,11 +413,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -418,11 +431,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_ok"))) TS_CResult_TxCreationKeysErrorZ_get_ok(uint32_t owner) { LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)(owner & ~1); LDKTxCreationKeys ret_var = CResult_TxCreationKeysErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -459,11 +472,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(owner & ~1); LDKHTLCOutputInCommitment ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -477,11 +490,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -495,11 +508,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(owner & ~1); LDKCounterpartyChannelTransactionParameters ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -513,11 +526,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -531,11 +544,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(owner & ~1); LDKChannelTransactionParameters ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -549,11 +562,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -567,11 +580,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(owner & ~1); LDKHolderCommitmentTransaction ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -585,11 +598,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -603,11 +616,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(owner & ~1); LDKBuiltCommitmentTransaction ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -621,11 +634,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -639,11 +652,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_get_ok(uint32_t owner) { LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(owner & ~1); LDKTrustedClosingTransaction ret_var = *CResult_TrustedClosingTransactionNoneZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner & ~1; + ret_ref = (uintptr_t)ret_var.inner & ~1; return ret_ref; } @@ -663,11 +676,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(owner & ~1); LDKCommitmentTransaction ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -681,11 +694,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -699,11 +712,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok(uint32_t owner) { LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(owner & ~1); LDKTrustedCommitmentTransaction ret_var = *CResult_TrustedCommitmentTransactionNoneZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner & ~1; + ret_ref = (uintptr_t)ret_var.inner & ~1; return ret_ref; } @@ -724,10 +737,10 @@ ptrArray __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_get_ok"))) LDKCResult_CVec_SignatureZNoneZ* owner_conv = (LDKCResult_CVec_SignatureZNoneZ*)(owner & ~1); LDKCVec_SignatureZ ret_var = CResult_CVec_SignatureZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; - ret_arr = init_ptrArray(ret_var.datalen); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); for (size_t m = 0; m < ret_var.datalen; m++) { - int8_tArray ret_conv_12_arr = init_int8_tArray(64); + 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; } @@ -751,11 +764,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(owner & ~1); LDKShutdownScript ret_var = CResult_ShutdownScriptDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -769,11 +782,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ShutdownScriptDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -787,11 +800,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(uint32_t owner) { LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(owner & ~1); LDKShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -805,11 +818,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(uint32_t owner) { LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(owner & ~1); LDKInvalidShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -842,7 +855,7 @@ LDKCVec_u8Z write_LDKType_jcall(const void* this_arg) { LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(ret_ref.data, ret->elems, ret_ref.datalen); + memcpy(ret_ref.data, ret->elems, ret_ref.datalen); FREE(ret); return ret_ref; } static void LDKType_JCalls_cloned(LDKType* new_obj) { @@ -870,7 +883,7 @@ long __attribute__((export_name("TS_LDKType_new"))) TS_LDKType_new(JSValue o) { return (long)res_ptr; } int16_t __attribute__((export_name("TS_Type_type_id"))) TS_Type_type_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKType* this_arg_conv = (LDKType*)this_arg_ptr; int16_t ret_val = (this_arg_conv->type_id)(this_arg_conv->this_arg); @@ -878,7 +891,7 @@ int16_t __attribute__((export_name("TS_Type_type_id"))) TS_Type_type_id(uint32_ } jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKType* this_arg_conv = (LDKType*)this_arg_ptr; LDKStr ret_str = (this_arg_conv->debug_str)(this_arg_conv->this_arg); @@ -888,11 +901,11 @@ jstring __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uin } int8_tArray __attribute__((export_name("TS_Type_write"))) TS_Type_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKType* this_arg_conv = (LDKType*)this_arg_ptr; LDKCVec_u8Z ret_var = (this_arg_conv->write)(this_arg_conv->this_arg); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -911,7 +924,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_Some_get_some"))) TS_LD assert(obj->tag == LDKCOption_TypeZ_Some); LDKType* some_ret = MALLOC(sizeof(LDKType), "LDKType"); *some_ret = Type_clone(&obj->some); - return (uint64_t)some_ret; + return (uintptr_t)some_ret; } static inline struct LDKCOption_TypeZ CResult_COption_TypeZDecodeErrorZ_get_ok(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); @@ -921,7 +934,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_o LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(owner & ~1); LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = CResult_COption_TypeZDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -932,11 +945,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_err"))) TS_CResult_COption_TypeZDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_COption_TypeZDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -971,11 +984,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(owner & ~1); LDKChannelMonitorUpdate ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -989,11 +1002,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -1014,33 +1027,33 @@ uint32_t __attribute__((export_name("TS_LDKMonitorEvent_HTLCEvent_get_htlc_event LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); assert(obj->tag == LDKMonitorEvent_HTLCEvent); LDKHTLCUpdate htlc_event_var = obj->htlc_event; - uint64_t htlc_event_ref = 0; - CHECK((((uint64_t)htlc_event_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&htlc_event_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t htlc_event_ref = 0; + CHECK((((uintptr_t)htlc_event_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&htlc_event_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_event_var); - htlc_event_ref = (uint64_t)htlc_event_var.inner & ~1; + htlc_event_ref = (uintptr_t)htlc_event_var.inner & ~1; return htlc_event_ref; } uint32_t __attribute__((export_name("TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed"))) TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(uint32_t ptr) { LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); assert(obj->tag == LDKMonitorEvent_CommitmentTxConfirmed); LDKOutPoint commitment_tx_confirmed_var = obj->commitment_tx_confirmed; - uint64_t commitment_tx_confirmed_ref = 0; - CHECK((((uint64_t)commitment_tx_confirmed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&commitment_tx_confirmed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t commitment_tx_confirmed_ref = 0; + CHECK((((uintptr_t)commitment_tx_confirmed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&commitment_tx_confirmed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_confirmed_var); - commitment_tx_confirmed_ref = (uint64_t)commitment_tx_confirmed_var.inner & ~1; + commitment_tx_confirmed_ref = (uintptr_t)commitment_tx_confirmed_var.inner & ~1; return commitment_tx_confirmed_ref; } uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo"))) TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo(uint32_t ptr) { LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); assert(obj->tag == LDKMonitorEvent_UpdateCompleted); LDKOutPoint funding_txo_var = obj->update_completed.funding_txo; - uint64_t funding_txo_ref = 0; - CHECK((((uint64_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t funding_txo_ref = 0; + CHECK((((uintptr_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uint64_t)funding_txo_var.inner & ~1; + funding_txo_ref = (uintptr_t)funding_txo_var.inner & ~1; return funding_txo_ref; } int64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id"))) TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(uint32_t ptr) { @@ -1052,11 +1065,11 @@ uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateFailed_get_update_ LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1); assert(obj->tag == LDKMonitorEvent_UpdateFailed); LDKOutPoint update_failed_var = obj->update_failed; - uint64_t update_failed_ref = 0; - CHECK((((uint64_t)update_failed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&update_failed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t update_failed_ref = 0; + CHECK((((uintptr_t)update_failed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&update_failed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(update_failed_var); - update_failed_ref = (uint64_t)update_failed_var.inner & ~1; + update_failed_ref = (uintptr_t)update_failed_var.inner & ~1; return update_failed_ref; } uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_ty_from_ptr"))) TS_LDKCOption_MonitorEventZ_ty_from_ptr(uint32_t ptr) { @@ -1070,7 +1083,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_ty_from_ptr"))) uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_Some_get_some"))) TS_LDKCOption_MonitorEventZ_Some_get_some(uint32_t ptr) { LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)(ptr & ~1); assert(obj->tag == LDKCOption_MonitorEventZ_Some); - uint64_t some_ref = ((uint64_t)&obj->some) | 1; + uintptr_t some_ref = ((uintptr_t)&obj->some) | 1; return some_ref; } static inline struct LDKCOption_MonitorEventZ CResult_COption_MonitorEventZDecodeErrorZ_get_ok(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR owner){ @@ -1081,7 +1094,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErro LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(owner & ~1); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = CResult_COption_MonitorEventZDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -1092,11 +1105,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_COption_MonitorEventZDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -1110,11 +1123,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(owner & ~1); LDKHTLCUpdate ret_var = CResult_HTLCUpdateDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -1128,11 +1141,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_HTLCUpdateDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -1163,11 +1176,11 @@ static inline struct LDKOutPoint C2Tuple_OutPointScriptZ_get_a(LDKC2Tuple_OutPoi uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_a"))) TS_C2Tuple_OutPointScriptZ_get_a(uint32_t owner) { LDKC2Tuple_OutPointScriptZ* owner_conv = (LDKC2Tuple_OutPointScriptZ*)(owner & ~1); LDKOutPoint ret_var = C2Tuple_OutPointScriptZ_get_a(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -1180,7 +1193,7 @@ static inline struct LDKCVec_u8Z C2Tuple_OutPointScriptZ_get_b(LDKC2Tuple_OutPoi int8_tArray __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_b"))) TS_C2Tuple_OutPointScriptZ_get_b(uint32_t owner) { LDKC2Tuple_OutPointScriptZ* owner_conv = (LDKC2Tuple_OutPointScriptZ*)(owner & ~1); LDKCVec_u8Z ret_var = C2Tuple_OutPointScriptZ_get_b(owner_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -1201,7 +1214,7 @@ static inline struct LDKCVec_u8Z C2Tuple_u32ScriptZ_get_b(LDKC2Tuple_u32ScriptZ int8_tArray __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_b"))) TS_C2Tuple_u32ScriptZ_get_b(uint32_t owner) { LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)(owner & ~1); LDKCVec_u8Z ret_var = C2Tuple_u32ScriptZ_get_b(owner_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -1212,7 +1225,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get } int8_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(uint32_t owner) { LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_get_a(owner_conv).data, 32); return ret_arr; } @@ -1224,12 +1237,12 @@ uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32Script LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(owner & ~1); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t v = 0; v < ret_var.datalen; v++) { LDKC2Tuple_u32ScriptZ* ret_conv_21_conv = &ret_var.data[v]; // Warning: we really need to clone here, but no clone is available for LDKC2Tuple_u32ScriptZ - ret_arr_ptr[v] = ((uint64_t)ret_conv_21_conv) | 1; + ret_arr_ptr[v] = ((uintptr_t)ret_conv_21_conv) | 1; } return ret_arr; @@ -1253,21 +1266,21 @@ uint32_t __attribute__((export_name("TS_LDKPaymentPurpose_ty_from_ptr"))) TS_LDK int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage(uint32_t ptr) { LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1); assert(obj->tag == LDKPaymentPurpose_InvoicePayment); - int8_tArray payment_preimage_arr = init_int8_tArray(32); + int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__); memcpy(payment_preimage_arr->elems, obj->invoice_payment.payment_preimage.data, 32); return payment_preimage_arr; } int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret(uint32_t ptr) { LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1); assert(obj->tag == LDKPaymentPurpose_InvoicePayment); - int8_tArray payment_secret_arr = init_int8_tArray(32); + int8_tArray payment_secret_arr = init_int8_tArray(32, __LINE__); memcpy(payment_secret_arr->elems, obj->invoice_payment.payment_secret.data, 32); return payment_secret_arr; } int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment"))) TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(uint32_t ptr) { LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1); assert(obj->tag == LDKPaymentPurpose_SpontaneousPayment); - int8_tArray spontaneous_payment_arr = init_int8_tArray(32); + int8_tArray spontaneous_payment_arr = init_int8_tArray(32, __LINE__); memcpy(spontaneous_payment_arr->elems, obj->spontaneous_payment.data, 32); return spontaneous_payment_arr; } @@ -1297,11 +1310,11 @@ uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelUpdateMessage_ge LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); assert(obj->tag == LDKNetworkUpdate_ChannelUpdateMessage); LDKChannelUpdate msg_var = obj->channel_update_message.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelClosed_get_short_channel_id"))) TS_LDKNetworkUpdate_ChannelClosed_get_short_channel_id(uint32_t ptr) { @@ -1317,7 +1330,7 @@ jboolean __attribute__((export_name("TS_LDKNetworkUpdate_ChannelClosed_get_is_pe int8_tArray __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_node_id"))) TS_LDKNetworkUpdate_NodeFailure_get_node_id(uint32_t ptr) { LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1); assert(obj->tag == LDKNetworkUpdate_NodeFailure); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->node_failure.node_id.compressed_form, 33); return node_id_arr; } @@ -1337,7 +1350,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_ty_from_ptr")) uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_Some_get_some"))) TS_LDKCOption_NetworkUpdateZ_Some_get_some(uint32_t ptr) { LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)(ptr & ~1); assert(obj->tag == LDKCOption_NetworkUpdateZ_Some); - uint64_t some_ref = ((uint64_t)&obj->some) | 1; + uintptr_t some_ref = ((uintptr_t)&obj->some) | 1; return some_ref; } static inline LDKCVec_RouteHopZ CVec_RouteHopZ_clone(const LDKCVec_RouteHopZ *orig) { @@ -1360,39 +1373,39 @@ uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutpu LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput); LDKOutPoint outpoint_var = obj->static_output.outpoint; - uint64_t outpoint_ref = 0; - CHECK((((uint64_t)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t outpoint_ref = 0; + CHECK((((uintptr_t)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_var); - outpoint_ref = (uint64_t)outpoint_var.inner & ~1; + outpoint_ref = (uintptr_t)outpoint_var.inner & ~1; return outpoint_ref; } uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_output"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_output(uint32_t ptr) { LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput); - uint64_t output_ref = ((uint64_t)&obj->static_output.output) | 1; - return (uint64_t)output_ref; + uintptr_t output_ref = ((uintptr_t)&obj->static_output.output) | 1; + return (uintptr_t)output_ref; } uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output"))) TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(uint32_t ptr) { LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); assert(obj->tag == LDKSpendableOutputDescriptor_DelayedPaymentOutput); LDKDelayedPaymentOutputDescriptor delayed_payment_output_var = obj->delayed_payment_output; - uint64_t delayed_payment_output_ref = 0; - CHECK((((uint64_t)delayed_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&delayed_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t delayed_payment_output_ref = 0; + CHECK((((uintptr_t)delayed_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&delayed_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(delayed_payment_output_var); - delayed_payment_output_ref = (uint64_t)delayed_payment_output_var.inner & ~1; + delayed_payment_output_ref = (uintptr_t)delayed_payment_output_var.inner & ~1; return delayed_payment_output_ref; } uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output"))) TS_LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(uint32_t ptr) { LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1); assert(obj->tag == LDKSpendableOutputDescriptor_StaticPaymentOutput); LDKStaticPaymentOutputDescriptor static_payment_output_var = obj->static_payment_output; - uint64_t static_payment_output_ref = 0; - CHECK((((uint64_t)static_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&static_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t static_payment_output_ref = 0; + CHECK((((uintptr_t)static_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&static_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(static_payment_output_var); - static_payment_output_ref = (uint64_t)static_payment_output_var.inner & ~1; + static_payment_output_ref = (uintptr_t)static_payment_output_var.inner & ~1; return static_payment_output_ref; } static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ_clone(const LDKCVec_SpendableOutputDescriptorZ *orig) { @@ -1450,7 +1463,7 @@ uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_ int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_temporary_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_temporary_channel_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_FundingGenerationReady); - int8_tArray temporary_channel_id_arr = init_int8_tArray(32); + int8_tArray temporary_channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(temporary_channel_id_arr->elems, obj->funding_generation_ready.temporary_channel_id.data, 32); return temporary_channel_id_arr; } @@ -1463,7 +1476,7 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_o LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_FundingGenerationReady); LDKCVec_u8Z output_script_var = obj->funding_generation_ready.output_script; - int8_tArray output_script_arr = init_int8_tArray(output_script_var.datalen); + int8_tArray output_script_arr = init_int8_tArray(output_script_var.datalen, __LINE__); memcpy(output_script_arr->elems, output_script_var.data, output_script_var.datalen); return output_script_arr; } @@ -1475,7 +1488,7 @@ int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_user_ int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_payment_hash"))) TS_LDKEvent_PaymentReceived_get_payment_hash(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentReceived); - int8_tArray payment_hash_arr = init_int8_tArray(32); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->payment_received.payment_hash.data, 32); return payment_hash_arr; } @@ -1487,47 +1500,47 @@ int64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_amt"))) TS_L uint32_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_purpose"))) TS_LDKEvent_PaymentReceived_get_purpose(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentReceived); - uint64_t purpose_ref = ((uint64_t)&obj->payment_received.purpose) | 1; + uintptr_t purpose_ref = ((uintptr_t)&obj->payment_received.purpose) | 1; return purpose_ref; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_id"))) TS_LDKEvent_PaymentSent_get_payment_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentSent); - int8_tArray payment_id_arr = init_int8_tArray(32); + int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->payment_sent.payment_id.data, 32); return payment_id_arr; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_preimage"))) TS_LDKEvent_PaymentSent_get_payment_preimage(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentSent); - int8_tArray payment_preimage_arr = init_int8_tArray(32); + int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__); memcpy(payment_preimage_arr->elems, obj->payment_sent.payment_preimage.data, 32); return payment_preimage_arr; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_hash"))) TS_LDKEvent_PaymentSent_get_payment_hash(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentSent); - int8_tArray payment_hash_arr = init_int8_tArray(32); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->payment_sent.payment_hash.data, 32); return payment_hash_arr; } uint32_t __attribute__((export_name("TS_LDKEvent_PaymentSent_get_fee_paid_msat"))) TS_LDKEvent_PaymentSent_get_fee_paid_msat(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentSent); - uint64_t fee_paid_msat_ref = ((uint64_t)&obj->payment_sent.fee_paid_msat) | 1; + uintptr_t fee_paid_msat_ref = ((uintptr_t)&obj->payment_sent.fee_paid_msat) | 1; return fee_paid_msat_ref; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_payment_id"))) TS_LDKEvent_PaymentPathFailed_get_payment_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentPathFailed); - int8_tArray payment_id_arr = init_int8_tArray(32); + int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->payment_path_failed.payment_id.data, 32); return payment_id_arr; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_payment_hash"))) TS_LDKEvent_PaymentPathFailed_get_payment_hash(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentPathFailed); - int8_tArray payment_hash_arr = init_int8_tArray(32); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->payment_path_failed.payment_hash.data, 32); return payment_hash_arr; } @@ -1539,7 +1552,7 @@ jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_rejected_ uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_network_update"))) TS_LDKEvent_PaymentPathFailed_get_network_update(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentPathFailed); - uint64_t network_update_ref = ((uint64_t)&obj->payment_path_failed.network_update) | 1; + uintptr_t network_update_ref = ((uintptr_t)&obj->payment_path_failed.network_update) | 1; return network_update_ref; } jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_all_paths_failed"))) TS_LDKEvent_PaymentPathFailed_get_all_paths_failed(uint32_t ptr) { @@ -1552,15 +1565,15 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path assert(obj->tag == LDKEvent_PaymentPathFailed); LDKCVec_RouteHopZ path_var = obj->payment_path_failed.path; uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen); + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint64_t path_conv_10_ref = 0; - CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; path_arr_ptr[k] = path_conv_10_ref; } @@ -1569,33 +1582,33 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_short_channel_id"))) TS_LDKEvent_PaymentPathFailed_get_short_channel_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentPathFailed); - uint64_t short_channel_id_ref = ((uint64_t)&obj->payment_path_failed.short_channel_id) | 1; + uintptr_t short_channel_id_ref = ((uintptr_t)&obj->payment_path_failed.short_channel_id) | 1; return short_channel_id_ref; } uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_retry"))) TS_LDKEvent_PaymentPathFailed_get_retry(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentPathFailed); LDKRouteParameters retry_var = obj->payment_path_failed.retry; - uint64_t retry_ref = 0; - if ((uint64_t)retry_var.inner > 4096) { - CHECK((((uint64_t)retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t retry_ref = 0; + if ((uintptr_t)retry_var.inner > 4096) { + CHECK((((uintptr_t)retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(retry_var); - retry_ref = (uint64_t)retry_var.inner & ~1; + retry_ref = (uintptr_t)retry_var.inner & ~1; } return retry_ref; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_id"))) TS_LDKEvent_PaymentFailed_get_payment_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentFailed); - int8_tArray payment_id_arr = init_int8_tArray(32); + int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->payment_failed.payment_id.data, 32); return payment_id_arr; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_hash"))) TS_LDKEvent_PaymentFailed_get_payment_hash(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentFailed); - int8_tArray payment_hash_arr = init_int8_tArray(32); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->payment_failed.payment_hash.data, 32); return payment_hash_arr; } @@ -1609,10 +1622,10 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outpu assert(obj->tag == LDKEvent_SpendableOutputs); LDKCVec_SpendableOutputDescriptorZ outputs_var = obj->spendable_outputs.outputs; uint32_tArray outputs_arr = NULL; - outputs_arr = init_uint32_tArray(outputs_var.datalen); + outputs_arr = init_uint32_tArray(outputs_var.datalen, __LINE__); uint32_t *outputs_arr_ptr = (uint32_t*)(((uint8_t*)outputs_arr) + 4); for (size_t b = 0; b < outputs_var.datalen; b++) { - uint64_t outputs_conv_27_ref = ((uint64_t)&outputs_var.data[b]) | 1; + uintptr_t outputs_conv_27_ref = ((uintptr_t)&outputs_var.data[b]) | 1; outputs_arr_ptr[b] = outputs_conv_27_ref; } @@ -1621,7 +1634,7 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outpu uint32_t __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_fee_earned_msat"))) TS_LDKEvent_PaymentForwarded_get_fee_earned_msat(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentForwarded); - uint64_t fee_earned_msat_ref = ((uint64_t)&obj->payment_forwarded.fee_earned_msat) | 1; + uintptr_t fee_earned_msat_ref = ((uintptr_t)&obj->payment_forwarded.fee_earned_msat) | 1; return fee_earned_msat_ref; } jboolean __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx"))) TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx(uint32_t ptr) { @@ -1632,7 +1645,7 @@ jboolean __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_claim_from int8_tArray __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_channel_id"))) TS_LDKEvent_ChannelClosed_get_channel_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_ChannelClosed); - int8_tArray channel_id_arr = init_int8_tArray(32); + int8_tArray channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(channel_id_arr->elems, obj->channel_closed.channel_id.data, 32); return channel_id_arr; } @@ -1644,13 +1657,13 @@ int64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_user_channel_i uint32_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_reason"))) TS_LDKEvent_ChannelClosed_get_reason(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_ChannelClosed); - uint64_t reason_ref = ((uint64_t)&obj->channel_closed.reason) | 1; + uintptr_t reason_ref = ((uintptr_t)&obj->channel_closed.reason) | 1; return reason_ref; } int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_channel_id"))) TS_LDKEvent_DiscardFunding_get_channel_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_DiscardFunding); - int8_tArray channel_id_arr = init_int8_tArray(32); + int8_tArray channel_id_arr = init_int8_tArray(32, __LINE__); memcpy(channel_id_arr->elems, obj->discard_funding.channel_id.data, 32); return channel_id_arr; } @@ -1658,21 +1671,21 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_transacti LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_DiscardFunding); LDKTransaction transaction_var = obj->discard_funding.transaction; - int8_tArray transaction_arr = init_int8_tArray(transaction_var.datalen); + int8_tArray transaction_arr = init_int8_tArray(transaction_var.datalen, __LINE__); memcpy(transaction_arr->elems, transaction_var.data, transaction_var.datalen); return transaction_arr; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_id"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_id(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentPathSuccessful); - int8_tArray payment_id_arr = init_int8_tArray(32); + int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->payment_path_successful.payment_id.data, 32); return payment_id_arr; } int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_hash"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_hash(uint32_t ptr) { LDKEvent *obj = (LDKEvent*)(ptr & ~1); assert(obj->tag == LDKEvent_PaymentPathSuccessful); - int8_tArray payment_hash_arr = init_int8_tArray(32); + int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__); memcpy(payment_hash_arr->elems, obj->payment_path_successful.payment_hash.data, 32); return payment_hash_arr; } @@ -1681,15 +1694,15 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_ assert(obj->tag == LDKEvent_PaymentPathSuccessful); LDKCVec_RouteHopZ path_var = obj->payment_path_successful.path; uint32_tArray path_arr = NULL; - path_arr = init_uint32_tArray(path_var.datalen); + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint64_t path_conv_10_ref = 0; - CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)path_conv_10_var.inner & ~1; + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1; path_arr_ptr[k] = path_conv_10_ref; } @@ -1705,9 +1718,9 @@ static inline LDKCVec_EventZ CVec_EventZ_clone(const LDKCVec_EventZ *orig) { static inline uintptr_t C2Tuple_usizeTransactionZ_get_a(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){ return owner->a; } -int64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_C2Tuple_usizeTransactionZ_get_a(uint32_t owner) { +intptr_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_C2Tuple_usizeTransactionZ_get_a(uint32_t owner) { LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)(owner & ~1); - int64_t ret_val = C2Tuple_usizeTransactionZ_get_a(owner_conv); + intptr_t ret_val = C2Tuple_usizeTransactionZ_get_a(owner_conv); return ret_val; } @@ -1717,7 +1730,7 @@ static inline struct LDKTransaction C2Tuple_usizeTransactionZ_get_b(LDKC2Tuple_u int8_tArray __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_b"))) TS_C2Tuple_usizeTransactionZ_get_b(uint32_t owner) { LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)(owner & ~1); LDKTransaction ret_var = C2Tuple_usizeTransactionZ_get_b(owner_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -1745,7 +1758,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_b"))) TS_C2Tuple_ LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)(owner & ~1); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = C2Tuple_u32TxOutZ_get_b(owner_conv); - return (uint64_t)ret_ref; + return (uintptr_t)ret_ref; } static inline LDKCVec_C2Tuple_u32TxOutZZ CVec_C2Tuple_u32TxOutZZ_clone(const LDKCVec_C2Tuple_u32TxOutZZ *orig) { @@ -1760,7 +1773,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_ } int8_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(uint32_t owner) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_get_a(owner_conv).data, 32); return ret_arr; } @@ -1772,12 +1785,12 @@ uint32_tArray __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZ LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* owner_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(owner & ~1); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - ret_arr_ptr[u] = ((uint64_t)ret_conv_20_conv); + ret_arr_ptr[u] = ((uintptr_t)ret_conv_20_conv); } FREE(ret_var.data); @@ -1855,7 +1868,7 @@ static inline struct LDKSignature C2Tuple_SignatureCVec_SignatureZZ_get_a(LDKC2T } int8_tArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_a"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_a(uint32_t owner) { LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, C2Tuple_SignatureCVec_SignatureZZ_get_a(owner_conv).compact_form, 64); return ret_arr; } @@ -1867,10 +1880,10 @@ ptrArray __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1); LDKCVec_SignatureZ ret_var = C2Tuple_SignatureCVec_SignatureZZ_get_b(owner_conv); ptrArray ret_arr = NULL; - ret_arr = init_ptrArray(ret_var.datalen); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); for (size_t m = 0; m < ret_var.datalen; m++) { - int8_tArray ret_conv_12_arr = init_int8_tArray(64); + 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; } @@ -1886,7 +1899,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_Signature LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } static inline void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner){ @@ -1904,7 +1917,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_SignatureNoneZ_get_ok"))) TS_CResult_SignatureNoneZ_get_ok(uint32_t owner) { LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, CResult_SignatureNoneZ_get_ok(owner_conv).compact_form, 64); return ret_arr; } @@ -1933,7 +1946,7 @@ LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, ui int8_tArray ret = (int8_tArray)js_invoke_function_1(j_calls->instance_ptr, 3, (uint32_t)idx); LDKPublicKey ret_ref; CHECK(ret->arr_len == 33); - memcpy(ret_ref.compressed_form, ret->elems, 33); + memcpy(ret_ref.compressed_form, ret->elems, 33); FREE(ret); return ret_ref; } LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) { @@ -1941,23 +1954,23 @@ LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_a int8_tArray ret = (int8_tArray)js_invoke_function_1(j_calls->instance_ptr, 4, (uint32_t)idx); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); - memcpy(ret_ref.data, ret->elems, 32); + memcpy(ret_ref.data, ret->elems, 32); FREE(ret); return ret_ref; } LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * holder_tx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKHolderCommitmentTransaction holder_tx_var = *holder_tx; - uint64_t holder_tx_ref = 0; + uintptr_t holder_tx_ref = 0; holder_tx_var = HolderCommitmentTransaction_clone(holder_tx); - CHECK((((uint64_t)holder_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&holder_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)holder_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&holder_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_tx_var); - holder_tx_ref = (uint64_t)holder_tx_var.inner; + holder_tx_ref = (uintptr_t)holder_tx_var.inner; if (holder_tx_var.is_owned) { holder_tx_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 5, (uint32_t)holder_tx_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); FREE((void*)ret); @@ -1968,23 +1981,23 @@ LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) { int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 6); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); - memcpy(ret_ref.data, ret->elems, 32); + memcpy(ret_ref.data, ret->elems, 32); FREE(ret); return ret_ref; } LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKCommitmentTransaction * commitment_tx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKCommitmentTransaction commitment_tx_var = *commitment_tx; - uint64_t commitment_tx_ref = 0; + uintptr_t commitment_tx_ref = 0; commitment_tx_var = CommitmentTransaction_clone(commitment_tx); - CHECK((((uint64_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_var); - commitment_tx_ref = (uint64_t)commitment_tx_var.inner; + commitment_tx_ref = (uintptr_t)commitment_tx_var.inner; if (commitment_tx_var.is_owned) { commitment_tx_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 7, (uint32_t)commitment_tx_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); FREE((void*)ret); @@ -1992,10 +2005,10 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L } LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const void* this_arg, uint64_t idx, const uint8_t (* secret)[32]) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; - int8_tArray secret_arr = init_int8_tArray(32); + 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, 8, (uint32_t)idx, (uint32_t)secret_arr); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr); FREE((void*)ret); @@ -2004,17 +2017,17 @@ LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const vo LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs_LDKBaseSign_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * commitment_tx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKHolderCommitmentTransaction commitment_tx_var = *commitment_tx; - uint64_t commitment_tx_ref = 0; + uintptr_t commitment_tx_ref = 0; commitment_tx_var = HolderCommitmentTransaction_clone(commitment_tx); - CHECK((((uint64_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_var); - commitment_tx_ref = (uint64_t)commitment_tx_var.inner; + commitment_tx_ref = (uintptr_t)commitment_tx_var.inner; if (commitment_tx_var.is_owned) { commitment_tx_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 9, (uint32_t)commitment_tx_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr); FREE((void*)ret); @@ -2023,13 +2036,13 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htl LDKCResult_SignatureNoneZ sign_justice_revoked_output_LDKBaseSign_jcall(const void* this_arg, LDKTransaction justice_tx, uintptr_t input, uint64_t amount, const uint8_t (* per_commitment_key)[32]) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKTransaction justice_tx_var = justice_tx; - int8_tArray justice_tx_arr = init_int8_tArray(justice_tx_var.datalen); + int8_tArray justice_tx_arr = init_int8_tArray(justice_tx_var.datalen, __LINE__); memcpy(justice_tx_arr->elems, justice_tx_var.data, justice_tx_var.datalen); Transaction_free(justice_tx_var); - int8_tArray per_commitment_key_arr = init_int8_tArray(32); + 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, 10, (uint32_t)justice_tx_arr, (uint32_t)input, (uint32_t)amount, (uint32_t)per_commitment_key_arr); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); FREE((void*)ret); @@ -2038,23 +2051,23 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_output_LDKBaseSign_jcall(const vo LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void* this_arg, LDKTransaction justice_tx, uintptr_t input, uint64_t amount, const uint8_t (* per_commitment_key)[32], const LDKHTLCOutputInCommitment * htlc) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKTransaction justice_tx_var = justice_tx; - int8_tArray justice_tx_arr = init_int8_tArray(justice_tx_var.datalen); + int8_tArray justice_tx_arr = init_int8_tArray(justice_tx_var.datalen, __LINE__); memcpy(justice_tx_arr->elems, justice_tx_var.data, justice_tx_var.datalen); Transaction_free(justice_tx_var); - int8_tArray per_commitment_key_arr = init_int8_tArray(32); + int8_tArray per_commitment_key_arr = init_int8_tArray(32, __LINE__); memcpy(per_commitment_key_arr->elems, *per_commitment_key, 32); LDKHTLCOutputInCommitment htlc_var = *htlc; - uint64_t htlc_ref = 0; + uintptr_t htlc_ref = 0; htlc_var = HTLCOutputInCommitment_clone(htlc); - CHECK((((uint64_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_var); - htlc_ref = (uint64_t)htlc_var.inner; + htlc_ref = (uintptr_t)htlc_var.inner; if (htlc_var.is_owned) { htlc_ref |= 1; } uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 11, (uint32_t)justice_tx_arr, (uint32_t)input, (uint32_t)amount, (uint32_t)per_commitment_key_arr, (uint32_t)htlc_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); FREE((void*)ret); @@ -2063,23 +2076,23 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(const void* this_arg, LDKTransaction htlc_tx, uintptr_t input, uint64_t amount, LDKPublicKey per_commitment_point, const LDKHTLCOutputInCommitment * htlc) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKTransaction htlc_tx_var = htlc_tx; - int8_tArray htlc_tx_arr = init_int8_tArray(htlc_tx_var.datalen); + int8_tArray htlc_tx_arr = init_int8_tArray(htlc_tx_var.datalen, __LINE__); memcpy(htlc_tx_arr->elems, htlc_tx_var.data, htlc_tx_var.datalen); Transaction_free(htlc_tx_var); - int8_tArray per_commitment_point_arr = init_int8_tArray(33); + int8_tArray per_commitment_point_arr = init_int8_tArray(33, __LINE__); memcpy(per_commitment_point_arr->elems, per_commitment_point.compressed_form, 33); LDKHTLCOutputInCommitment htlc_var = *htlc; - uint64_t htlc_ref = 0; + uintptr_t htlc_ref = 0; htlc_var = HTLCOutputInCommitment_clone(htlc); - CHECK((((uint64_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_var); - htlc_ref = (uint64_t)htlc_var.inner; + htlc_ref = (uintptr_t)htlc_var.inner; if (htlc_var.is_owned) { htlc_ref |= 1; } uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 12, (uint32_t)htlc_tx_arr, (uint32_t)input, (uint32_t)amount, (uint32_t)per_commitment_point_arr, (uint32_t)htlc_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); FREE((void*)ret); @@ -2088,17 +2101,17 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void* this_arg, const LDKClosingTransaction * closing_tx) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKClosingTransaction closing_tx_var = *closing_tx; - uint64_t closing_tx_ref = 0; + uintptr_t closing_tx_ref = 0; closing_tx_var = ClosingTransaction_clone(closing_tx); - CHECK((((uint64_t)closing_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&closing_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)closing_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&closing_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_var); - closing_tx_ref = (uint64_t)closing_tx_var.inner; + closing_tx_ref = (uintptr_t)closing_tx_var.inner; if (closing_tx_var.is_owned) { closing_tx_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 13, (uint32_t)closing_tx_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); FREE((void*)ret); @@ -2107,17 +2120,17 @@ LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void* LDKCResult_SignatureNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void* this_arg, const LDKUnsignedChannelAnnouncement * msg) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKUnsignedChannelAnnouncement msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = UnsignedChannelAnnouncement_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 14, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr); FREE((void*)ret); @@ -2126,12 +2139,12 @@ LDKCResult_SignatureNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void void ready_channel_LDKBaseSign_jcall(void* this_arg, const LDKChannelTransactionParameters * channel_parameters) { LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg; LDKChannelTransactionParameters channel_parameters_var = *channel_parameters; - uint64_t channel_parameters_ref = 0; + uintptr_t channel_parameters_ref = 0; channel_parameters_var = ChannelTransactionParameters_clone(channel_parameters); - CHECK((((uint64_t)channel_parameters_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&channel_parameters_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)channel_parameters_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&channel_parameters_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_var); - channel_parameters_ref = (uint64_t)channel_parameters_var.inner; + channel_parameters_ref = (uintptr_t)channel_parameters_var.inner; if (channel_parameters_var.is_owned) { channel_parameters_ref |= 1; } @@ -2178,25 +2191,25 @@ long __attribute__((export_name("TS_LDKBaseSign_new"))) TS_LDKBaseSign_new(JSVa return (long)res_ptr; } int8_tArray __attribute__((export_name("TS_BaseSign_get_per_commitment_point"))) TS_BaseSign_get_per_commitment_point(uint32_t this_arg, int64_t idx) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; - int8_tArray ret_arr = init_int8_tArray(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->get_per_commitment_point)(this_arg_conv->this_arg, idx).compressed_form, 33); return ret_arr; } int8_tArray __attribute__((export_name("TS_BaseSign_release_commitment_secret"))) TS_BaseSign_release_commitment_secret(uint32_t this_arg, int64_t idx) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->release_commitment_secret)(this_arg_conv->this_arg, idx).data, 32); return ret_arr; } uint32_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) TS_BaseSign_validate_holder_commitment(uint32_t this_arg, uint32_t holder_tx) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKHolderCommitmentTransaction holder_tx_conv; @@ -2205,20 +2218,20 @@ uint32_t __attribute__((export_name("TS_BaseSign_validate_holder_commitment"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_tx_conv); 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); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_BaseSign_channel_keys_id"))) TS_BaseSign_channel_keys_id(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->channel_keys_id)(this_arg_conv->this_arg).data, 32); return ret_arr; } uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment"))) TS_BaseSign_sign_counterparty_commitment(uint32_t this_arg, uint32_t commitment_tx) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKCommitmentTransaction commitment_tx_conv; @@ -2227,24 +2240,24 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment") CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = (this_arg_conv->sign_counterparty_commitment)(this_arg_conv->this_arg, &commitment_tx_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_BaseSign_validate_counterparty_revocation"))) TS_BaseSign_validate_counterparty_revocation(uint32_t this_arg, int64_t idx, int8_tArray secret) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; unsigned char secret_arr[32]; CHECK(secret->arr_len == 32); - memcpy(secret_arr, secret->elems, 32); + memcpy(secret_arr, secret->elems, 32); FREE(secret); unsigned char (*secret_ref)[32] = &secret_arr; LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = (this_arg_conv->validate_counterparty_revocation)(this_arg_conv->this_arg, idx, secret_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_BaseSign_sign_holder_commitment_and_htlcs"))) TS_BaseSign_sign_holder_commitment_and_htlcs(uint32_t this_arg, uint32_t commitment_tx) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKHolderCommitmentTransaction commitment_tx_conv; @@ -2253,39 +2266,39 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_holder_commitment_and_htl CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = (this_arg_conv->sign_holder_commitment_and_htlcs)(this_arg_conv->this_arg, &commitment_tx_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output"))) TS_BaseSign_sign_justice_revoked_output(uint32_t this_arg, int8_tArray justice_tx, int64_t input, int64_t amount, int8_tArray per_commitment_key) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); +uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output"))) TS_BaseSign_sign_justice_revoked_output(uint32_t this_arg, int8_tArray justice_tx, intptr_t input, int64_t amount, int8_tArray per_commitment_key) { + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKTransaction justice_tx_ref; justice_tx_ref.datalen = justice_tx->arr_len; justice_tx_ref.data = MALLOC(justice_tx_ref.datalen, "LDKTransaction Bytes"); - memcpy(justice_tx_ref.data, justice_tx->elems, justice_tx_ref.datalen); + memcpy(justice_tx_ref.data, justice_tx->elems, justice_tx_ref.datalen); FREE(justice_tx); justice_tx_ref.data_is_owned = true; unsigned char per_commitment_key_arr[32]; CHECK(per_commitment_key->arr_len == 32); - memcpy(per_commitment_key_arr, per_commitment_key->elems, 32); + memcpy(per_commitment_key_arr, per_commitment_key->elems, 32); FREE(per_commitment_key); unsigned char (*per_commitment_key_ref)[32] = &per_commitment_key_arr; LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = (this_arg_conv->sign_justice_revoked_output)(this_arg_conv->this_arg, justice_tx_ref, input, amount, per_commitment_key_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) TS_BaseSign_sign_justice_revoked_htlc(uint32_t this_arg, int8_tArray justice_tx, int64_t input, int64_t amount, int8_tArray per_commitment_key, uint32_t htlc) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); +uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) TS_BaseSign_sign_justice_revoked_htlc(uint32_t this_arg, int8_tArray justice_tx, intptr_t input, int64_t amount, int8_tArray per_commitment_key, uint32_t htlc) { + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKTransaction justice_tx_ref; justice_tx_ref.datalen = justice_tx->arr_len; justice_tx_ref.data = MALLOC(justice_tx_ref.datalen, "LDKTransaction Bytes"); - memcpy(justice_tx_ref.data, justice_tx->elems, justice_tx_ref.datalen); + memcpy(justice_tx_ref.data, justice_tx->elems, justice_tx_ref.datalen); FREE(justice_tx); justice_tx_ref.data_is_owned = true; unsigned char per_commitment_key_arr[32]; CHECK(per_commitment_key->arr_len == 32); - memcpy(per_commitment_key_arr, per_commitment_key->elems, 32); + memcpy(per_commitment_key_arr, per_commitment_key->elems, 32); FREE(per_commitment_key); unsigned char (*per_commitment_key_ref)[32] = &per_commitment_key_arr; LDKHTLCOutputInCommitment htlc_conv; htlc_conv.inner = (void*)(htlc & (~1)); @@ -2293,32 +2306,32 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = (this_arg_conv->sign_justice_revoked_htlc)(this_arg_conv->this_arg, justice_tx_ref, input, amount, per_commitment_key_ref, &htlc_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transaction"))) TS_BaseSign_sign_counterparty_htlc_transaction(uint32_t this_arg, int8_tArray htlc_tx, int64_t input, int64_t amount, int8_tArray per_commitment_point, uint32_t htlc) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); +uint32_t __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transaction"))) TS_BaseSign_sign_counterparty_htlc_transaction(uint32_t this_arg, int8_tArray htlc_tx, intptr_t input, int64_t amount, int8_tArray per_commitment_point, uint32_t htlc) { + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKTransaction htlc_tx_ref; htlc_tx_ref.datalen = htlc_tx->arr_len; htlc_tx_ref.data = MALLOC(htlc_tx_ref.datalen, "LDKTransaction Bytes"); - memcpy(htlc_tx_ref.data, htlc_tx->elems, htlc_tx_ref.datalen); + memcpy(htlc_tx_ref.data, htlc_tx->elems, htlc_tx_ref.datalen); FREE(htlc_tx); htlc_tx_ref.data_is_owned = true; LDKPublicKey per_commitment_point_ref; CHECK(per_commitment_point->arr_len == 33); - memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); + memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); FREE(per_commitment_point); LDKHTLCOutputInCommitment htlc_conv; htlc_conv.inner = (void*)(htlc & (~1)); htlc_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = (this_arg_conv->sign_counterparty_htlc_transaction)(this_arg_conv->this_arg, htlc_tx_ref, input, amount, per_commitment_point_ref, &htlc_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_BaseSign_sign_closing_transaction"))) TS_BaseSign_sign_closing_transaction(uint32_t this_arg, uint32_t closing_tx) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKClosingTransaction closing_tx_conv; @@ -2327,11 +2340,11 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_closing_transaction"))) T CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_conv); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = (this_arg_conv->sign_closing_transaction)(this_arg_conv->this_arg, &closing_tx_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_BaseSign_sign_channel_announcement"))) TS_BaseSign_sign_channel_announcement(uint32_t this_arg, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKUnsignedChannelAnnouncement msg_conv; @@ -2340,11 +2353,11 @@ uint32_t __attribute__((export_name("TS_BaseSign_sign_channel_announcement"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = (this_arg_conv->sign_channel_announcement)(this_arg_conv->this_arg, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_BaseSign_ready_channel"))) TS_BaseSign_ready_channel(uint32_t this_arg, uint32_t channel_parameters) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKChannelTransactionParameters channel_parameters_conv; @@ -2360,15 +2373,15 @@ LDKChannelPublicKeys LDKBaseSign_set_get_pubkeys(LDKBaseSign* this_arg) { return this_arg->pubkeys; } uint32_t __attribute__((export_name("TS_BaseSign_get_pubkeys"))) TS_BaseSign_get_pubkeys(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr; LDKChannelPublicKeys ret_var = LDKBaseSign_set_get_pubkeys(this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2392,7 +2405,7 @@ LDKCVec_u8Z write_LDKSign_jcall(const void* this_arg) { LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(ret_ref.data, ret->elems, ret_ref.datalen); + memcpy(ret_ref.data, ret->elems, ret_ref.datalen); FREE(ret); return ret_ref; } static void LDKSign_JCalls_cloned(LDKSign* new_obj) { @@ -2426,11 +2439,11 @@ long __attribute__((export_name("TS_LDKSign_new"))) TS_LDKSign_new(JSValue o, J return (long)res_ptr; } int8_tArray __attribute__((export_name("TS_Sign_write"))) TS_Sign_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKSign* this_arg_conv = (LDKSign*)this_arg_ptr; LDKCVec_u8Z ret_var = (this_arg_conv->write)(this_arg_conv->this_arg); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -2441,7 +2454,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelMonitorZ_get_a(LD } int8_tArray __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get_a"))) TS_C2Tuple_BlockHashChannelMonitorZ_get_a(uint32_t owner) { LDKC2Tuple_BlockHashChannelMonitorZ* owner_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_BlockHashChannelMonitorZ_get_a(owner_conv).data, 32); return ret_arr; } @@ -2452,11 +2465,11 @@ static inline struct LDKChannelMonitor C2Tuple_BlockHashChannelMonitorZ_get_b(LD uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get_b"))) TS_C2Tuple_BlockHashChannelMonitorZ_get_b(uint32_t owner) { LDKC2Tuple_BlockHashChannelMonitorZ* owner_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(owner & ~1); LDKChannelMonitor ret_var = C2Tuple_BlockHashChannelMonitorZ_get_b(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2471,7 +2484,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitor LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(owner & ~1); LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(owner_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } static inline struct LDKDecodeError CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR owner){ @@ -2481,11 +2494,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2499,11 +2512,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHopDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)(owner & ~1); LDKRouteHop ret_var = CResult_RouteHopDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2517,11 +2530,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_err"))) TS_CResult_RouteHopDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_RouteHopDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2542,11 +2555,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_ok"))) TS_CResult_RouteDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)(owner & ~1); LDKRoute ret_var = CResult_RouteDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2560,11 +2573,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_err"))) TS_CResult_RouteDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_RouteDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2578,11 +2591,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_ok"))) TS_CResult_RouteParametersDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(owner & ~1); LDKRouteParameters ret_var = CResult_RouteParametersDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2596,11 +2609,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_err"))) TS_CResult_RouteParametersDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_RouteParametersDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2621,11 +2634,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_get_ok"))) TS_CResult_PayeeDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_PayeeDecodeErrorZ* owner_conv = (LDKCResult_PayeeDecodeErrorZ*)(owner & ~1); LDKPayee ret_var = CResult_PayeeDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2639,11 +2652,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_get_err"))) TS_CResult_PayeeDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_PayeeDecodeErrorZ* owner_conv = (LDKCResult_PayeeDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_PayeeDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2664,11 +2677,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_ok"))) TS_CResult_RouteHintDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)(owner & ~1); LDKRouteHint ret_var = CResult_RouteHintDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2682,11 +2695,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_err"))) TS_CResult_RouteHintDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_RouteHintDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2700,11 +2713,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(owner & ~1); LDKRouteHintHop ret_var = CResult_RouteHintHopDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2718,11 +2731,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_err"))) TS_CResult_RouteHintHopDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_RouteHintHopDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2743,11 +2756,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_ok"))) TS_CResult_RouteLightningErrorZ_get_ok(uint32_t owner) { LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)(owner & ~1); LDKRoute ret_var = CResult_RouteLightningErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2761,11 +2774,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_err"))) TS_CResult_RouteLightningErrorZ_get_err(uint32_t owner) { LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)(owner & ~1); LDKLightningError ret_var = CResult_RouteLightningErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2788,11 +2801,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_err"))) TS_CResult_NoneLightningErrorZ_get_err(uint32_t owner) { LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)(owner & ~1); LDKLightningError ret_var = CResult_NoneLightningErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -2804,7 +2817,7 @@ static inline struct LDKPublicKey C2Tuple_PublicKeyTypeZ_get_a(LDKC2Tuple_Public } int8_tArray __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_a"))) TS_C2Tuple_PublicKeyTypeZ_get_a(uint32_t owner) { LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, C2Tuple_PublicKeyTypeZ_get_a(owner_conv).compressed_form, 33); return ret_arr; } @@ -2816,7 +2829,7 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_b"))) TS_C2T LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)(owner & ~1); LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = C2Tuple_PublicKeyTypeZ_get_b(owner_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone(const LDKCVec_C2Tuple_PublicKeyTypeZZ *orig) { @@ -2841,12 +2854,12 @@ uint32_t __attribute__((export_name("TS_LDKErrorAction_DisconnectPeer_get_msg")) LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); assert(obj->tag == LDKErrorAction_DisconnectPeer); LDKErrorMessage msg_var = obj->disconnect_peer.msg; - uint64_t msg_ref = 0; - if ((uint64_t)msg_var.inner > 4096) { - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + if ((uintptr_t)msg_var.inner > 4096) { + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; } return msg_ref; } @@ -2860,11 +2873,11 @@ uint32_t __attribute__((export_name("TS_LDKErrorAction_SendErrorMessage_get_msg" LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1); assert(obj->tag == LDKErrorAction_SendErrorMessage); LDKErrorMessage msg_var = obj->send_error_message.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_LDKMessageSendEvent_ty_from_ptr(uint32_t ptr) { @@ -2895,7 +2908,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_L int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_get_node_id"))) TS_LDKMessageSendEvent_SendAcceptChannel_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendAcceptChannel); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_accept_channel.node_id.compressed_form, 33); return node_id_arr; } @@ -2903,17 +2916,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_ge LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendAcceptChannel); LDKAcceptChannel msg_var = obj->send_accept_channel.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_node_id"))) TS_LDKMessageSendEvent_SendOpenChannel_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendOpenChannel); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_open_channel.node_id.compressed_form, 33); return node_id_arr; } @@ -2921,17 +2934,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_ LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendOpenChannel); LDKOpenChannel msg_var = obj->send_open_channel.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_get_node_id"))) TS_LDKMessageSendEvent_SendFundingCreated_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendFundingCreated); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_funding_created.node_id.compressed_form, 33); return node_id_arr; } @@ -2939,17 +2952,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_g LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendFundingCreated); LDKFundingCreated msg_var = obj->send_funding_created.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_get_node_id"))) TS_LDKMessageSendEvent_SendFundingSigned_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendFundingSigned); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_funding_signed.node_id.compressed_form, 33); return node_id_arr; } @@ -2957,17 +2970,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_ge LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendFundingSigned); LDKFundingSigned msg_var = obj->send_funding_signed.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingLocked_get_node_id"))) TS_LDKMessageSendEvent_SendFundingLocked_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendFundingLocked); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_funding_locked.node_id.compressed_form, 33); return node_id_arr; } @@ -2975,17 +2988,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingLocked_ge LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendFundingLocked); LDKFundingLocked msg_var = obj->send_funding_locked.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id"))) TS_LDKMessageSendEvent_SendAnnouncementSignatures_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendAnnouncementSignatures); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_announcement_signatures.node_id.compressed_form, 33); return node_id_arr; } @@ -2993,17 +3006,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSign LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendAnnouncementSignatures); LDKAnnouncementSignatures msg_var = obj->send_announcement_signatures.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_node_id"))) TS_LDKMessageSendEvent_UpdateHTLCs_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_UpdateHTLCs); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->update_htl_cs.node_id.compressed_form, 33); return node_id_arr; } @@ -3011,17 +3024,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_upda LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_UpdateHTLCs); LDKCommitmentUpdate updates_var = obj->update_htl_cs.updates; - uint64_t updates_ref = 0; - CHECK((((uint64_t)updates_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&updates_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t updates_ref = 0; + CHECK((((uintptr_t)updates_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&updates_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_var); - updates_ref = (uint64_t)updates_var.inner & ~1; + updates_ref = (uintptr_t)updates_var.inner & ~1; return updates_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get_node_id"))) TS_LDKMessageSendEvent_SendRevokeAndACK_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendRevokeAndACK); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_revoke_and_ack.node_id.compressed_form, 33); return node_id_arr; } @@ -3029,17 +3042,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendRevokeAndACK); LDKRevokeAndACK msg_var = obj->send_revoke_and_ack.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_get_node_id"))) TS_LDKMessageSendEvent_SendClosingSigned_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendClosingSigned); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_closing_signed.node_id.compressed_form, 33); return node_id_arr; } @@ -3047,17 +3060,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_ge LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendClosingSigned); LDKClosingSigned msg_var = obj->send_closing_signed.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_node_id"))) TS_LDKMessageSendEvent_SendShutdown_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendShutdown); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_shutdown.node_id.compressed_form, 33); return node_id_arr; } @@ -3065,17 +3078,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_msg LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendShutdown); LDKShutdown msg_var = obj->send_shutdown.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestablish_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReestablish_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendChannelReestablish); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_channel_reestablish.node_id.compressed_form, 33); return node_id_arr; } @@ -3083,61 +3096,61 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestabli LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendChannelReestablish); LDKChannelReestablish msg_var = obj->send_channel_reestablish.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg"))) TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_msg(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement); LDKChannelAnnouncement msg_var = obj->broadcast_channel_announcement.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg"))) TS_LDKMessageSendEvent_BroadcastChannelAnnouncement_get_update_msg(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement); LDKChannelUpdate update_msg_var = obj->broadcast_channel_announcement.update_msg; - uint64_t update_msg_ref = 0; - CHECK((((uint64_t)update_msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&update_msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t update_msg_ref = 0; + CHECK((((uintptr_t)update_msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&update_msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(update_msg_var); - update_msg_ref = (uint64_t)update_msg_var.inner & ~1; + update_msg_ref = (uintptr_t)update_msg_var.inner & ~1; return update_msg_ref; } uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg"))) TS_LDKMessageSendEvent_BroadcastNodeAnnouncement_get_msg(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_BroadcastNodeAnnouncement); LDKNodeAnnouncement msg_var = obj->broadcast_node_announcement.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelUpdate_get_msg"))) TS_LDKMessageSendEvent_BroadcastChannelUpdate_get_msg(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_BroadcastChannelUpdate); LDKChannelUpdate msg_var = obj->broadcast_channel_update.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_get_node_id"))) TS_LDKMessageSendEvent_SendChannelUpdate_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendChannelUpdate); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_channel_update.node_id.compressed_form, 33); return node_id_arr; } @@ -3145,30 +3158,30 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_ge LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendChannelUpdate); LDKChannelUpdate msg_var = obj->send_channel_update.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_node_id"))) TS_LDKMessageSendEvent_HandleError_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_HandleError); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->handle_error.node_id.compressed_form, 33); return node_id_arr; } uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_action"))) TS_LDKMessageSendEvent_HandleError_get_action(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_HandleError); - uint64_t action_ref = ((uint64_t)&obj->handle_error.action) | 1; + uintptr_t action_ref = ((uintptr_t)&obj->handle_error.action) | 1; return action_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendChannelRangeQuery); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_channel_range_query.node_id.compressed_form, 33); return node_id_arr; } @@ -3176,17 +3189,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuer LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendChannelRangeQuery); LDKQueryChannelRange msg_var = obj->send_channel_range_query.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_get_node_id"))) TS_LDKMessageSendEvent_SendShortIdsQuery_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendShortIdsQuery); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_short_ids_query.node_id.compressed_form, 33); return node_id_arr; } @@ -3194,17 +3207,17 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_ge LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendShortIdsQuery); LDKQueryShortChannelIds msg_var = obj->send_short_ids_query.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRange_get_node_id"))) TS_LDKMessageSendEvent_SendReplyChannelRange_get_node_id(uint32_t ptr) { LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendReplyChannelRange); - int8_tArray node_id_arr = init_int8_tArray(33); + int8_tArray node_id_arr = init_int8_tArray(33, __LINE__); memcpy(node_id_arr->elems, obj->send_reply_channel_range.node_id.compressed_form, 33); return node_id_arr; } @@ -3212,11 +3225,11 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRang LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1); assert(obj->tag == LDKMessageSendEvent_SendReplyChannelRange); LDKReplyChannelRange msg_var = obj->send_reply_channel_range.msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner & ~1; + msg_ref = (uintptr_t)msg_var.inner & ~1; return msg_ref; } static inline LDKCVec_MessageSendEventZ CVec_MessageSendEventZ_clone(const LDKCVec_MessageSendEventZ *orig) { @@ -3243,11 +3256,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_err"))) TS_CResult_boolLightningErrorZ_get_err(uint32_t owner) { LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)(owner & ~1); LDKLightningError ret_var = CResult_boolLightningErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3260,11 +3273,11 @@ static inline struct LDKChannelAnnouncement C3Tuple_ChannelAnnouncementChannelUp uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(uint32_t owner) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1); LDKChannelAnnouncement ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3277,11 +3290,11 @@ static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateCh uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(uint32_t owner) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1); LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3294,11 +3307,11 @@ static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateCh uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(uint32_t owner) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1); LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3326,7 +3339,7 @@ CHECK(owner->result_ok); int8_tArray __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_get_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_get_ok(uint32_t owner) { LDKCResult_CVec_u8ZPeerHandleErrorZ* owner_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(owner & ~1); LDKCVec_u8Z ret_var = CResult_CVec_u8ZPeerHandleErrorZ_get_ok(owner_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -3339,11 +3352,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err(uint32_t owner) { LDKCResult_CVec_u8ZPeerHandleErrorZ* owner_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(owner & ~1); LDKPeerHandleError ret_var = CResult_CVec_u8ZPeerHandleErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3366,11 +3379,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_err"))) TS_CResult_NonePeerHandleErrorZ_get_err(uint32_t owner) { LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)(owner & ~1); LDKPeerHandleError ret_var = CResult_NonePeerHandleErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3394,11 +3407,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_err"))) TS_CResult_boolPeerHandleErrorZ_get_err(uint32_t owner) { LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)(owner & ~1); LDKPeerHandleError ret_var = CResult_boolPeerHandleErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3413,7 +3426,7 @@ uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_ok"))) TS LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = CResult_TxOutAccessErrorZ_get_ok(owner_conv); - return (uint64_t)ret_ref; + return (uintptr_t)ret_ref; } static inline enum LDKAccessError CResult_TxOutAccessErrorZ_get_err(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner){ @@ -3459,7 +3472,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_So LDKC2Tuple_usizeTransactionZ* some_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *some_conv = obj->some; *some_conv = C2Tuple_usizeTransactionZ_clone(some_conv); - return ((uint64_t)some_conv); + return ((uintptr_t)some_conv); } uint32_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_ty_from_ptr"))) TS_LDKCOption_ClosureReasonZ_ty_from_ptr(uint32_t ptr) { LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)(ptr & ~1); @@ -3472,7 +3485,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_ty_from_ptr")) uint32_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_Some_get_some"))) TS_LDKCOption_ClosureReasonZ_Some_get_some(uint32_t ptr) { LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)(ptr & ~1); assert(obj->tag == LDKCOption_ClosureReasonZ_Some); - uint64_t some_ref = ((uint64_t)&obj->some) | 1; + uintptr_t some_ref = ((uintptr_t)&obj->some) | 1; return some_ref; } static inline struct LDKCOption_ClosureReasonZ CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR owner){ @@ -3483,7 +3496,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(owner & ~1); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -3494,11 +3507,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_COption_ClosureReasonZDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3516,7 +3529,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDK uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_Some_get_some"))) TS_LDKCOption_EventZ_Some_get_some(uint32_t ptr) { LDKCOption_EventZ *obj = (LDKCOption_EventZ*)(ptr & ~1); assert(obj->tag == LDKCOption_EventZ_Some); - uint64_t some_ref = ((uint64_t)&obj->some) | 1; + uintptr_t some_ref = ((uintptr_t)&obj->some) | 1; return some_ref; } static inline struct LDKCOption_EventZ CResult_COption_EventZDecodeErrorZ_get_ok(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR owner){ @@ -3527,7 +3540,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_ LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(owner & ~1); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = CResult_COption_EventZDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -3538,11 +3551,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_err"))) TS_CResult_COption_EventZDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_COption_EventZDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3556,11 +3569,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_ok"))) TS_CResult_NodeIdDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)(owner & ~1); LDKNodeId ret_var = CResult_NodeIdDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3574,11 +3587,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_err"))) TS_CResult_NodeIdDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_NodeIdDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3593,7 +3606,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErr LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -3604,11 +3617,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3627,10 +3640,10 @@ static void LDKAccess_JCalls_free(void* this_arg) { } LDKCResult_TxOutAccessErrorZ get_utxo_LDKAccess_jcall(const void* this_arg, const uint8_t (* genesis_hash)[32], uint64_t short_channel_id) { LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg; - int8_tArray genesis_hash_arr = init_int8_tArray(32); + int8_tArray genesis_hash_arr = init_int8_tArray(32, __LINE__); memcpy(genesis_hash_arr->elems, *genesis_hash, 32); uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 17, (uint32_t)genesis_hash_arr, (uint32_t)short_channel_id); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(ret_ptr); FREE((void*)ret); @@ -3658,16 +3671,16 @@ long __attribute__((export_name("TS_LDKAccess_new"))) TS_LDKAccess_new(JSValue return (long)res_ptr; } uint32_t __attribute__((export_name("TS_Access_get_utxo"))) TS_Access_get_utxo(uint32_t this_arg, int8_tArray genesis_hash, int64_t short_channel_id) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKAccess* this_arg_conv = (LDKAccess*)this_arg_ptr; unsigned char genesis_hash_arr[32]; CHECK(genesis_hash->arr_len == 32); - memcpy(genesis_hash_arr, genesis_hash->elems, 32); + memcpy(genesis_hash_arr, genesis_hash->elems, 32); FREE(genesis_hash); unsigned char (*genesis_hash_ref)[32] = &genesis_hash_arr; LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = (this_arg_conv->get_utxo)(this_arg_conv->this_arg, genesis_hash_ref, short_channel_id); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_ty_from_ptr"))) TS_LDKCOption_AccessZ_ty_from_ptr(uint32_t ptr) { @@ -3684,7 +3697,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_ LDKAccess* some_ret = MALLOC(sizeof(LDKAccess), "LDKAccess"); *some_ret = obj->some; // Warning: We likely need to clone here, but no clone is available, so we just do it for Java instances - return (uint64_t)some_ret; + return (uintptr_t)some_ret; } static inline struct LDKDirectionalChannelInfo CResult_DirectionalChannelInfoDecodeErrorZ_get_ok(LDKCResult_DirectionalChannelInfoDecodeErrorZ *NONNULL_PTR owner){ CHECK(owner->result_ok); @@ -3693,11 +3706,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_get_ok"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_DirectionalChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(owner & ~1); LDKDirectionalChannelInfo ret_var = CResult_DirectionalChannelInfoDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3711,11 +3724,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_get_err"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_DirectionalChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_DirectionalChannelInfoDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3729,11 +3742,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(owner & ~1); LDKChannelInfo ret_var = CResult_ChannelInfoDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3747,11 +3760,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelInfoDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelInfoDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3765,11 +3778,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(owner & ~1); LDKRoutingFees ret_var = CResult_RoutingFeesDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3783,11 +3796,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_err"))) TS_CResult_RoutingFeesDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_RoutingFeesDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3807,7 +3820,7 @@ uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetA int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv4_get_addr"))) TS_LDKNetAddress_IPv4_get_addr(uint32_t ptr) { LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); assert(obj->tag == LDKNetAddress_IPv4); - int8_tArray addr_arr = init_int8_tArray(4); + int8_tArray addr_arr = init_int8_tArray(4, __LINE__); memcpy(addr_arr->elems, obj->i_pv4.addr.data, 4); return addr_arr; } @@ -3819,7 +3832,7 @@ int16_t __attribute__((export_name("TS_LDKNetAddress_IPv4_get_port"))) TS_LDKNet int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv6_get_addr"))) TS_LDKNetAddress_IPv6_get_addr(uint32_t ptr) { LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); assert(obj->tag == LDKNetAddress_IPv6); - int8_tArray addr_arr = init_int8_tArray(16); + int8_tArray addr_arr = init_int8_tArray(16, __LINE__); memcpy(addr_arr->elems, obj->i_pv6.addr.data, 16); return addr_arr; } @@ -3831,14 +3844,14 @@ int16_t __attribute__((export_name("TS_LDKNetAddress_IPv6_get_port"))) TS_LDKNet int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV2_get_onion_v2"))) TS_LDKNetAddress_OnionV2_get_onion_v2(uint32_t ptr) { LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); assert(obj->tag == LDKNetAddress_OnionV2); - int8_tArray onion_v2_arr = init_int8_tArray(12); + int8_tArray onion_v2_arr = init_int8_tArray(12, __LINE__); memcpy(onion_v2_arr->elems, obj->onion_v2.data, 12); return onion_v2_arr; } int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_ed25519_pubkey"))) TS_LDKNetAddress_OnionV3_get_ed25519_pubkey(uint32_t ptr) { LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1); assert(obj->tag == LDKNetAddress_OnionV3); - int8_tArray ed25519_pubkey_arr = init_int8_tArray(32); + int8_tArray ed25519_pubkey_arr = init_int8_tArray(32, __LINE__); memcpy(ed25519_pubkey_arr->elems, obj->onion_v3.ed25519_pubkey.data, 32); return ed25519_pubkey_arr; } @@ -3871,11 +3884,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(owner & ~1); LDKNodeAnnouncementInfo ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3889,11 +3902,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3912,11 +3925,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeInfoDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(owner & ~1); LDKNodeInfo ret_var = CResult_NodeInfoDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3930,11 +3943,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_err"))) TS_CResult_NodeInfoDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_NodeInfoDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3948,11 +3961,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(owner & ~1); LDKNetworkGraph ret_var = CResult_NetworkGraphDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3966,11 +3979,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_err"))) TS_CResult_NetworkGraphDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_NetworkGraphDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -3990,10 +4003,10 @@ uint32_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_g assert(obj->tag == LDKCOption_CVec_NetAddressZZ_Some); LDKCVec_NetAddressZ some_var = obj->some; uint32_tArray some_arr = NULL; - some_arr = init_uint32_tArray(some_var.datalen); + some_arr = init_uint32_tArray(some_var.datalen, __LINE__); uint32_t *some_arr_ptr = (uint32_t*)(((uint8_t*)some_arr) + 4); for (size_t m = 0; m < some_var.datalen; m++) { - uint64_t some_conv_12_ref = ((uint64_t)&some_var.data[m]) | 1; + uintptr_t some_conv_12_ref = ((uintptr_t)&some_var.data[m]) | 1; some_arr_ptr[m] = some_conv_12_ref; } @@ -4006,11 +4019,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_get_ok"))) TS_CResult_ScoringParametersDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ScoringParametersDecodeErrorZ* owner_conv = (LDKCResult_ScoringParametersDecodeErrorZ*)(owner & ~1); LDKScoringParameters ret_var = *CResult_ScoringParametersDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner & ~1; + ret_ref = (uintptr_t)ret_var.inner & ~1; return ret_ref; } @@ -4021,11 +4034,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_get_err"))) TS_CResult_ScoringParametersDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ScoringParametersDecodeErrorZ* owner_conv = (LDKCResult_ScoringParametersDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ScoringParametersDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4039,11 +4052,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(owner & ~1); LDKInitFeatures ret_var = CResult_InitFeaturesDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4057,11 +4070,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_err"))) TS_CResult_InitFeaturesDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_InitFeaturesDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4075,11 +4088,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(owner & ~1); LDKChannelFeatures ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4093,11 +4106,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4111,11 +4124,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(owner & ~1); LDKNodeFeatures ret_var = CResult_NodeFeaturesDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4129,11 +4142,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_NodeFeaturesDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4147,11 +4160,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(owner & ~1); LDKInvoiceFeatures ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4165,11 +4178,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4183,11 +4196,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(owner & ~1); LDKChannelTypeFeatures ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4201,11 +4214,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4220,7 +4233,7 @@ uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_ok") LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = CResult_NetAddressDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -4231,11 +4244,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_err"))) TS_CResult_NetAddressDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_NetAddressDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4277,11 +4290,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(owner & ~1); LDKAcceptChannel ret_var = CResult_AcceptChannelDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4295,11 +4308,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_err"))) TS_CResult_AcceptChannelDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_AcceptChannelDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4313,11 +4326,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(owner & ~1); LDKAnnouncementSignatures ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4331,11 +4344,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4349,11 +4362,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(owner & ~1); LDKChannelReestablish ret_var = CResult_ChannelReestablishDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4367,11 +4380,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelReestablishDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4385,11 +4398,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(owner & ~1); LDKClosingSigned ret_var = CResult_ClosingSignedDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4403,11 +4416,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ClosingSignedDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4421,11 +4434,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(owner & ~1); LDKClosingSignedFeeRange ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4439,11 +4452,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4457,11 +4470,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(owner & ~1); LDKCommitmentSigned ret_var = CResult_CommitmentSignedDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4475,11 +4488,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_CommitmentSignedDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4493,11 +4506,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(owner & ~1); LDKFundingCreated ret_var = CResult_FundingCreatedDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4511,11 +4524,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_err"))) TS_CResult_FundingCreatedDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_FundingCreatedDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4529,11 +4542,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_ok"))) TS_CResult_FundingSignedDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(owner & ~1); LDKFundingSigned ret_var = CResult_FundingSignedDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4547,11 +4560,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_err"))) TS_CResult_FundingSignedDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_FundingSignedDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4565,11 +4578,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_get_ok"))) TS_CResult_FundingLockedDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_FundingLockedDecodeErrorZ* owner_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(owner & ~1); LDKFundingLocked ret_var = CResult_FundingLockedDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4583,11 +4596,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_get_err"))) TS_CResult_FundingLockedDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_FundingLockedDecodeErrorZ* owner_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_FundingLockedDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4601,11 +4614,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_ok"))) TS_CResult_InitDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)(owner & ~1); LDKInit ret_var = CResult_InitDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4619,11 +4632,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_err"))) TS_CResult_InitDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_InitDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4637,11 +4650,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_ok"))) TS_CResult_OpenChannelDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(owner & ~1); LDKOpenChannel ret_var = CResult_OpenChannelDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4655,11 +4668,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_err"))) TS_CResult_OpenChannelDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_OpenChannelDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4673,11 +4686,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(owner & ~1); LDKRevokeAndACK ret_var = CResult_RevokeAndACKDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4691,11 +4704,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_RevokeAndACKDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4709,11 +4722,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_ok"))) TS_CResult_ShutdownDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)(owner & ~1); LDKShutdown ret_var = CResult_ShutdownDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4727,11 +4740,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_err"))) TS_CResult_ShutdownDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ShutdownDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4745,11 +4758,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(owner & ~1); LDKUpdateFailHTLC ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4763,11 +4776,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4781,11 +4794,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(owner & ~1); LDKUpdateFailMalformedHTLC ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4799,11 +4812,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4817,11 +4830,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(owner & ~1); LDKUpdateFee ret_var = CResult_UpdateFeeDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4835,11 +4848,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_err"))) TS_CResult_UpdateFeeDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UpdateFeeDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4853,11 +4866,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(owner & ~1); LDKUpdateFulfillHTLC ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4871,11 +4884,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4889,11 +4902,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(owner & ~1); LDKUpdateAddHTLC ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4907,11 +4920,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4925,11 +4938,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_ok"))) TS_CResult_PingDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)(owner & ~1); LDKPing ret_var = CResult_PingDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4943,11 +4956,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_err"))) TS_CResult_PingDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_PingDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4961,11 +4974,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_ok"))) TS_CResult_PongDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)(owner & ~1); LDKPong ret_var = CResult_PongDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4979,11 +4992,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_err"))) TS_CResult_PongDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_PongDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -4997,11 +5010,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(owner & ~1); LDKUnsignedChannelAnnouncement ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5015,11 +5028,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5033,11 +5046,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(owner & ~1); LDKChannelAnnouncement ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5051,11 +5064,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5069,11 +5082,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(owner & ~1); LDKUnsignedChannelUpdate ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5087,11 +5100,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5105,11 +5118,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(owner & ~1); LDKChannelUpdate ret_var = CResult_ChannelUpdateDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5123,11 +5136,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ChannelUpdateDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5141,11 +5154,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(owner & ~1); LDKErrorMessage ret_var = CResult_ErrorMessageDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5159,11 +5172,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_err"))) TS_CResult_ErrorMessageDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ErrorMessageDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5177,11 +5190,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(owner & ~1); LDKUnsignedNodeAnnouncement ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5195,11 +5208,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5213,11 +5226,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(owner & ~1); LDKNodeAnnouncement ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5231,11 +5244,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5249,11 +5262,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(owner & ~1); LDKQueryShortChannelIds ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5267,11 +5280,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5285,11 +5298,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(owner & ~1); LDKReplyShortChannelIdsEnd ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5303,11 +5316,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5321,11 +5334,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(owner & ~1); LDKQueryChannelRange ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5339,11 +5352,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5357,11 +5370,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(owner & ~1); LDKReplyChannelRange ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5375,11 +5388,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5393,11 +5406,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(owner & ~1); LDKGossipTimestampFilter ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5411,11 +5424,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5429,11 +5442,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1); LDKDelayedPaymentOutputDescriptor ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5447,11 +5460,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5465,11 +5478,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1); LDKStaticPaymentOutputDescriptor ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5483,11 +5496,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5502,7 +5515,7 @@ uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecode LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -5513,11 +5526,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5532,7 +5545,7 @@ uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_ok"))) TS_ LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)(owner & ~1); LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = CResult_SignDecodeErrorZ_get_ok(owner_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } static inline struct LDKDecodeError CResult_SignDecodeErrorZ_get_err(LDKCResult_SignDecodeErrorZ *NONNULL_PTR owner){ @@ -5542,11 +5555,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_err"))) TS_CResult_SignDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_SignDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5559,7 +5572,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_get_ok"))) TS_CResult_RecoverableSignatureNoneZ_get_ok(uint32_t owner) { LDKCResult_RecoverableSignatureNoneZ* owner_conv = (LDKCResult_RecoverableSignatureNoneZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(68); + int8_tArray ret_arr = init_int8_tArray(68, __LINE__); memcpy(ret_arr->elems, CResult_RecoverableSignatureNoneZ_get_ok(owner_conv).serialized_form, 68); return ret_arr; } @@ -5588,11 +5601,11 @@ ptrArray __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_get_ok"))) LDKCResult_CVec_CVec_u8ZZNoneZ* owner_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(owner & ~1); LDKCVec_CVec_u8ZZ ret_var = CResult_CVec_CVec_u8ZZNoneZ_get_ok(owner_conv); ptrArray ret_arr = NULL; - ret_arr = init_ptrArray(ret_var.datalen); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); 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); + int8_tArray ret_conv_12_arr = init_int8_tArray(ret_conv_12_var.datalen, __LINE__); memcpy(ret_conv_12_arr->elems, ret_conv_12_var.data, ret_conv_12_var.datalen); CVec_u8Z_free(ret_conv_12_var); ret_arr_ptr[m] = ret_conv_12_arr; @@ -5618,11 +5631,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(owner & ~1); LDKInMemorySigner ret_var = CResult_InMemorySignerDecodeErrorZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5636,11 +5649,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_err"))) TS_CResult_InMemorySignerDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_InMemorySignerDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -5661,7 +5674,7 @@ CHECK(owner->result_ok); int8_tArray __attribute__((export_name("TS_CResult_TransactionNoneZ_get_ok"))) TS_CResult_TransactionNoneZ_get_ok(uint32_t owner) { LDKCResult_TransactionNoneZ* owner_conv = (LDKCResult_TransactionNoneZ*)(owner & ~1); LDKTransaction ret_var = CResult_TransactionNoneZ_get_ok(owner_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -5687,26 +5700,26 @@ static void LDKFilter_JCalls_free(void* this_arg) { } void register_tx_LDKFilter_jcall(const void* this_arg, const uint8_t (* txid)[32], LDKu8slice script_pubkey) { LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; - int8_tArray txid_arr = init_int8_tArray(32); + int8_tArray txid_arr = init_int8_tArray(32, __LINE__); memcpy(txid_arr->elems, *txid, 32); LDKu8slice script_pubkey_var = script_pubkey; - int8_tArray script_pubkey_arr = init_int8_tArray(script_pubkey_var.datalen); + 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, 18, (uint32_t)txid_arr, (uint32_t)script_pubkey_arr); } LDKCOption_C2Tuple_usizeTransactionZZ register_output_LDKFilter_jcall(const void* this_arg, LDKWatchedOutput output) { LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg; LDKWatchedOutput output_var = output; - uint64_t output_ref = 0; - CHECK((((uint64_t)output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t output_ref = 0; + CHECK((((uintptr_t)output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(output_var); - output_ref = (uint64_t)output_var.inner; + output_ref = (uintptr_t)output_var.inner; if (output_var.is_owned) { output_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 19, (uint32_t)output_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCOption_C2Tuple_usizeTransactionZZ ret_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(ret_ptr); FREE((void*)ret); @@ -5735,21 +5748,21 @@ long __attribute__((export_name("TS_LDKFilter_new"))) TS_LDKFilter_new(JSValue return (long)res_ptr; } void __attribute__((export_name("TS_Filter_register_tx"))) TS_Filter_register_tx(uint32_t this_arg, int8_tArray txid, int8_tArray script_pubkey) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKFilter* this_arg_conv = (LDKFilter*)this_arg_ptr; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); - memcpy(txid_arr, txid->elems, 32); + memcpy(txid_arr, txid->elems, 32); FREE(txid); 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; + script_pubkey_ref.data = script_pubkey->elems /* XXX script_pubkey leaks */; (this_arg_conv->register_tx)(this_arg_conv->this_arg, txid_ref, script_pubkey_ref); } uint32_t __attribute__((export_name("TS_Filter_register_output"))) TS_Filter_register_output(uint32_t this_arg, uint32_t output) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKFilter* this_arg_conv = (LDKFilter*)this_arg_ptr; LDKWatchedOutput output_conv; @@ -5759,7 +5772,7 @@ uint32_t __attribute__((export_name("TS_Filter_register_output"))) TS_Filter_re output_conv = WatchedOutput_clone(&output_conv); LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = (this_arg_conv->register_output)(this_arg_conv->this_arg, output_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -5777,7 +5790,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_ LDKFilter* some_ret = MALLOC(sizeof(LDKFilter), "LDKFilter"); *some_ret = obj->some; // Warning: We likely need to clone here, but no clone is available, so we just do it for Java instances - return (uint64_t)some_ret; + return (uintptr_t)some_ret; } static inline struct LDKLockedChannelMonitor *CResult_LockedChannelMonitorNoneZ_get_ok(LDKCResult_LockedChannelMonitorNoneZ *NONNULL_PTR owner){ CHECK(owner->result_ok); @@ -5786,11 +5799,11 @@ CHECK(owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_ok"))) TS_CResult_LockedChannelMonitorNoneZ_get_ok(uint32_t owner) { LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(owner & ~1); LDKLockedChannelMonitor ret_var = *CResult_LockedChannelMonitorNoneZ_get_ok(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner & ~1; + ret_ref = (uintptr_t)ret_var.inner & ~1; return ret_ref; } @@ -5859,11 +5872,11 @@ uint32_t __attribute__((export_name("TS_LDKAPIError_IncompatibleShutdownScript_g LDKAPIError *obj = (LDKAPIError*)(ptr & ~1); assert(obj->tag == LDKAPIError_IncompatibleShutdownScript); LDKShutdownScript script_var = obj->incompatible_shutdown_script.script; - uint64_t script_ref = 0; - CHECK((((uint64_t)script_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&script_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t script_ref = 0; + CHECK((((uintptr_t)script_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&script_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(script_var); - script_ref = (uint64_t)script_var.inner & ~1; + script_ref = (uintptr_t)script_var.inner & ~1; return script_ref; } static inline void CResult_NoneAPIErrorZ_get_ok(LDKCResult_NoneAPIErrorZ *NONNULL_PTR owner){ @@ -5883,7 +5896,7 @@ uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_err"))) TS_CR LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)(owner & ~1); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_NoneAPIErrorZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -5920,7 +5933,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult__u832APIErrorZ_get_ok"))) TS_CResult__u832APIErrorZ_get_ok(uint32_t owner) { LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult__u832APIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; } @@ -5933,7 +5946,7 @@ uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_get_err"))) TS_C LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)(owner & ~1); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult__u832APIErrorZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -5950,7 +5963,7 @@ uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ParameterError_get_parameter_error"))) TS_LDKPaymentSendFailure_ParameterError_get_parameter_error(uint32_t ptr) { LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); assert(obj->tag == LDKPaymentSendFailure_ParameterError); - uint64_t parameter_error_ref = ((uint64_t)&obj->parameter_error) | 1; + uintptr_t parameter_error_ref = ((uintptr_t)&obj->parameter_error) | 1; return parameter_error_ref; } uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error"))) TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error(uint32_t ptr) { @@ -5958,13 +5971,13 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PathParameter assert(obj->tag == LDKPaymentSendFailure_PathParameterError); 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); + 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); 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]; *path_parameter_error_conv_22_conv = CResult_NoneAPIErrorZ_clone(path_parameter_error_conv_22_conv); - path_parameter_error_arr_ptr[w] = (uint64_t)path_parameter_error_conv_22_conv; + path_parameter_error_arr_ptr[w] = (uintptr_t)path_parameter_error_conv_22_conv; } return path_parameter_error_arr; @@ -5974,10 +5987,10 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_AllFailedRetr assert(obj->tag == LDKPaymentSendFailure_AllFailedRetrySafe); 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); + 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); for (size_t k = 0; k < all_failed_retry_safe_var.datalen; k++) { - uint64_t all_failed_retry_safe_conv_10_ref = ((uint64_t)&all_failed_retry_safe_var.data[k]) | 1; + uintptr_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; } @@ -5988,13 +6001,13 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailur assert(obj->tag == LDKPaymentSendFailure_PartialFailure); LDKCVec_CResult_NoneAPIErrorZZ results_var = obj->partial_failure.results; uint32_tArray results_arr = NULL; - results_arr = init_uint32_tArray(results_var.datalen); + results_arr = init_uint32_tArray(results_var.datalen, __LINE__); uint32_t *results_arr_ptr = (uint32_t*)(((uint8_t*)results_arr) + 4); 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]; *results_conv_22_conv = CResult_NoneAPIErrorZ_clone(results_conv_22_conv); - results_arr_ptr[w] = (uint64_t)results_conv_22_conv; + results_arr_ptr[w] = (uintptr_t)results_conv_22_conv; } return results_arr; @@ -6003,19 +6016,19 @@ uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); assert(obj->tag == LDKPaymentSendFailure_PartialFailure); LDKRouteParameters failed_paths_retry_var = obj->partial_failure.failed_paths_retry; - uint64_t failed_paths_retry_ref = 0; - if ((uint64_t)failed_paths_retry_var.inner > 4096) { - CHECK((((uint64_t)failed_paths_retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&failed_paths_retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t failed_paths_retry_ref = 0; + if ((uintptr_t)failed_paths_retry_var.inner > 4096) { + CHECK((((uintptr_t)failed_paths_retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&failed_paths_retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(failed_paths_retry_var); - failed_paths_retry_ref = (uint64_t)failed_paths_retry_var.inner & ~1; + failed_paths_retry_ref = (uintptr_t)failed_paths_retry_var.inner & ~1; } return failed_paths_retry_ref; } int8_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get_payment_id"))) TS_LDKPaymentSendFailure_PartialFailure_get_payment_id(uint32_t ptr) { LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1); assert(obj->tag == LDKPaymentSendFailure_PartialFailure); - int8_tArray payment_id_arr = init_int8_tArray(32); + int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__); memcpy(payment_id_arr->elems, obj->partial_failure.payment_id.data, 32); return payment_id_arr; } @@ -6025,7 +6038,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_get_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_get_ok(uint32_t owner) { LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentIdPaymentSendFailureZ_get_ok(owner_conv).data, 32); return ret_arr; } @@ -6038,7 +6051,7 @@ uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_ge LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(owner & ~1); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_PaymentIdPaymentSendFailureZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -6059,7 +6072,7 @@ uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_err LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)(owner & ~1); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_NonePaymentSendFailureZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -6068,7 +6081,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_a(LDKC2 } int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_a"))) TS_C2Tuple_PaymentHashPaymentIdZ_get_a(uint32_t owner) { LDKC2Tuple_PaymentHashPaymentIdZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentIdZ_get_a(owner_conv).data, 32); return ret_arr; } @@ -6078,7 +6091,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentIdZ_get_b(LDKC2 } int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_get_b"))) TS_C2Tuple_PaymentHashPaymentIdZ_get_b(uint32_t owner) { LDKC2Tuple_PaymentHashPaymentIdZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentIdZ_get_b(owner_conv).data, 32); return ret_arr; } @@ -6091,7 +6104,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1); LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(owner_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } static inline struct LDKPaymentSendFailure CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR owner){ @@ -6102,7 +6115,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -6111,7 +6124,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_a(L } int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_get_a"))) TS_C2Tuple_PaymentHashPaymentSecretZ_get_a(uint32_t owner) { LDKC2Tuple_PaymentHashPaymentSecretZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentSecretZ_get_a(owner_conv).data, 32); return ret_arr; } @@ -6121,7 +6134,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_PaymentHashPaymentSecretZ_get_b(L } int8_tArray __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_get_b"))) TS_C2Tuple_PaymentHashPaymentSecretZ_get_b(uint32_t owner) { LDKC2Tuple_PaymentHashPaymentSecretZ* owner_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_PaymentHashPaymentSecretZ_get_b(owner_conv).data, 32); return ret_arr; } @@ -6134,7 +6147,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(owner & ~1); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(owner_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } static inline void CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR owner){ @@ -6154,7 +6167,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(owner_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } static inline struct LDKAPIError CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR owner){ @@ -6165,7 +6178,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -6175,7 +6188,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_get_ok"))) TS_CResult_PaymentSecretNoneZ_get_ok(uint32_t owner) { LDKCResult_PaymentSecretNoneZ* owner_conv = (LDKCResult_PaymentSecretNoneZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentSecretNoneZ_get_ok(owner_conv).data, 32); return ret_arr; } @@ -6195,7 +6208,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_ok"))) TS_CResult_PaymentSecretAPIErrorZ_get_ok(uint32_t owner) { LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentSecretAPIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; } @@ -6208,7 +6221,7 @@ uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_err" LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(owner & ~1); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_PaymentSecretAPIErrorZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -6218,7 +6231,7 @@ CHECK(owner->result_ok); } int8_tArray __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_get_ok(uint32_t owner) { LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, CResult_PaymentPreimageAPIErrorZ_get_ok(owner_conv).data, 32); return ret_arr; } @@ -6231,7 +6244,7 @@ uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_er LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(owner & ~1); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = CResult_PaymentPreimageAPIErrorZ_get_err(owner_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -6255,25 +6268,25 @@ static void LDKWatch_JCalls_free(void* this_arg) { LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitor monitor) { LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; LDKOutPoint funding_txo_var = funding_txo; - uint64_t funding_txo_ref = 0; - CHECK((((uint64_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t funding_txo_ref = 0; + CHECK((((uintptr_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uint64_t)funding_txo_var.inner; + funding_txo_ref = (uintptr_t)funding_txo_var.inner; if (funding_txo_var.is_owned) { funding_txo_ref |= 1; } LDKChannelMonitor monitor_var = monitor; - uint64_t monitor_ref = 0; - CHECK((((uint64_t)monitor_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&monitor_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t monitor_ref = 0; + CHECK((((uintptr_t)monitor_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&monitor_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(monitor_var); - monitor_ref = (uint64_t)monitor_var.inner; + monitor_ref = (uintptr_t)monitor_var.inner; if (monitor_var.is_owned) { monitor_ref |= 1; } uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 20, (uint32_t)funding_txo_ref, (uint32_t)monitor_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); FREE((void*)ret); @@ -6282,25 +6295,25 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void* LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitorUpdate update) { LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg; LDKOutPoint funding_txo_var = funding_txo; - uint64_t funding_txo_ref = 0; - CHECK((((uint64_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t funding_txo_ref = 0; + CHECK((((uintptr_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var); - funding_txo_ref = (uint64_t)funding_txo_var.inner; + funding_txo_ref = (uintptr_t)funding_txo_var.inner; if (funding_txo_var.is_owned) { funding_txo_ref |= 1; } LDKChannelMonitorUpdate update_var = update; - uint64_t update_ref = 0; - CHECK((((uint64_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t update_ref = 0; + CHECK((((uintptr_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var); - update_ref = (uint64_t)update_var.inner; + update_ref = (uintptr_t)update_var.inner; if (update_var.is_owned) { update_ref |= 1; } uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 21, (uint32_t)funding_txo_ref, (uint32_t)update_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); FREE((void*)ret); @@ -6315,10 +6328,10 @@ LDKCVec_MonitorEventZ release_pending_monitor_events_LDKWatch_jcall(const void* ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint32_t* ret_vals = ret->elems /* XXX ret leaks */; for (size_t o = 0; o < ret_constr.datalen; o++) { uint32_t ret_conv_14 = ret_vals[o]; - void* ret_conv_14_ptr = (void*)(((uint64_t)ret_conv_14) & ~1); + void* ret_conv_14_ptr = (void*)(((uintptr_t)ret_conv_14) & ~1); CHECK_ACCESS(ret_conv_14_ptr); LDKMonitorEvent ret_conv_14_conv = *(LDKMonitorEvent*)(ret_conv_14_ptr); FREE((void*)ret_conv_14); @@ -6350,7 +6363,7 @@ long __attribute__((export_name("TS_LDKWatch_new"))) TS_LDKWatch_new(JSValue o) return (long)res_ptr; } uint32_t __attribute__((export_name("TS_Watch_watch_channel"))) TS_Watch_watch_channel(uint32_t this_arg, uint32_t funding_txo, uint32_t monitor) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + 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; LDKOutPoint funding_txo_conv; @@ -6365,11 +6378,11 @@ uint32_t __attribute__((export_name("TS_Watch_watch_channel"))) TS_Watch_watch_ monitor_conv = ChannelMonitor_clone(&monitor_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->watch_channel)(this_arg_conv->this_arg, funding_txo_conv, monitor_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_Watch_update_channel"))) TS_Watch_update_channel(uint32_t this_arg, uint32_t funding_txo, uint32_t update) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + 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; LDKOutPoint funding_txo_conv; @@ -6384,21 +6397,21 @@ uint32_t __attribute__((export_name("TS_Watch_update_channel"))) TS_Watch_updat update_conv = ChannelMonitorUpdate_clone(&update_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->update_channel)(this_arg_conv->this_arg, funding_txo_conv, update_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_tArray __attribute__((export_name("TS_Watch_release_pending_monitor_events"))) TS_Watch_release_pending_monitor_events(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + 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_MonitorEventZ 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - uint64_t ret_conv_14_ref = (uint64_t)ret_conv_14_copy; + uintptr_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy; ret_arr_ptr[o] = ret_conv_14_ref; } @@ -6419,7 +6432,7 @@ static void LDKBroadcasterInterface_JCalls_free(void* this_arg) { void broadcast_transaction_LDKBroadcasterInterface_jcall(const void* this_arg, LDKTransaction tx) { LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) this_arg; LDKTransaction tx_var = tx; - int8_tArray tx_arr = init_int8_tArray(tx_var.datalen); + 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, 23, (uint32_t)tx_arr); @@ -6446,13 +6459,13 @@ long __attribute__((export_name("TS_LDKBroadcasterInterface_new"))) TS_LDKBroad return (long)res_ptr; } void __attribute__((export_name("TS_BroadcasterInterface_broadcast_transaction"))) TS_BroadcasterInterface_broadcast_transaction(uint32_t this_arg, int8_tArray tx) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKBroadcasterInterface* this_arg_conv = (LDKBroadcasterInterface*)this_arg_ptr; LDKTransaction tx_ref; tx_ref.datalen = tx->arr_len; tx_ref.data = MALLOC(tx_ref.datalen, "LDKTransaction Bytes"); - memcpy(tx_ref.data, tx->elems, tx_ref.datalen); + memcpy(tx_ref.data, tx->elems, tx_ref.datalen); FREE(tx); tx_ref.data_is_owned = true; (this_arg_conv->broadcast_transaction)(this_arg_conv->this_arg, tx_ref); } @@ -6472,7 +6485,7 @@ LDKSecretKey get_node_secret_LDKKeysInterface_jcall(const void* this_arg) { int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 24); LDKSecretKey ret_ref; CHECK(ret->arr_len == 32); - memcpy(ret_ref.bytes, ret->elems, 32); + memcpy(ret_ref.bytes, ret->elems, 32); FREE(ret); return ret_ref; } LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg) { @@ -6481,7 +6494,7 @@ LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg) LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(ret_ref.data, ret->elems, ret_ref.datalen); + memcpy(ret_ref.data, ret->elems, ret_ref.datalen); FREE(ret); return ret_ref; } LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* this_arg) { @@ -6496,7 +6509,7 @@ LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* t LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inbound, uint64_t channel_value_satoshis) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 27, (uint32_t)inbound, (uint32_t)channel_value_satoshis); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKSign ret_conv = *(LDKSign*)(ret_ptr); FREE((void*)ret); @@ -6507,16 +6520,16 @@ LDKThirtyTwoBytes get_secure_random_bytes_LDKKeysInterface_jcall(const void* thi int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 28); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); - memcpy(ret_ref.data, ret->elems, 32); + memcpy(ret_ref.data, ret->elems, 32); FREE(ret); return ret_ref; } LDKCResult_SignDecodeErrorZ read_chan_signer_LDKKeysInterface_jcall(const void* this_arg, LDKu8slice reader) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; LDKu8slice reader_var = reader; - int8_tArray reader_arr = init_int8_tArray(reader_var.datalen); + 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, 29, (uint32_t)reader_arr); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_SignDecodeErrorZ ret_conv = *(LDKCResult_SignDecodeErrorZ*)(ret_ptr); FREE((void*)ret); @@ -6525,11 +6538,11 @@ LDKCResult_SignDecodeErrorZ read_chan_signer_LDKKeysInterface_jcall(const void* LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const void* this_arg, LDKCVec_u8Z invoice_preimage) { LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg; LDKCVec_u8Z invoice_preimage_var = invoice_preimage; - int8_tArray invoice_preimage_arr = init_int8_tArray(invoice_preimage_var.datalen); + int8_tArray invoice_preimage_arr = init_int8_tArray(invoice_preimage_var.datalen, __LINE__); memcpy(invoice_preimage_arr->elems, invoice_preimage_var.data, invoice_preimage_var.datalen); CVec_u8Z_free(invoice_preimage_var); uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 30, (uint32_t)invoice_preimage_arr); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_RecoverableSignatureNoneZ ret_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(ret_ptr); FREE((void*)ret); @@ -6540,7 +6553,7 @@ LDKThirtyTwoBytes get_inbound_payment_key_material_LDKKeysInterface_jcall(const int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 31); LDKThirtyTwoBytes ret_ref; CHECK(ret->arr_len == 32); - memcpy(ret_ref.data, ret->elems, 32); + memcpy(ret_ref.data, ret->elems, 32); FREE(ret); return ret_ref; } static void LDKKeysInterface_JCalls_cloned(LDKKeysInterface* new_obj) { @@ -6572,35 +6585,35 @@ long __attribute__((export_name("TS_LDKKeysInterface_new"))) TS_LDKKeysInterfac return (long)res_ptr; } int8_tArray __attribute__((export_name("TS_KeysInterface_get_node_secret"))) TS_KeysInterface_get_node_secret(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->get_node_secret)(this_arg_conv->this_arg).bytes, 32); return ret_arr; } int8_tArray __attribute__((export_name("TS_KeysInterface_get_destination_script"))) TS_KeysInterface_get_destination_script(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKCVec_u8Z ret_var = (this_arg_conv->get_destination_script)(this_arg_conv->this_arg); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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_KeysInterface_get_shutdown_scriptpubkey"))) TS_KeysInterface_get_shutdown_scriptpubkey(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKShutdownScript ret_var = (this_arg_conv->get_shutdown_scriptpubkey)(this_arg_conv->this_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -6608,53 +6621,53 @@ uint32_t __attribute__((export_name("TS_KeysInterface_get_shutdown_scriptpubkey } uint32_t __attribute__((export_name("TS_KeysInterface_get_channel_signer"))) TS_KeysInterface_get_channel_signer(uint32_t this_arg, jboolean inbound, int64_t channel_value_satoshis) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = (this_arg_conv->get_channel_signer)(this_arg_conv->this_arg, inbound, channel_value_satoshis); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } int8_tArray __attribute__((export_name("TS_KeysInterface_get_secure_random_bytes"))) TS_KeysInterface_get_secure_random_bytes(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->get_secure_random_bytes)(this_arg_conv->this_arg).data, 32); return ret_arr; } uint32_t __attribute__((export_name("TS_KeysInterface_read_chan_signer"))) TS_KeysInterface_read_chan_signer(uint32_t this_arg, int8_tArray reader) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKu8slice reader_ref; reader_ref.datalen = reader->arr_len; - reader_ref.data = reader->elems; + reader_ref.data = reader->elems /* XXX reader leaks */; 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); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysInterface_sign_invoice(uint32_t this_arg, int8_tArray invoice_preimage) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; LDKCVec_u8Z invoice_preimage_ref; invoice_preimage_ref.datalen = invoice_preimage->arr_len; invoice_preimage_ref.data = MALLOC(invoice_preimage_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(invoice_preimage_ref.data, invoice_preimage->elems, invoice_preimage_ref.datalen); + memcpy(invoice_preimage_ref.data, invoice_preimage->elems, invoice_preimage_ref.datalen); FREE(invoice_preimage); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = (this_arg_conv->sign_invoice)(this_arg_conv->this_arg, invoice_preimage_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_KeysInterface_get_inbound_payment_key_material"))) TS_KeysInterface_get_inbound_payment_key_material(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr; - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, (this_arg_conv->get_inbound_payment_key_material)(this_arg_conv->this_arg).data, 32); return ret_arr; } @@ -6696,7 +6709,7 @@ long __attribute__((export_name("TS_LDKFeeEstimator_new"))) TS_LDKFeeEstimator_ return (long)res_ptr; } int32_t __attribute__((export_name("TS_FeeEstimator_get_est_sat_per_1000_weight"))) TS_FeeEstimator_get_est_sat_per_1000_weight(uint32_t this_arg, uint32_t confirmation_target) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKFeeEstimator* this_arg_conv = (LDKFeeEstimator*)this_arg_ptr; LDKConfirmationTarget confirmation_target_conv = LDKConfirmationTarget_from_js(confirmation_target); @@ -6717,12 +6730,12 @@ static void LDKLogger_JCalls_free(void* this_arg) { void log_LDKLogger_jcall(const void* this_arg, const LDKRecord * record) { LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg; LDKRecord record_var = *record; - uint64_t record_ref = 0; + uintptr_t record_ref = 0; record_var = Record_clone(record); - CHECK((((uint64_t)record_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&record_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)record_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&record_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(record_var); - record_ref = (uint64_t)record_var.inner; + record_ref = (uintptr_t)record_var.inner; if (record_var.is_owned) { record_ref |= 1; } @@ -6754,7 +6767,7 @@ static inline struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelManagerZ_get_a(LD } int8_tArray __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get_a"))) TS_C2Tuple_BlockHashChannelManagerZ_get_a(uint32_t owner) { LDKC2Tuple_BlockHashChannelManagerZ* owner_conv = (LDKC2Tuple_BlockHashChannelManagerZ*)(owner & ~1); - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, C2Tuple_BlockHashChannelManagerZ_get_a(owner_conv).data, 32); return ret_arr; } @@ -6765,11 +6778,11 @@ static inline struct LDKChannelManager *C2Tuple_BlockHashChannelManagerZ_get_b(L uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get_b"))) TS_C2Tuple_BlockHashChannelManagerZ_get_b(uint32_t owner) { LDKC2Tuple_BlockHashChannelManagerZ* owner_conv = (LDKC2Tuple_BlockHashChannelManagerZ*)(owner & ~1); LDKChannelManager ret_var = *C2Tuple_BlockHashChannelManagerZ_get_b(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner & ~1; + ret_ref = (uintptr_t)ret_var.inner & ~1; return ret_ref; } @@ -6779,7 +6792,7 @@ CHECK(owner->result_ok); } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(uint32_t owner) { LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(owner & ~1); - uint64_t ret_ret = (uint64_t)CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv) | 1; + uintptr_t ret_ret = (uintptr_t)CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv) | 1; return ret_ret; } @@ -6790,11 +6803,11 @@ CHECK(!owner->result_ok); uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(uint32_t owner) { LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(owner & ~1); LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(owner_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -6820,10 +6833,10 @@ LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsP ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint32_t* ret_vals = ret->elems /* XXX ret leaks */; for (size_t s = 0; s < ret_constr.datalen; s++) { uint32_t ret_conv_18 = ret_vals[s]; - void* ret_conv_18_ptr = (void*)(((uint64_t)ret_conv_18) & ~1); + void* ret_conv_18_ptr = (void*)(((uintptr_t)ret_conv_18) & ~1); CHECK_ACCESS(ret_conv_18_ptr); LDKMessageSendEvent ret_conv_18_conv = *(LDKMessageSendEvent*)(ret_conv_18_ptr); FREE((void*)ret_conv_18); @@ -6853,17 +6866,17 @@ long __attribute__((export_name("TS_LDKMessageSendEventsProvider_new"))) TS_LDK return (long)res_ptr; } uint32_tArray __attribute__((export_name("TS_MessageSendEventsProvider_get_and_clear_pending_msg_events"))) TS_MessageSendEventsProvider_get_and_clear_pending_msg_events(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKMessageSendEventsProvider* this_arg_conv = (LDKMessageSendEventsProvider*)this_arg_ptr; 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - uint64_t ret_conv_18_ref = (uint64_t)ret_conv_18_copy; + uintptr_t ret_conv_18_ref = (uintptr_t)ret_conv_18_copy; ret_arr_ptr[s] = ret_conv_18_ref; } @@ -6885,7 +6898,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)(uint64_t)ret_event); + js_invoke_function_1(j_calls->instance_ptr, 35, (uint32_t)(uintptr_t)ret_event); } static void LDKEventHandler_JCalls_cloned(LDKEventHandler* new_obj) { LDKEventHandler_JCalls *j_calls = (LDKEventHandler_JCalls*) new_obj->this_arg; @@ -6909,7 +6922,7 @@ long __attribute__((export_name("TS_LDKEventHandler_new"))) TS_LDKEventHandler_ return (long)res_ptr; } void __attribute__((export_name("TS_EventHandler_handle_event"))) TS_EventHandler_handle_event(uint32_t this_arg, uint32_t event) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKEventHandler* this_arg_conv = (LDKEventHandler*)this_arg_ptr; LDKEvent* event_conv = (LDKEvent*)event; @@ -6930,7 +6943,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)(uint64_t)handler_ret); + js_invoke_function_1(j_calls->instance_ptr, 36, (uint32_t)(uintptr_t)handler_ret); } static void LDKEventsProvider_JCalls_cloned(LDKEventsProvider* new_obj) { LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) new_obj->this_arg; @@ -6954,10 +6967,10 @@ long __attribute__((export_name("TS_LDKEventsProvider_new"))) TS_LDKEventsProvi return (long)res_ptr; } void __attribute__((export_name("TS_EventsProvider_process_pending_events"))) TS_EventsProvider_process_pending_events(uint32_t this_arg, uint32_t handler) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKEventsProvider* this_arg_conv = (LDKEventsProvider*)this_arg_ptr; - void* handler_ptr = (void*)(((uint64_t)handler) & ~1); + void* handler_ptr = (void*)(((uintptr_t)handler) & ~1); CHECK_ACCESS(handler_ptr); LDKEventHandler handler_conv = *(LDKEventHandler*)(handler_ptr); (this_arg_conv->process_pending_events)(this_arg_conv->this_arg, handler_conv); @@ -6976,13 +6989,13 @@ static void LDKListen_JCalls_free(void* this_arg) { void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uint32_t height) { LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg; LDKu8slice block_var = block; - int8_tArray block_arr = init_int8_tArray(block_var.datalen); + int8_tArray block_arr = init_int8_tArray(block_var.datalen, __LINE__); memcpy(block_arr->elems, block_var.data, block_var.datalen); js_invoke_function_2(j_calls->instance_ptr, 37, (uint32_t)block_arr, (uint32_t)height); } 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); + int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); js_invoke_function_2(j_calls->instance_ptr, 38, (uint32_t)header_arr, (uint32_t)height); } @@ -7009,22 +7022,22 @@ long __attribute__((export_name("TS_LDKListen_new"))) TS_LDKListen_new(JSValue return (long)res_ptr; } void __attribute__((export_name("TS_Listen_block_connected"))) TS_Listen_block_connected(uint32_t this_arg, int8_tArray block, int32_t height) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; LDKu8slice block_ref; block_ref.datalen = block->arr_len; - block_ref.data = block->elems; + block_ref.data = block->elems /* XXX block leaks */; (this_arg_conv->block_connected)(this_arg_conv->this_arg, block_ref, height); } void __attribute__((export_name("TS_Listen_block_disconnected"))) TS_Listen_block_disconnected(uint32_t this_arg, int8_tArray header, int32_t height) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); - memcpy(header_arr, header->elems, 80); + memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; (this_arg_conv->block_disconnected)(this_arg_conv->this_arg, header_ref, height); } @@ -7041,16 +7054,16 @@ static void LDKConfirm_JCalls_free(void* this_arg) { } void transactions_confirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t (* header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height) { LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg; - int8_tArray header_arr = init_int8_tArray(80); + int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); LDKCVec_C2Tuple_usizeTransactionZZ txdata_var = txdata; uint32_tArray txdata_arr = NULL; - txdata_arr = init_uint32_tArray(txdata_var.datalen); + txdata_arr = init_uint32_tArray(txdata_var.datalen, __LINE__); uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 4); 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]; - txdata_arr_ptr[c] = ((uint64_t)txdata_conv_28_conv); + txdata_arr_ptr[c] = ((uintptr_t)txdata_conv_28_conv); } FREE(txdata_var.data); @@ -7058,13 +7071,13 @@ void transactions_confirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t } 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); + int8_tArray txid_arr = init_int8_tArray(32, __LINE__); memcpy(txid_arr->elems, *txid, 32); js_invoke_function_1(j_calls->instance_ptr, 40, (uint32_t)txid_arr); } 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); + int8_tArray header_arr = init_int8_tArray(80, __LINE__); memcpy(header_arr->elems, *header, 80); js_invoke_function_2(j_calls->instance_ptr, 41, (uint32_t)header_arr, (uint32_t)height); } @@ -7077,12 +7090,12 @@ LDKCVec_TxidZ get_relevant_txids_LDKConfirm_jcall(const void* this_arg) { ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_TxidZ Elements"); else ret_constr.data = NULL; - int8_tArray* ret_vals = (void*) ret->elems; + int8_tArray* ret_vals = (void*) ret->elems /* XXX ret leaks */; for (size_t m = 0; m < ret_constr.datalen; m++) { int8_tArray ret_conv_12 = ret_vals[m]; LDKThirtyTwoBytes ret_conv_12_ref; CHECK(ret_conv_12->arr_len == 32); - memcpy(ret_conv_12_ref.data, ret_conv_12->elems, 32); + memcpy(ret_conv_12_ref.data, ret_conv_12->elems, 32); FREE(ret_conv_12); ret_constr.data[m] = ret_conv_12_ref; } return ret_constr; @@ -7112,12 +7125,12 @@ long __attribute__((export_name("TS_LDKConfirm_new"))) TS_LDKConfirm_new(JSValu return (long)res_ptr; } void __attribute__((export_name("TS_Confirm_transactions_confirmed"))) TS_Confirm_transactions_confirmed(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); - memcpy(header_arr, header->elems, 80); + memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; LDKCVec_C2Tuple_usizeTransactionZZ txdata_constr; txdata_constr.datalen = txdata->arr_len; @@ -7125,50 +7138,50 @@ 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; + uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */; for (size_t c = 0; c < txdata_constr.datalen; c++) { uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uint64_t)txdata_conv_28) & ~1); + void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); CHECK_ACCESS(txdata_conv_28_ptr); LDKC2Tuple_usizeTransactionZ txdata_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(txdata_conv_28_ptr); - txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uint64_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1)); txdata_constr.data[c] = txdata_conv_28_conv; } (this_arg_conv->transactions_confirmed)(this_arg_conv->this_arg, header_ref, txdata_constr, height); } void __attribute__((export_name("TS_Confirm_transaction_unconfirmed"))) TS_Confirm_transaction_unconfirmed(uint32_t this_arg, int8_tArray txid) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); - memcpy(txid_arr, txid->elems, 32); + memcpy(txid_arr, txid->elems, 32); FREE(txid); unsigned char (*txid_ref)[32] = &txid_arr; (this_arg_conv->transaction_unconfirmed)(this_arg_conv->this_arg, txid_ref); } void __attribute__((export_name("TS_Confirm_best_block_updated"))) TS_Confirm_best_block_updated(uint32_t this_arg, int8_tArray header, int32_t height) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; unsigned char header_arr[80]; CHECK(header->arr_len == 80); - memcpy(header_arr, header->elems, 80); + memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; (this_arg_conv->best_block_updated)(this_arg_conv->this_arg, header_ref, height); } ptrArray __attribute__((export_name("TS_Confirm_get_relevant_txids"))) TS_Confirm_get_relevant_txids(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKConfirm* this_arg_conv = (LDKConfirm*)this_arg_ptr; 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); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); for (size_t m = 0; m < ret_var.datalen; m++) { - int8_tArray ret_conv_12_arr = init_int8_tArray(32); + int8_tArray ret_conv_12_arr = init_int8_tArray(32, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].data, 32); ret_arr_ptr[m] = ret_conv_12_arr; } @@ -7190,35 +7203,35 @@ static void LDKPersist_JCalls_free(void* this_arg) { LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(const void* this_arg, LDKOutPoint channel_id, const LDKChannelMonitor * data, LDKMonitorUpdateId update_id) { LDKPersist_JCalls *j_calls = (LDKPersist_JCalls*) this_arg; LDKOutPoint channel_id_var = channel_id; - uint64_t channel_id_ref = 0; - CHECK((((uint64_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t channel_id_ref = 0; + CHECK((((uintptr_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var); - channel_id_ref = (uint64_t)channel_id_var.inner; + channel_id_ref = (uintptr_t)channel_id_var.inner; if (channel_id_var.is_owned) { channel_id_ref |= 1; } LDKChannelMonitor data_var = *data; - uint64_t data_ref = 0; + uintptr_t data_ref = 0; data_var = ChannelMonitor_clone(data); - CHECK((((uint64_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(data_var); - data_ref = (uint64_t)data_var.inner; + data_ref = (uintptr_t)data_var.inner; if (data_var.is_owned) { data_ref |= 1; } LDKMonitorUpdateId update_id_var = update_id; - uint64_t update_id_ref = 0; - CHECK((((uint64_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t update_id_ref = 0; + CHECK((((uintptr_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var); - update_id_ref = (uint64_t)update_id_var.inner; + update_id_ref = (uintptr_t)update_id_var.inner; if (update_id_var.is_owned) { update_id_ref |= 1; } uint32_t ret = js_invoke_function_3(j_calls->instance_ptr, 43, (uint32_t)channel_id_ref, (uint32_t)data_ref, (uint32_t)update_id_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); FREE((void*)ret); @@ -7227,47 +7240,47 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcall(const void* this_arg, LDKOutPoint channel_id, const LDKChannelMonitorUpdate * update, const LDKChannelMonitor * data, LDKMonitorUpdateId update_id) { LDKPersist_JCalls *j_calls = (LDKPersist_JCalls*) this_arg; LDKOutPoint channel_id_var = channel_id; - uint64_t channel_id_ref = 0; - CHECK((((uint64_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t channel_id_ref = 0; + CHECK((((uintptr_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var); - channel_id_ref = (uint64_t)channel_id_var.inner; + channel_id_ref = (uintptr_t)channel_id_var.inner; if (channel_id_var.is_owned) { channel_id_ref |= 1; } LDKChannelMonitorUpdate update_var = *update; - uint64_t update_ref = 0; - if ((uint64_t)update_var.inner > 4096) { + uintptr_t update_ref = 0; + if ((uintptr_t)update_var.inner > 4096) { update_var = ChannelMonitorUpdate_clone(update); - CHECK((((uint64_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var); - update_ref = (uint64_t)update_var.inner; + update_ref = (uintptr_t)update_var.inner; if (update_var.is_owned) { update_ref |= 1; } } LDKChannelMonitor data_var = *data; - uint64_t data_ref = 0; + uintptr_t data_ref = 0; data_var = ChannelMonitor_clone(data); - CHECK((((uint64_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(data_var); - data_ref = (uint64_t)data_var.inner; + data_ref = (uintptr_t)data_var.inner; if (data_var.is_owned) { data_ref |= 1; } LDKMonitorUpdateId update_id_var = update_id; - uint64_t update_id_ref = 0; - CHECK((((uint64_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t update_id_ref = 0; + CHECK((((uintptr_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var); - update_id_ref = (uint64_t)update_id_var.inner; + update_id_ref = (uintptr_t)update_id_var.inner; if (update_id_var.is_owned) { update_id_ref |= 1; } uint32_t ret = js_invoke_function_4(j_calls->instance_ptr, 44, (uint32_t)channel_id_ref, (uint32_t)update_ref, (uint32_t)data_ref, (uint32_t)update_id_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr); FREE((void*)ret); @@ -7296,7 +7309,7 @@ long __attribute__((export_name("TS_LDKPersist_new"))) TS_LDKPersist_new(JSValu return (long)res_ptr; } uint32_t __attribute__((export_name("TS_Persist_persist_new_channel"))) TS_Persist_persist_new_channel(uint32_t this_arg, uint32_t channel_id, uint32_t data, uint32_t update_id) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKPersist* this_arg_conv = (LDKPersist*)this_arg_ptr; LDKOutPoint channel_id_conv; @@ -7315,11 +7328,11 @@ uint32_t __attribute__((export_name("TS_Persist_persist_new_channel"))) TS_Pers update_id_conv = MonitorUpdateId_clone(&update_id_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->persist_new_channel)(this_arg_conv->this_arg, channel_id_conv, &data_conv, update_id_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_Persist_update_persisted_channel"))) TS_Persist_update_persisted_channel(uint32_t this_arg, uint32_t channel_id, uint32_t update, uint32_t data, uint32_t update_id) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKPersist* this_arg_conv = (LDKPersist*)this_arg_ptr; LDKOutPoint channel_id_conv; @@ -7342,7 +7355,7 @@ uint32_t __attribute__((export_name("TS_Persist_update_persisted_channel"))) TS update_id_conv = MonitorUpdateId_clone(&update_id_conv); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = (this_arg_conv->update_persisted_channel)(this_arg_conv->this_arg, channel_id_conv, &update_conv, &data_conv, update_id_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } typedef struct LDKChannelMessageHandler_JCalls { @@ -7358,24 +7371,24 @@ static void LDKChannelMessageHandler_JCalls_free(void* this_arg) { } void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKOpenChannel * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKInitFeatures their_features_var = their_features; - uint64_t their_features_ref = 0; - CHECK((((uint64_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t their_features_ref = 0; + CHECK((((uintptr_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var); - their_features_ref = (uint64_t)their_features_var.inner; + their_features_ref = (uintptr_t)their_features_var.inner; if (their_features_var.is_owned) { their_features_ref |= 1; } LDKOpenChannel msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = OpenChannel_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7383,24 +7396,24 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKInitFeatures their_features_var = their_features; - uint64_t their_features_ref = 0; - CHECK((((uint64_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t their_features_ref = 0; + CHECK((((uintptr_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var); - their_features_ref = (uint64_t)their_features_var.inner; + their_features_ref = (uintptr_t)their_features_var.inner; if (their_features_var.is_owned) { their_features_ref |= 1; } LDKAcceptChannel msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = AcceptChannel_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7408,15 +7421,15 @@ void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg, } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKFundingCreated msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = FundingCreated_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7424,15 +7437,15 @@ void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg, } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKFundingSigned msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = FundingSigned_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7440,15 +7453,15 @@ void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg, } void handle_funding_locked_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingLocked * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKFundingLocked msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = FundingLocked_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7456,25 +7469,25 @@ void handle_funding_locked_LDKChannelMessageHandler_jcall(const void* this_arg, } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKInitFeatures their_features_var = *their_features; - uint64_t their_features_ref = 0; + uintptr_t their_features_ref = 0; their_features_var = InitFeatures_clone(their_features); - CHECK((((uint64_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var); - their_features_ref = (uint64_t)their_features_var.inner; + their_features_ref = (uintptr_t)their_features_var.inner; if (their_features_var.is_owned) { their_features_ref |= 1; } LDKShutdown msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = Shutdown_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7482,15 +7495,15 @@ void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPub } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKClosingSigned msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = ClosingSigned_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7498,15 +7511,15 @@ void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg, } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKUpdateAddHTLC msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = UpdateAddHTLC_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7514,15 +7527,15 @@ void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKUpdateFulfillHTLC msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = UpdateFulfillHTLC_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7530,15 +7543,15 @@ void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_ } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKUpdateFailHTLC msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = UpdateFailHTLC_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7546,15 +7559,15 @@ void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKUpdateFailMalformedHTLC msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = UpdateFailMalformedHTLC_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7562,15 +7575,15 @@ void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKCommitmentSigned msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = CommitmentSigned_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7578,15 +7591,15 @@ void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_ar } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKRevokeAndACK msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = RevokeAndACK_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7594,15 +7607,15 @@ void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg, } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKUpdateFee msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = UpdateFee_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7610,15 +7623,15 @@ void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKP } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKAnnouncementSignatures msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = AnnouncementSignatures_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7626,21 +7639,21 @@ void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* t } 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); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); js_invoke_function_2(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, (uint32_t)no_connection_possible); } void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKInit msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = Init_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7648,15 +7661,15 @@ void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPubl } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKChannelReestablish msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = ChannelReestablish_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7664,15 +7677,15 @@ void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_ } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKChannelUpdate msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = ChannelUpdate_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7680,15 +7693,15 @@ void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg, } void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKErrorMessage * msg) { LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKErrorMessage msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = ErrorMessage_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } @@ -7738,12 +7751,12 @@ long __attribute__((export_name("TS_LDKChannelMessageHandler_new"))) TS_LDKChan return (long)res_ptr; } void __attribute__((export_name("TS_ChannelMessageHandler_handle_open_channel"))) TS_ChannelMessageHandler_handle_open_channel(uint32_t this_arg, int8_tArray their_node_id, uint32_t their_features, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKInitFeatures their_features_conv; their_features_conv.inner = (void*)(their_features & (~1)); their_features_conv.is_owned = (their_features & 1) || (their_features == 0); @@ -7757,12 +7770,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_open_channel") } void __attribute__((export_name("TS_ChannelMessageHandler_handle_accept_channel"))) TS_ChannelMessageHandler_handle_accept_channel(uint32_t this_arg, int8_tArray their_node_id, uint32_t their_features, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKInitFeatures their_features_conv; their_features_conv.inner = (void*)(their_features & (~1)); their_features_conv.is_owned = (their_features & 1) || (their_features == 0); @@ -7776,12 +7789,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_accept_channel } void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_created"))) TS_ChannelMessageHandler_handle_funding_created(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKFundingCreated msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7790,12 +7803,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_create } void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_signed"))) TS_ChannelMessageHandler_handle_funding_signed(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKFundingSigned msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7804,12 +7817,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_signed } void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_locked"))) TS_ChannelMessageHandler_handle_funding_locked(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKFundingLocked msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7818,12 +7831,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_locked } void __attribute__((export_name("TS_ChannelMessageHandler_handle_shutdown"))) TS_ChannelMessageHandler_handle_shutdown(uint32_t this_arg, int8_tArray their_node_id, uint32_t their_features, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKInitFeatures their_features_conv; their_features_conv.inner = (void*)(their_features & (~1)); their_features_conv.is_owned = false; @@ -7836,12 +7849,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_shutdown"))) T } void __attribute__((export_name("TS_ChannelMessageHandler_handle_closing_signed"))) TS_ChannelMessageHandler_handle_closing_signed(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKClosingSigned msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7850,12 +7863,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_closing_signed } void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_add_htlc"))) TS_ChannelMessageHandler_handle_update_add_htlc(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKUpdateAddHTLC msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7864,12 +7877,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_add_htl } void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fulfill_htlc"))) TS_ChannelMessageHandler_handle_update_fulfill_htlc(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKUpdateFulfillHTLC msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7878,12 +7891,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fulfill } void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_htlc"))) TS_ChannelMessageHandler_handle_update_fail_htlc(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKUpdateFailHTLC msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7892,12 +7905,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_ht } void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_malformed_htlc"))) TS_ChannelMessageHandler_handle_update_fail_malformed_htlc(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKUpdateFailMalformedHTLC msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7906,12 +7919,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fail_ma } void __attribute__((export_name("TS_ChannelMessageHandler_handle_commitment_signed"))) TS_ChannelMessageHandler_handle_commitment_signed(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKCommitmentSigned msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7920,12 +7933,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_commitment_sig } void __attribute__((export_name("TS_ChannelMessageHandler_handle_revoke_and_ack"))) TS_ChannelMessageHandler_handle_revoke_and_ack(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKRevokeAndACK msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7934,12 +7947,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_revoke_and_ack } void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fee"))) TS_ChannelMessageHandler_handle_update_fee(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKUpdateFee msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7948,12 +7961,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_update_fee"))) } void __attribute__((export_name("TS_ChannelMessageHandler_handle_announcement_signatures"))) TS_ChannelMessageHandler_handle_announcement_signatures(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKAnnouncementSignatures msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7962,22 +7975,22 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_announcement_s } void __attribute__((export_name("TS_ChannelMessageHandler_peer_disconnected"))) TS_ChannelMessageHandler_peer_disconnected(uint32_t this_arg, int8_tArray their_node_id, jboolean no_connection_possible) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); (this_arg_conv->peer_disconnected)(this_arg_conv->this_arg, their_node_id_ref, no_connection_possible); } void __attribute__((export_name("TS_ChannelMessageHandler_peer_connected"))) TS_ChannelMessageHandler_peer_connected(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKInit msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -7986,12 +7999,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_peer_connected"))) TS } void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_reestablish"))) TS_ChannelMessageHandler_handle_channel_reestablish(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKChannelReestablish msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -8000,12 +8013,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_reesta } void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_update"))) TS_ChannelMessageHandler_handle_channel_update(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKChannelUpdate msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -8014,12 +8027,12 @@ void __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_update } void __attribute__((export_name("TS_ChannelMessageHandler_handle_error"))) TS_ChannelMessageHandler_handle_error(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKErrorMessage msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; @@ -8041,17 +8054,17 @@ static void LDKRoutingMessageHandler_JCalls_free(void* this_arg) { LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKNodeAnnouncement * msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; LDKNodeAnnouncement msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = NodeAnnouncement_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 65, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8060,17 +8073,17 @@ LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKChannelAnnouncement * msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; LDKChannelAnnouncement msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = ChannelAnnouncement_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 66, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8079,17 +8092,17 @@ LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHand LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKChannelUpdate * msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; LDKChannelUpdate msg_var = *msg; - uint64_t msg_ref = 0; + uintptr_t msg_ref = 0; msg_var = ChannelUpdate_clone(msg); - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 67, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8104,10 +8117,10 @@ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel 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; + uint32_t* ret_vals = ret->elems /* XXX ret leaks */; for (size_t h = 0; h < ret_constr.datalen; h++) { uint32_t ret_conv_59 = ret_vals[h]; - void* ret_conv_59_ptr = (void*)(((uint64_t)ret_conv_59) & ~1); + void* ret_conv_59_ptr = (void*)(((uintptr_t)ret_conv_59) & ~1); CHECK_ACCESS(ret_conv_59_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ ret_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(ret_conv_59_ptr); FREE((void*)ret_conv_59); @@ -8117,7 +8130,7 @@ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel } LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey starting_point, uint8_t batch_amount) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - int8_tArray starting_point_arr = init_int8_tArray(33); + int8_tArray starting_point_arr = init_int8_tArray(33, __LINE__); memcpy(starting_point_arr->elems, starting_point.compressed_form, 33); uint32_tArray ret = (uint32_tArray)js_invoke_function_2(j_calls->instance_ptr, 69, (uint32_t)starting_point_arr, (uint32_t)batch_amount); LDKCVec_NodeAnnouncementZ ret_constr; @@ -8126,7 +8139,7 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements"); else ret_constr.data = NULL; - uint32_t* ret_vals = ret->elems; + uint32_t* ret_vals = ret->elems /* XXX ret leaks */; for (size_t s = 0; s < ret_constr.datalen; s++) { uint32_t ret_conv_18 = ret_vals[s]; LDKNodeAnnouncement ret_conv_18_conv; @@ -8139,15 +8152,15 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j } void sync_routing_table_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * init) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKInit init_var = *init; - uint64_t init_ref = 0; + uintptr_t init_ref = 0; init_var = Init_clone(init); - CHECK((((uint64_t)init_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&init_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)init_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&init_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(init_var); - init_ref = (uint64_t)init_var.inner; + init_ref = (uintptr_t)init_var.inner; if (init_var.is_owned) { init_ref |= 1; } @@ -8155,19 +8168,19 @@ void sync_routing_table_LDKRoutingMessageHandler_jcall(const void* this_arg, LDK } 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; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKReplyChannelRange msg_var = msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8175,19 +8188,19 @@ LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandl } LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyShortChannelIdsEnd msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKReplyShortChannelIdsEnd msg_var = msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8195,19 +8208,19 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess } LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryChannelRange msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKQueryChannelRange msg_var = msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 73, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8215,19 +8228,19 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl } LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryShortChannelIds msg) { LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg; - int8_tArray their_node_id_arr = init_int8_tArray(33); + int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__); memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33); LDKQueryShortChannelIds msg_var = msg; - uint64_t msg_ref = 0; - CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t msg_ref = 0; + CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var); - msg_ref = (uint64_t)msg_var.inner; + msg_ref = (uintptr_t)msg_var.inner; if (msg_var.is_owned) { msg_ref |= 1; } uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 74, (uint32_t)their_node_id_arr, (uint32_t)msg_ref); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8267,7 +8280,7 @@ long __attribute__((export_name("TS_LDKRoutingMessageHandler_new"))) TS_LDKRout return (long)res_ptr; } uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_node_announcement"))) TS_RoutingMessageHandler_handle_node_announcement(uint32_t this_arg, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKNodeAnnouncement msg_conv; @@ -8276,11 +8289,11 @@ uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_node_annou CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = (this_arg_conv->handle_node_announcement)(this_arg_conv->this_arg, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_announcement"))) TS_RoutingMessageHandler_handle_channel_announcement(uint32_t this_arg, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKChannelAnnouncement msg_conv; @@ -8289,11 +8302,11 @@ uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_an CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = (this_arg_conv->handle_channel_announcement)(this_arg_conv->this_arg, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_update"))) TS_RoutingMessageHandler_handle_channel_update(uint32_t this_arg, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKChannelUpdate msg_conv; @@ -8302,21 +8315,21 @@ uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_up CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = (this_arg_conv->handle_channel_update)(this_arg_conv->this_arg, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_channel_announcements"))) TS_RoutingMessageHandler_get_next_channel_announcements(uint32_t this_arg, int64_t starting_point, int8_t batch_amount) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - ret_arr_ptr[h] = ((uint64_t)ret_conv_59_conv); + ret_arr_ptr[h] = ((uintptr_t)ret_conv_59_conv); } FREE(ret_var.data); @@ -8324,23 +8337,23 @@ uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_cha } uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_node_announcements"))) TS_RoutingMessageHandler_get_next_node_announcements(uint32_t this_arg, int8_tArray starting_point, int8_t batch_amount) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKPublicKey starting_point_ref; CHECK(starting_point->arr_len == 33); - memcpy(starting_point_ref.compressed_form, starting_point->elems, 33); + memcpy(starting_point_ref.compressed_form, starting_point->elems, 33); FREE(starting_point); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t s = 0; s < ret_var.datalen; s++) { LDKNodeAnnouncement ret_conv_18_var = ret_var.data[s]; - uint64_t ret_conv_18_ref = 0; - CHECK((((uint64_t)ret_conv_18_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_18_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_18_ref = 0; + CHECK((((uintptr_t)ret_conv_18_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_18_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_var); - ret_conv_18_ref = (uint64_t)ret_conv_18_var.inner; + ret_conv_18_ref = (uintptr_t)ret_conv_18_var.inner; if (ret_conv_18_var.is_owned) { ret_conv_18_ref |= 1; } @@ -8352,12 +8365,12 @@ uint32_tArray __attribute__((export_name("TS_RoutingMessageHandler_get_next_nod } void __attribute__((export_name("TS_RoutingMessageHandler_sync_routing_table"))) TS_RoutingMessageHandler_sync_routing_table(uint32_t this_arg, int8_tArray their_node_id, uint32_t init) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKInit init_conv; init_conv.inner = (void*)(init & (~1)); init_conv.is_owned = false; @@ -8366,12 +8379,12 @@ void __attribute__((export_name("TS_RoutingMessageHandler_sync_routing_table")) } uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_channel_range"))) TS_RoutingMessageHandler_handle_reply_channel_range(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKReplyChannelRange msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -8379,16 +8392,16 @@ uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_chan msg_conv = ReplyChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_short_channel_ids_end"))) TS_RoutingMessageHandler_handle_reply_short_channel_ids_end(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKReplyShortChannelIdsEnd msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -8396,16 +8409,16 @@ uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_shor msg_conv = ReplyShortChannelIdsEnd_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_reply_short_channel_ids_end)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_channel_range"))) TS_RoutingMessageHandler_handle_query_channel_range(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKQueryChannelRange msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -8413,16 +8426,16 @@ uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_chan msg_conv = QueryChannelRange_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_short_channel_ids"))) TS_RoutingMessageHandler_handle_query_short_channel_ids(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr; LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); LDKQueryShortChannelIds msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -8430,7 +8443,7 @@ uint32_t __attribute__((export_name("TS_RoutingMessageHandler_handle_query_shor msg_conv = QueryShortChannelIds_clone(&msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_query_short_channel_ids)(this_arg_conv->this_arg, their_node_id_ref, msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } typedef struct LDKCustomMessageReader_JCalls { @@ -8446,10 +8459,10 @@ static void LDKCustomMessageReader_JCalls_free(void* this_arg) { LDKCResult_COption_TypeZDecodeErrorZ read_LDKCustomMessageReader_jcall(const void* this_arg, uint16_t message_type, LDKu8slice buffer) { LDKCustomMessageReader_JCalls *j_calls = (LDKCustomMessageReader_JCalls*) this_arg; LDKu8slice buffer_var = buffer; - int8_tArray buffer_arr = init_int8_tArray(buffer_var.datalen); + 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, 75, (uint32_t)message_type, (uint32_t)buffer_arr); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_COption_TypeZDecodeErrorZ ret_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8477,15 +8490,15 @@ long __attribute__((export_name("TS_LDKCustomMessageReader_new"))) TS_LDKCustom return (long)res_ptr; } uint32_t __attribute__((export_name("TS_CustomMessageReader_read"))) TS_CustomMessageReader_read(uint32_t this_arg, int16_t message_type, int8_tArray buffer) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKCustomMessageReader* this_arg_conv = (LDKCustomMessageReader*)this_arg_ptr; LDKu8slice buffer_ref; buffer_ref.datalen = buffer->arr_len; - buffer_ref.data = buffer->elems; + buffer_ref.data = buffer->elems /* XXX buffer leaks */; 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); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } typedef struct LDKCustomMessageHandler_JCalls { @@ -8503,10 +8516,10 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca LDKCustomMessageHandler_JCalls *j_calls = (LDKCustomMessageHandler_JCalls*) this_arg; LDKType* msg_ret = MALLOC(sizeof(LDKType), "LDKType"); *msg_ret = msg; - int8_tArray sender_node_id_arr = init_int8_tArray(33); + 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, 76, (uint32_t)(uint64_t)msg_ret, (uint32_t)sender_node_id_arr); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 76, (uint32_t)(uintptr_t)msg_ret, (uint32_t)sender_node_id_arr); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr); FREE((void*)ret); @@ -8521,10 +8534,10 @@ LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandle 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; + uint32_t* ret_vals = ret->elems /* XXX ret leaks */; for (size_t z = 0; z < ret_constr.datalen; z++) { uint32_t ret_conv_25 = ret_vals[z]; - void* ret_conv_25_ptr = (void*)(((uint64_t)ret_conv_25) & ~1); + void* ret_conv_25_ptr = (void*)(((uintptr_t)ret_conv_25) & ~1); CHECK_ACCESS(ret_conv_25_ptr); LDKC2Tuple_PublicKeyTypeZ ret_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(ret_conv_25_ptr); FREE((void*)ret_conv_25); @@ -8558,32 +8571,32 @@ long __attribute__((export_name("TS_LDKCustomMessageHandler_new"))) TS_LDKCusto return (long)res_ptr; } uint32_t __attribute__((export_name("TS_CustomMessageHandler_handle_custom_message"))) TS_CustomMessageHandler_handle_custom_message(uint32_t this_arg, uint32_t msg, int8_tArray sender_node_id) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKCustomMessageHandler* this_arg_conv = (LDKCustomMessageHandler*)this_arg_ptr; - void* msg_ptr = (void*)(((uint64_t)msg) & ~1); + void* msg_ptr = (void*)(((uintptr_t)msg) & ~1); CHECK_ACCESS(msg_ptr); LDKType msg_conv = *(LDKType*)(msg_ptr); LDKPublicKey sender_node_id_ref; CHECK(sender_node_id->arr_len == 33); - memcpy(sender_node_id_ref.compressed_form, sender_node_id->elems, 33); + memcpy(sender_node_id_ref.compressed_form, sender_node_id->elems, 33); FREE(sender_node_id); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = (this_arg_conv->handle_custom_message)(this_arg_conv->this_arg, msg_conv, sender_node_id_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_tArray __attribute__((export_name("TS_CustomMessageHandler_get_and_clear_pending_msg"))) TS_CustomMessageHandler_get_and_clear_pending_msg(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKCustomMessageHandler* this_arg_conv = (LDKCustomMessageHandler*)this_arg_ptr; 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - ret_arr_ptr[z] = ((uint64_t)ret_conv_25_conv); + ret_arr_ptr[z] = ((uintptr_t)ret_conv_25_conv); } FREE(ret_var.data); @@ -8603,7 +8616,7 @@ static void LDKSocketDescriptor_JCalls_free(void* this_arg) { uintptr_t send_data_LDKSocketDescriptor_jcall(void* this_arg, LDKu8slice data, bool resume_read) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; LDKu8slice data_var = data; - int8_tArray data_arr = init_int8_tArray(data_var.datalen); + int8_tArray data_arr = init_int8_tArray(data_var.datalen, __LINE__); memcpy(data_arr->elems, data_var.data, data_var.datalen); return js_invoke_function_2(j_calls->instance_ptr, 78, (uint32_t)data_arr, (uint32_t)resume_read); } @@ -8615,7 +8628,7 @@ bool eq_LDKSocketDescriptor_jcall(const void* this_arg, const LDKSocketDescripto 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, 80, (uint32_t)(uint64_t)other_arg_clone); + return js_invoke_function_1(j_calls->instance_ptr, 80, (uint32_t)(uintptr_t)other_arg_clone); } uint64_t hash_LDKSocketDescriptor_jcall(const void* this_arg) { LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg; @@ -8646,26 +8659,26 @@ long __attribute__((export_name("TS_LDKSocketDescriptor_new"))) TS_LDKSocketDes *res_ptr = LDKSocketDescriptor_init(o); return (long)res_ptr; } -int64_t __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_SocketDescriptor_send_data(uint32_t this_arg, int8_tArray data, jboolean resume_read) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); +intptr_t __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_SocketDescriptor_send_data(uint32_t this_arg, int8_tArray data, jboolean resume_read) { + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; - data_ref.data = data->elems; - int64_t ret_val = (this_arg_conv->send_data)(this_arg_conv->this_arg, data_ref, resume_read); + data_ref.data = data->elems /* XXX data leaks */; + intptr_t ret_val = (this_arg_conv->send_data)(this_arg_conv->this_arg, data_ref, resume_read); return ret_val; } void __attribute__((export_name("TS_SocketDescriptor_disconnect_socket"))) TS_SocketDescriptor_disconnect_socket(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; (this_arg_conv->disconnect_socket)(this_arg_conv->this_arg); } int64_t __attribute__((export_name("TS_SocketDescriptor_hash"))) TS_SocketDescriptor_hash(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr; int64_t ret_val = (this_arg_conv->hash)(this_arg_conv->this_arg); @@ -8686,24 +8699,24 @@ uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t shor LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg; LDKCOption_u64Z *channel_capacity_msat_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *channel_capacity_msat_copy = channel_capacity_msat; - uint64_t channel_capacity_msat_ref = (uint64_t)channel_capacity_msat_copy; + uintptr_t channel_capacity_msat_ref = (uintptr_t)channel_capacity_msat_copy; LDKNodeId source_var = *source; - uint64_t source_ref = 0; + uintptr_t source_ref = 0; source_var = NodeId_clone(source); - CHECK((((uint64_t)source_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&source_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)source_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&source_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(source_var); - source_ref = (uint64_t)source_var.inner; + source_ref = (uintptr_t)source_var.inner; if (source_var.is_owned) { source_ref |= 1; } LDKNodeId target_var = *target; - uint64_t target_ref = 0; + uintptr_t target_ref = 0; target_var = NodeId_clone(target); - CHECK((((uint64_t)target_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&target_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + CHECK((((uintptr_t)target_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&target_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(target_var); - target_ref = (uint64_t)target_var.inner; + target_ref = (uintptr_t)target_var.inner; if (target_var.is_owned) { target_ref |= 1; } @@ -8713,15 +8726,15 @@ void payment_path_failed_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); + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint64_t path_conv_10_ref = 0; - CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)path_conv_10_var.inner; + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; if (path_conv_10_var.is_owned) { path_conv_10_ref |= 1; } @@ -8735,15 +8748,15 @@ void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ pa 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); + path_arr = init_uint32_tArray(path_var.datalen, __LINE__); uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4); for (size_t k = 0; k < path_var.datalen; k++) { LDKRouteHop path_conv_10_var = path_var.data[k]; - uint64_t path_conv_10_ref = 0; - CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)path_conv_10_var.inner; + path_conv_10_ref = (uintptr_t)path_conv_10_var.inner; if (path_conv_10_var.is_owned) { path_conv_10_ref |= 1; } @@ -8759,7 +8772,7 @@ LDKCVec_u8Z write_LDKScore_jcall(const void* this_arg) { LDKCVec_u8Z ret_ref; ret_ref.datalen = ret->arr_len; ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(ret_ref.data, ret->elems, ret_ref.datalen); + memcpy(ret_ref.data, ret->elems, ret_ref.datalen); FREE(ret); return ret_ref; } static void LDKScore_JCalls_cloned(LDKScore* new_obj) { @@ -8787,13 +8800,13 @@ long __attribute__((export_name("TS_LDKScore_new"))) TS_LDKScore_new(JSValue o) return (long)res_ptr; } int64_t __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_channel_penalty_msat(uint32_t this_arg, int64_t short_channel_id, int64_t send_amt_msat, uint32_t channel_capacity_msat, uint32_t source, uint32_t target) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + 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; - void* channel_capacity_msat_ptr = (void*)(((uint64_t)channel_capacity_msat) & ~1); + void* channel_capacity_msat_ptr = (void*)(((uintptr_t)channel_capacity_msat) & ~1); CHECK_ACCESS(channel_capacity_msat_ptr); LDKCOption_u64Z channel_capacity_msat_conv = *(LDKCOption_u64Z*)(channel_capacity_msat_ptr); - channel_capacity_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)channel_capacity_msat) & ~1)); + channel_capacity_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)channel_capacity_msat) & ~1)); LDKNodeId source_conv; source_conv.inner = (void*)(source & (~1)); source_conv.is_owned = false; @@ -8807,7 +8820,7 @@ int64_t __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_ } void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_payment_path_failed(uint32_t this_arg, uint32_tArray path, int64_t short_channel_id) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + 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; @@ -8816,7 +8829,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; + uint32_t* path_vals = path->elems /* XXX path leaks */; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -8830,7 +8843,7 @@ void __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_paym } void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_payment_path_successful(uint32_t this_arg, uint32_tArray path) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + 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; @@ -8839,7 +8852,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; + uint32_t* path_vals = path->elems /* XXX path leaks */; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -8853,11 +8866,11 @@ void __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_ } int8_tArray __attribute__((export_name("TS_Score_write"))) TS_Score_write(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + 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_u8Z ret_var = (this_arg_conv->write)(this_arg_conv->this_arg); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -8876,7 +8889,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, 86); - void* ret_ptr = (void*)(((uint64_t)ret) & ~1); + void* ret_ptr = (void*)(((uintptr_t)ret) & ~1); CHECK_ACCESS(ret_ptr); LDKScore ret_conv = *(LDKScore*)(ret_ptr);// Warning: we may need a move here but no clone is available for LDKScore @@ -8904,12 +8917,12 @@ long __attribute__((export_name("TS_LDKLockableScore_new"))) TS_LDKLockableScor return (long)res_ptr; } uint32_t __attribute__((export_name("TS_LockableScore_lock"))) TS_LockableScore_lock(uint32_t this_arg) { - void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1); + void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1); if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); } LDKLockableScore* this_arg_conv = (LDKLockableScore*)this_arg_ptr; LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore"); *ret_ret = (this_arg_conv->lock)(this_arg_conv->this_arg); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } jstring __attribute__((export_name("TS__ldk_get_compiled_version"))) TS__ldk_get_compiled_version() { @@ -8930,7 +8943,7 @@ void __attribute__((export_name("TS_Transaction_free"))) TS_Transaction_free(in LDKTransaction _res_ref; _res_ref.datalen = _res->arr_len; _res_ref.data = MALLOC(_res_ref.datalen, "LDKTransaction Bytes"); - memcpy(_res_ref.data, _res->elems, _res_ref.datalen); + memcpy(_res_ref.data, _res->elems, _res_ref.datalen); FREE(_res); _res_ref.data_is_owned = true; Transaction_free(_res_ref); } @@ -8939,15 +8952,15 @@ uint32_t __attribute__((export_name("TS_TxOut_new"))) TS_TxOut_new(int8_tArray LDKCVec_u8Z script_pubkey_ref; script_pubkey_ref.datalen = script_pubkey->arr_len; script_pubkey_ref.data = MALLOC(script_pubkey_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(script_pubkey_ref.data, script_pubkey->elems, script_pubkey_ref.datalen); + memcpy(script_pubkey_ref.data, script_pubkey->elems, script_pubkey_ref.datalen); FREE(script_pubkey); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_new(script_pubkey_ref, value); - return (uint64_t)ret_ref; + return (uintptr_t)ret_ref; } void __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKTxOut _res_conv = *(LDKTxOut*)(_res_ptr); FREE((void*)_res); @@ -8957,11 +8970,11 @@ void __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint32_t _res) static inline uintptr_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg) { LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_clone(arg); - return (uint64_t)ret_ref; + return (uintptr_t)ret_ref; } -int64_t __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint32_t arg) { LDKTxOut* arg_conv = (LDKTxOut*)(arg & ~1); - int64_t ret_val = TxOut_clone_ptr(arg_conv); + intptr_t ret_val = TxOut_clone_ptr(arg_conv); return ret_val; } @@ -8969,7 +8982,7 @@ uint32_t __attribute__((export_name("TS_TxOut_clone"))) TS_TxOut_clone(uint32_t LDKTxOut* orig_conv = (LDKTxOut*)(orig & ~1); LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut"); *ret_ref = TxOut_clone(orig_conv); - return (uint64_t)ret_ref; + return (uintptr_t)ret_ref; } void __attribute__((export_name("TS_Str_free"))) TS_Str_free(jstring _res) { @@ -8985,7 +8998,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_ok")) o_conv = ChannelConfig_clone(&o_conv); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err"))) TS_CResult_ChannelConfigDecodeErrorZ_err(uint32_t e) { @@ -8996,7 +9009,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint32_t o) { @@ -9007,7 +9020,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelConfigDecodeErrorZ _res_conv = *(LDKCResult_ChannelConfigDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9017,11 +9030,11 @@ void __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) static inline uintptr_t CResult_ChannelConfigDecodeErrorZ_clone_ptr(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelConfigDecodeErrorZ* arg_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9029,7 +9042,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone LDKCResult_ChannelConfigDecodeErrorZ* orig_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_CResult_OutPointDecodeErrorZ_ok(uint32_t o) { @@ -9040,7 +9053,7 @@ uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_ o_conv = OutPoint_clone(&o_conv); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS_CResult_OutPointDecodeErrorZ_err(uint32_t e) { @@ -9051,7 +9064,7 @@ uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS e_conv = DecodeError_clone(&e_conv); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint32_t o) { @@ -9062,7 +9075,7 @@ jboolean __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CResult_OutPointDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_OutPointDecodeErrorZ _res_conv = *(LDKCResult_OutPointDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9072,11 +9085,11 @@ void __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CR static inline uintptr_t CResult_OutPointDecodeErrorZ_clone_ptr(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone_ptr"))) TS_CResult_OutPointDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone_ptr"))) TS_CResult_OutPointDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_OutPointDecodeErrorZ* arg_conv = (LDKCResult_OutPointDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9084,23 +9097,23 @@ uint32_t __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone"))) LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)(orig & ~1); LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = CResult_OutPointDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_ok"))) TS_CResult_SecretKeyErrorZ_ok(int8_tArray o) { LDKSecretKey o_ref; CHECK(o->arr_len == 32); - memcpy(o_ref.bytes, o->elems, 32); + memcpy(o_ref.bytes, o->elems, 32); FREE(o); LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SecretKeyErrorZ_err"))) TS_CResult_SecretKeyErrorZ_err(uint32_t e) { LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e); LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = CResult_SecretKeyErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_SecretKeyErrorZ_is_ok"))) TS_CResult_SecretKeyErrorZ_is_ok(uint32_t o) { @@ -9111,7 +9124,7 @@ jboolean __attribute__((export_name("TS_CResult_SecretKeyErrorZ_is_ok"))) TS_CR void __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult_SecretKeyErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_SecretKeyErrorZ _res_conv = *(LDKCResult_SecretKeyErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9121,17 +9134,17 @@ void __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_ok"))) TS_CResult_PublicKeyErrorZ_ok(int8_tArray o) { LDKPublicKey o_ref; CHECK(o->arr_len == 33); - memcpy(o_ref.compressed_form, o->elems, 33); + memcpy(o_ref.compressed_form, o->elems, 33); FREE(o); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_err"))) TS_CResult_PublicKeyErrorZ_err(uint32_t e) { LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PublicKeyErrorZ_is_ok"))) TS_CResult_PublicKeyErrorZ_is_ok(uint32_t o) { @@ -9142,7 +9155,7 @@ jboolean __attribute__((export_name("TS_CResult_PublicKeyErrorZ_is_ok"))) TS_CR void __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult_PublicKeyErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PublicKeyErrorZ _res_conv = *(LDKCResult_PublicKeyErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9152,11 +9165,11 @@ void __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult static inline uintptr_t CResult_PublicKeyErrorZ_clone_ptr(LDKCResult_PublicKeyErrorZ *NONNULL_PTR arg) { LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone_ptr"))) TS_CResult_PublicKeyErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone_ptr"))) TS_CResult_PublicKeyErrorZ_clone_ptr(uint32_t arg) { LDKCResult_PublicKeyErrorZ* arg_conv = (LDKCResult_PublicKeyErrorZ*)(arg & ~1); - int64_t ret_val = CResult_PublicKeyErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PublicKeyErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9164,7 +9177,7 @@ uint32_t __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone"))) TS_CR LDKCResult_PublicKeyErrorZ* orig_conv = (LDKCResult_PublicKeyErrorZ*)(orig & ~1); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = CResult_PublicKeyErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_ok(uint32_t o) { @@ -9175,7 +9188,7 @@ uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok") o_conv = TxCreationKeys_clone(&o_conv); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_err(uint32_t e) { @@ -9186,7 +9199,7 @@ uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err" e_conv = DecodeError_clone(&e_conv); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_is_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_is_ok(uint32_t o) { @@ -9197,7 +9210,7 @@ jboolean __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_is_o void __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free"))) TS_CResult_TxCreationKeysDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_TxCreationKeysDecodeErrorZ _res_conv = *(LDKCResult_TxCreationKeysDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9207,11 +9220,11 @@ void __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free"))) static inline uintptr_t CResult_TxCreationKeysDecodeErrorZ_clone_ptr(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_TxCreationKeysDecodeErrorZ* arg_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9219,7 +9232,7 @@ uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clon LDKCResult_TxCreationKeysDecodeErrorZ* orig_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(orig & ~1); LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_ok(uint32_t o) { @@ -9230,7 +9243,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_o o_conv = ChannelPublicKeys_clone(&o_conv); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_err(uint32_t e) { @@ -9241,7 +9254,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_e e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok(uint32_t o) { @@ -9252,7 +9265,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_i void __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelPublicKeysDecodeErrorZ _res_conv = *(LDKCResult_ChannelPublicKeysDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9262,11 +9275,11 @@ void __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free" static inline uintptr_t CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelPublicKeysDecodeErrorZ* arg_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9274,7 +9287,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_c LDKCResult_ChannelPublicKeysDecodeErrorZ* orig_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_CResult_TxCreationKeysErrorZ_ok(uint32_t o) { @@ -9285,14 +9298,14 @@ uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_ o_conv = TxCreationKeys_clone(&o_conv); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_err"))) TS_CResult_TxCreationKeysErrorZ_err(uint32_t e) { LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_is_ok"))) TS_CResult_TxCreationKeysErrorZ_is_ok(uint32_t o) { @@ -9303,7 +9316,7 @@ jboolean __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CResult_TxCreationKeysErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_TxCreationKeysErrorZ _res_conv = *(LDKCResult_TxCreationKeysErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9313,11 +9326,11 @@ void __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CR static inline uintptr_t CResult_TxCreationKeysErrorZ_clone_ptr(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR arg) { LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysErrorZ_clone_ptr(uint32_t arg) { LDKCResult_TxCreationKeysErrorZ* arg_conv = (LDKCResult_TxCreationKeysErrorZ*)(arg & ~1); - int64_t ret_val = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9325,26 +9338,26 @@ uint32_t __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone"))) LDKCResult_TxCreationKeysErrorZ* orig_conv = (LDKCResult_TxCreationKeysErrorZ*)(orig & ~1); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = CResult_TxCreationKeysErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_u32Z_some"))) TS_COption_u32Z_some(int32_t o) { LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = COption_u32Z_some(o); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_u32Z_none"))) TS_COption_u32Z_none() { LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = COption_u32Z_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_u32Z_free"))) TS_COption_u32Z_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_u32Z _res_conv = *(LDKCOption_u32Z*)(_res_ptr); FREE((void*)_res); @@ -9354,12 +9367,12 @@ void __attribute__((export_name("TS_COption_u32Z_free"))) TS_COption_u32Z_free( static inline uintptr_t COption_u32Z_clone_ptr(LDKCOption_u32Z *NONNULL_PTR arg) { LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = COption_u32Z_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint32_t arg) { LDKCOption_u32Z* arg_conv = (LDKCOption_u32Z*)arg; - int64_t ret_val = COption_u32Z_clone_ptr(arg_conv); + intptr_t ret_val = COption_u32Z_clone_ptr(arg_conv); return ret_val; } @@ -9367,7 +9380,7 @@ uint32_t __attribute__((export_name("TS_COption_u32Z_clone"))) TS_COption_u32Z_ LDKCOption_u32Z* orig_conv = (LDKCOption_u32Z*)orig; LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = COption_u32Z_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -9379,7 +9392,7 @@ uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErr o_conv = HTLCOutputInCommitment_clone(&o_conv); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err(uint32_t e) { @@ -9390,7 +9403,7 @@ uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErr e_conv = DecodeError_clone(&e_conv); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(uint32_t o) { @@ -9401,7 +9414,7 @@ jboolean __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErr void __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ _res_conv = *(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9411,11 +9424,11 @@ void __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_ static inline uintptr_t CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* arg_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9423,7 +9436,7 @@ uint32_t __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErr LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* orig_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(orig & ~1); LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_NoneZ_some"))) TS_COption_NoneZ_some() { @@ -9449,7 +9462,7 @@ uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionP o_conv = CounterpartyChannelTransactionParameters_clone(&o_conv); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(uint32_t e) { @@ -9460,7 +9473,7 @@ uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionP e_conv = DecodeError_clone(&e_conv); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) { @@ -9471,7 +9484,7 @@ jboolean __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionP void __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9481,11 +9494,11 @@ void __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParam static inline uintptr_t CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9493,7 +9506,7 @@ uint32_t __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionP LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(orig & ~1); LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok(uint32_t o) { @@ -9504,7 +9517,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDec o_conv = ChannelTransactionParameters_clone(&o_conv); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_err(uint32_t e) { @@ -9515,7 +9528,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDec e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) { @@ -9526,7 +9539,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelTransactionParametersDec void __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelTransactionParametersDecodeErrorZ _res_conv = *(LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9536,11 +9549,11 @@ void __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeE static inline uintptr_t CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9548,7 +9561,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelTransactionParametersDec LDKCResult_ChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ_free(ptrArray _res) { @@ -9558,12 +9571,12 @@ 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; + int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKSignature _res_conv_12_ref; CHECK(_res_conv_12->arr_len == 64); - memcpy(_res_conv_12_ref.compact_form, _res_conv_12->elems, 64); + memcpy(_res_conv_12_ref.compact_form, _res_conv_12->elems, 64); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } CVec_SignatureZ_free(_res_constr); @@ -9577,7 +9590,7 @@ uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDeco o_conv = HolderCommitmentTransaction_clone(&o_conv); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err(uint32_t e) { @@ -9588,7 +9601,7 @@ uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDeco e_conv = DecodeError_clone(&e_conv); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { @@ -9599,7 +9612,7 @@ jboolean __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDeco void __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_HolderCommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9609,11 +9622,11 @@ void __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeEr static inline uintptr_t CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_HolderCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9621,7 +9634,7 @@ uint32_t __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDeco LDKCResult_HolderCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(orig & ~1); LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(uint32_t o) { @@ -9632,7 +9645,7 @@ uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecod o_conv = BuiltCommitmentTransaction_clone(&o_conv); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err(uint32_t e) { @@ -9643,7 +9656,7 @@ uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecod e_conv = DecodeError_clone(&e_conv); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { @@ -9654,7 +9667,7 @@ jboolean __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecod void __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9664,11 +9677,11 @@ void __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErr static inline uintptr_t CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9676,7 +9689,7 @@ uint32_t __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecod LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(orig & ~1); LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_ok(uint32_t o) { @@ -9687,13 +9700,13 @@ uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ // Warning: we need a move here but no clone is available for LDKTrustedClosingTransaction LDKCResult_TrustedClosingTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedClosingTransactionNoneZ), "LDKCResult_TrustedClosingTransactionNoneZ"); *ret_conv = CResult_TrustedClosingTransactionNoneZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_err"))) TS_CResult_TrustedClosingTransactionNoneZ_err() { LDKCResult_TrustedClosingTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedClosingTransactionNoneZ), "LDKCResult_TrustedClosingTransactionNoneZ"); *ret_conv = CResult_TrustedClosingTransactionNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_is_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_is_ok(uint32_t o) { @@ -9704,7 +9717,7 @@ jboolean __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ void __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_free"))) TS_CResult_TrustedClosingTransactionNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_TrustedClosingTransactionNoneZ _res_conv = *(LDKCResult_TrustedClosingTransactionNoneZ*)(_res_ptr); FREE((void*)_res); @@ -9719,7 +9732,7 @@ uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErro o_conv = CommitmentTransaction_clone(&o_conv); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_err(uint32_t e) { @@ -9730,7 +9743,7 @@ uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErro e_conv = DecodeError_clone(&e_conv); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) { @@ -9741,7 +9754,7 @@ jboolean __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErro void __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_free"))) TS_CResult_CommitmentTransactionDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_CommitmentTransactionDecodeErrorZ _res_conv = *(LDKCResult_CommitmentTransactionDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9751,11 +9764,11 @@ void __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_f static inline uintptr_t CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_CommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9763,7 +9776,7 @@ uint32_t __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErro LDKCResult_CommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(orig & ~1); LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_ok(uint32_t o) { @@ -9774,13 +9787,13 @@ uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNon // Warning: we need a move here but no clone is available for LDKTrustedCommitmentTransaction LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ"); *ret_conv = CResult_TrustedCommitmentTransactionNoneZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_err() { LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ"); *ret_conv = CResult_TrustedCommitmentTransactionNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok(uint32_t o) { @@ -9791,7 +9804,7 @@ jboolean __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNon void __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_free"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_TrustedCommitmentTransactionNoneZ _res_conv = *(LDKCResult_TrustedCommitmentTransactionNoneZ*)(_res_ptr); FREE((void*)_res); @@ -9805,23 +9818,23 @@ 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; + int8_tArray* o_vals = (void*) o->elems /* XXX o leaks */; for (size_t m = 0; m < o_constr.datalen; m++) { int8_tArray o_conv_12 = o_vals[m]; LDKSignature o_conv_12_ref; CHECK(o_conv_12->arr_len == 64); - memcpy(o_conv_12_ref.compact_form, o_conv_12->elems, 64); + memcpy(o_conv_12_ref.compact_form, o_conv_12->elems, 64); FREE(o_conv_12); o_constr.data[m] = o_conv_12_ref; } LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_ok(o_constr); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_err"))) TS_CResult_CVec_SignatureZNoneZ_err() { LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_is_ok"))) TS_CResult_CVec_SignatureZNoneZ_is_ok(uint32_t o) { @@ -9832,7 +9845,7 @@ jboolean __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_is_ok"))) void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_free"))) TS_CResult_CVec_SignatureZNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_SignatureZNoneZ _res_conv = *(LDKCResult_CVec_SignatureZNoneZ*)(_res_ptr); FREE((void*)_res); @@ -9842,11 +9855,11 @@ void __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_free"))) TS_CR static inline uintptr_t CResult_CVec_SignatureZNoneZ_clone_ptr(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR arg) { LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone_ptr"))) TS_CResult_CVec_SignatureZNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone_ptr"))) TS_CResult_CVec_SignatureZNoneZ_clone_ptr(uint32_t arg) { LDKCResult_CVec_SignatureZNoneZ* arg_conv = (LDKCResult_CVec_SignatureZNoneZ*)(arg & ~1); - int64_t ret_val = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -9854,7 +9867,7 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone"))) LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)(orig & ~1); LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = CResult_CVec_SignatureZNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_ok(uint32_t o) { @@ -9865,7 +9878,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok") o_conv = ShutdownScript_clone(&o_conv); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_err(uint32_t e) { @@ -9876,7 +9889,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err" e_conv = DecodeError_clone(&e_conv); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_is_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_is_ok(uint32_t o) { @@ -9887,7 +9900,7 @@ jboolean __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_is_o void __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free"))) TS_CResult_ShutdownScriptDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownScriptDecodeErrorZ _res_conv = *(LDKCResult_ShutdownScriptDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -9897,11 +9910,11 @@ void __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free"))) static inline uintptr_t CResult_ShutdownScriptDecodeErrorZ_clone_ptr(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ShutdownScriptDecodeErrorZ* arg_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -9909,7 +9922,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clon LDKCResult_ShutdownScriptDecodeErrorZ* orig_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(orig & ~1); LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok(uint32_t o) { @@ -9920,7 +9933,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownSc o_conv = ShutdownScript_clone(&o_conv); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err(uint32_t e) { @@ -9931,7 +9944,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownSc e_conv = InvalidShutdownScript_clone(&e_conv); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(uint32_t o) { @@ -9942,7 +9955,7 @@ jboolean __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownSc void __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownScriptInvalidShutdownScriptZ _res_conv = *(LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(_res_ptr); FREE((void*)_res); @@ -9952,11 +9965,11 @@ void __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScript static inline uintptr_t CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR arg) { LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(uint32_t arg) { LDKCResult_ShutdownScriptInvalidShutdownScriptZ* arg_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(arg & ~1); - int64_t ret_val = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv); return ret_val; } @@ -9964,29 +9977,29 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownSc LDKCResult_ShutdownScriptInvalidShutdownScriptZ* orig_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(orig & ~1); LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKType o_conv = *(LDKType*)(o_ptr); LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_TypeZ_none"))) TS_COption_TypeZ_none() { LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_TypeZ_free"))) TS_COption_TypeZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_TypeZ _res_conv = *(LDKCOption_TypeZ*)(_res_ptr); FREE((void*)_res); @@ -9996,12 +10009,12 @@ void __attribute__((export_name("TS_COption_TypeZ_free"))) TS_COption_TypeZ_fre static inline uintptr_t COption_TypeZ_clone_ptr(LDKCOption_TypeZ *NONNULL_PTR arg) { LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint32_t arg) { LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)arg; - int64_t ret_val = COption_TypeZ_clone_ptr(arg_conv); + intptr_t ret_val = COption_TypeZ_clone_ptr(arg_conv); return ret_val; } @@ -10009,18 +10022,18 @@ uint32_t __attribute__((export_name("TS_COption_TypeZ_clone"))) TS_COption_Type LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)orig; LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ"); *ret_copy = COption_TypeZ_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKCOption_TypeZ o_conv = *(LDKCOption_TypeZ*)(o_ptr); - o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)(((uint64_t)o) & ~1)); + o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)(((uintptr_t)o) & ~1)); LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err"))) TS_CResult_COption_TypeZDecodeErrorZ_err(uint32_t e) { @@ -10031,7 +10044,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint32_t o) { @@ -10042,7 +10055,7 @@ jboolean __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_free"))) TS_CResult_COption_TypeZDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_COption_TypeZDecodeErrorZ _res_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10052,11 +10065,11 @@ void __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_free"))) static inline uintptr_t CResult_COption_TypeZDecodeErrorZ_clone_ptr(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_COption_TypeZDecodeErrorZ* arg_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -10064,21 +10077,21 @@ uint32_t __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(orig & ~1); LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ"); *ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_ok"))) TS_CResult_StringErrorZ_ok(jstring o) { LDKStr o_conv = str_ref_to_owned_c(o); LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = CResult_StringErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_StringErrorZ_err"))) TS_CResult_StringErrorZ_err(uint32_t e) { LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e); LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ"); *ret_conv = CResult_StringErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResult_StringErrorZ_is_ok(uint32_t o) { @@ -10089,7 +10102,7 @@ jboolean __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResu void __attribute__((export_name("TS_CResult_StringErrorZ_free"))) TS_CResult_StringErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_StringErrorZ _res_conv = *(LDKCResult_StringErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10104,7 +10117,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeError o_conv = ChannelMonitorUpdate_clone(&o_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err(uint32_t e) { @@ -10115,7 +10128,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeError e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint32_t o) { @@ -10126,7 +10139,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeError void __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10136,11 +10149,11 @@ void __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_fr static inline uintptr_t CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelMonitorUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -10148,30 +10161,30 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeError LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_some"))) TS_COption_MonitorEventZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKMonitorEvent o_conv = *(LDKMonitorEvent*)(o_ptr); - o_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uint64_t)o) & ~1)); + o_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)o) & ~1)); LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_none"))) TS_COption_MonitorEventZ_none() { LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_MonitorEventZ_free"))) TS_COption_MonitorEventZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_MonitorEventZ _res_conv = *(LDKCOption_MonitorEventZ*)(_res_ptr); FREE((void*)_res); @@ -10181,12 +10194,12 @@ void __attribute__((export_name("TS_COption_MonitorEventZ_free"))) TS_COption_M static inline uintptr_t COption_MonitorEventZ_clone_ptr(LDKCOption_MonitorEventZ *NONNULL_PTR arg) { LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint32_t arg) { LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)arg; - int64_t ret_val = COption_MonitorEventZ_clone_ptr(arg_conv); + intptr_t ret_val = COption_MonitorEventZ_clone_ptr(arg_conv); return ret_val; } @@ -10194,18 +10207,18 @@ uint32_t __attribute__((export_name("TS_COption_MonitorEventZ_clone"))) TS_COpt LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)orig; LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ"); *ret_copy = COption_MonitorEventZ_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKCOption_MonitorEventZ o_conv = *(LDKCOption_MonitorEventZ*)(o_ptr); - o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)(((uint64_t)o) & ~1)); + o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)(((uintptr_t)o) & ~1)); LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_err(uint32_t e) { @@ -10216,7 +10229,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErro e_conv = DecodeError_clone(&e_conv); LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint32_t o) { @@ -10227,7 +10240,7 @@ jboolean __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErro void __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_free"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_COption_MonitorEventZDecodeErrorZ _res_conv = *(LDKCResult_COption_MonitorEventZDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10237,11 +10250,11 @@ void __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_f static inline uintptr_t CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_COption_MonitorEventZDecodeErrorZ* arg_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -10249,7 +10262,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErro LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(orig & ~1); LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_ok(uint32_t o) { @@ -10260,7 +10273,7 @@ uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) T o_conv = HTLCUpdate_clone(&o_conv); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_err(uint32_t e) { @@ -10271,7 +10284,7 @@ uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) e_conv = DecodeError_clone(&e_conv); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint32_t o) { @@ -10282,7 +10295,7 @@ jboolean __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok")) void __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_HTLCUpdateDecodeErrorZ _res_conv = *(LDKCResult_HTLCUpdateDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10292,11 +10305,11 @@ void __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_ static inline uintptr_t CResult_HTLCUpdateDecodeErrorZ_clone_ptr(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_HTLCUpdateDecodeErrorZ* arg_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -10304,19 +10317,19 @@ uint32_t __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone")) LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(orig & ~1); LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_ok"))) TS_CResult_NoneNoneZ_ok() { LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CResult_NoneNoneZ_ok(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_err"))) TS_CResult_NoneNoneZ_err() { LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CResult_NoneNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NoneNoneZ_is_ok"))) TS_CResult_NoneNoneZ_is_ok(uint32_t o) { @@ -10327,7 +10340,7 @@ jboolean __attribute__((export_name("TS_CResult_NoneNoneZ_is_ok"))) TS_CResult_ void __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NoneNoneZ _res_conv = *(LDKCResult_NoneNoneZ*)(_res_ptr); FREE((void*)_res); @@ -10337,11 +10350,11 @@ void __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneN static inline uintptr_t CResult_NoneNoneZ_clone_ptr(LDKCResult_NoneNoneZ *NONNULL_PTR arg) { LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CResult_NoneNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone_ptr"))) TS_CResult_NoneNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone_ptr"))) TS_CResult_NoneNoneZ_clone_ptr(uint32_t arg) { LDKCResult_NoneNoneZ* arg_conv = (LDKCResult_NoneNoneZ*)(arg & ~1); - int64_t ret_val = CResult_NoneNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NoneNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -10349,7 +10362,7 @@ uint32_t __attribute__((export_name("TS_CResult_NoneNoneZ_clone"))) TS_CResult_ LDKCResult_NoneNoneZ* orig_conv = (LDKCResult_NoneNoneZ*)(orig & ~1); LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = CResult_NoneNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tuple_OutPointScriptZ_new(uint32_t a, int8_tArray b) { @@ -10361,15 +10374,15 @@ uint32_t __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tu LDKCVec_u8Z b_ref; b_ref.datalen = b->arr_len; b_ref.data = MALLOC(b_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(b_ref.data, b->elems, b_ref.datalen); + memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b); LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = C2Tuple_OutPointScriptZ_new(a_conv, b_ref); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_free"))) TS_C2Tuple_OutPointScriptZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_OutPointScriptZ _res_conv = *(LDKC2Tuple_OutPointScriptZ*)(_res_ptr); FREE((void*)_res); @@ -10380,15 +10393,15 @@ uint32_t __attribute__((export_name("TS_C2Tuple_u32ScriptZ_new"))) TS_C2Tuple_u LDKCVec_u8Z b_ref; b_ref.datalen = b->arr_len; b_ref.data = MALLOC(b_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(b_ref.data, b->elems, b_ref.datalen); + memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b); LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ"); *ret_conv = C2Tuple_u32ScriptZ_new(a, b_ref); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_u32ScriptZ_free"))) TS_C2Tuple_u32ScriptZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u32ScriptZ _res_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_ptr); FREE((void*)_res); @@ -10402,10 +10415,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t v = 0; v < _res_constr.datalen; v++) { uint32_t _res_conv_21 = _res_vals[v]; - void* _res_conv_21_ptr = (void*)(((uint64_t)_res_conv_21) & ~1); + void* _res_conv_21_ptr = (void*)(((uintptr_t)_res_conv_21) & ~1); CHECK_ACCESS(_res_conv_21_ptr); LDKC2Tuple_u32ScriptZ _res_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_conv_21_ptr); FREE((void*)_res_conv_21); @@ -10417,17 +10430,17 @@ void __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(int8_tArray a, uint32_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); - memcpy(a_ref.data, a->elems, 32); + memcpy(a_ref.data, a->elems, 32); FREE(a); LDKCVec_C2Tuple_u32ScriptZZ b_constr; b_constr.datalen = b->arr_len; if (b_constr.datalen > 0) 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; + uint32_t* b_vals = b->elems /* XXX b leaks */; for (size_t v = 0; v < b_constr.datalen; v++) { uint32_t b_conv_21 = b_vals[v]; - void* b_conv_21_ptr = (void*)(((uint64_t)b_conv_21) & ~1); + void* b_conv_21_ptr = (void*)(((uintptr_t)b_conv_21) & ~1); CHECK_ACCESS(b_conv_21_ptr); LDKC2Tuple_u32ScriptZ b_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(b_conv_21_ptr); // Warning: we may need a move here but no clone is available for LDKC2Tuple_u32ScriptZ @@ -10435,12 +10448,12 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_n } 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 ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_ptr); FREE((void*)_res); @@ -10454,10 +10467,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t o = 0; o < _res_constr.datalen; o++) { uint32_t _res_conv_40 = _res_vals[o]; - void* _res_conv_40_ptr = (void*)(((uint64_t)_res_conv_40) & ~1); + void* _res_conv_40_ptr = (void*)(((uintptr_t)_res_conv_40) & ~1); CHECK_ACCESS(_res_conv_40_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv_40_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_conv_40_ptr); FREE((void*)_res_conv_40); @@ -10473,10 +10486,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t o = 0; o < _res_constr.datalen; o++) { uint32_t _res_conv_14 = _res_vals[o]; - void* _res_conv_14_ptr = (void*)(((uint64_t)_res_conv_14) & ~1); + void* _res_conv_14_ptr = (void*)(((uintptr_t)_res_conv_14) & ~1); CHECK_ACCESS(_res_conv_14_ptr); LDKMonitorEvent _res_conv_14_conv = *(LDKMonitorEvent*)(_res_conv_14_ptr); FREE((void*)_res_conv_14); @@ -10492,10 +10505,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t h = 0; h < _res_constr.datalen; h++) { uint32_t _res_conv_7 = _res_vals[h]; - void* _res_conv_7_ptr = (void*)(((uint64_t)_res_conv_7) & ~1); + void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); CHECK_ACCESS(_res_conv_7_ptr); LDKEvent _res_conv_7_conv = *(LDKEvent*)(_res_conv_7_ptr); FREE((void*)_res_conv_7); @@ -10511,13 +10524,13 @@ 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; + int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKTransaction _res_conv_12_ref; _res_conv_12_ref.datalen = _res_conv_12->arr_len; _res_conv_12_ref.data = MALLOC(_res_conv_12_ref.datalen, "LDKTransaction Bytes"); - memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); + memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); FREE(_res_conv_12); _res_conv_12_ref.data_is_owned = true; _res_constr.data[m] = _res_conv_12_ref; } @@ -10527,11 +10540,11 @@ void __attribute__((export_name("TS_CVec_TransactionZ_free"))) TS_CVec_Transact static inline uintptr_t C2Tuple_usizeTransactionZ_clone_ptr(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR arg) { LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *ret_conv = C2Tuple_usizeTransactionZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone_ptr"))) TS_C2Tuple_usizeTransactionZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone_ptr"))) TS_C2Tuple_usizeTransactionZ_clone_ptr(uint32_t arg) { LDKC2Tuple_usizeTransactionZ* arg_conv = (LDKC2Tuple_usizeTransactionZ*)(arg & ~1); - int64_t ret_val = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv); return ret_val; } @@ -10539,23 +10552,23 @@ uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone"))) TS_ LDKC2Tuple_usizeTransactionZ* orig_conv = (LDKC2Tuple_usizeTransactionZ*)(orig & ~1); LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *ret_conv = C2Tuple_usizeTransactionZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(int64_t a, int8_tArray b) { +uint32_t __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(intptr_t a, int8_tArray b) { LDKTransaction b_ref; b_ref.datalen = b->arr_len; b_ref.data = MALLOC(b_ref.datalen, "LDKTransaction Bytes"); - memcpy(b_ref.data, b->elems, b_ref.datalen); + memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b); b_ref.data_is_owned = true; LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ"); *ret_conv = C2Tuple_usizeTransactionZ_new(a, b_ref); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_free"))) TS_C2Tuple_usizeTransactionZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_usizeTransactionZ _res_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_ptr); FREE((void*)_res); @@ -10569,10 +10582,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t c = 0; c < _res_constr.datalen; c++) { uint32_t _res_conv_28 = _res_vals[c]; - void* _res_conv_28_ptr = (void*)(((uint64_t)_res_conv_28) & ~1); + void* _res_conv_28_ptr = (void*)(((uintptr_t)_res_conv_28) & ~1); CHECK_ACCESS(_res_conv_28_ptr); LDKC2Tuple_usizeTransactionZ _res_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_conv_28_ptr); FREE((void*)_res_conv_28); @@ -10584,11 +10597,11 @@ void __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS static inline uintptr_t C2Tuple_u32TxOutZ_clone_ptr(LDKC2Tuple_u32TxOutZ *NONNULL_PTR arg) { LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv = C2Tuple_u32TxOutZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone_ptr"))) TS_C2Tuple_u32TxOutZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone_ptr"))) TS_C2Tuple_u32TxOutZ_clone_ptr(uint32_t arg) { LDKC2Tuple_u32TxOutZ* arg_conv = (LDKC2Tuple_u32TxOutZ*)(arg & ~1); - int64_t ret_val = C2Tuple_u32TxOutZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_u32TxOutZ_clone_ptr(arg_conv); return ret_val; } @@ -10596,22 +10609,22 @@ uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone"))) TS_C2Tuple_ LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)(orig & ~1); LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv = C2Tuple_u32TxOutZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C2Tuple_u32TxOutZ_new"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint32_t b) { - void* b_ptr = (void*)(((uint64_t)b) & ~1); + void* b_ptr = (void*)(((uintptr_t)b) & ~1); CHECK_ACCESS(b_ptr); LDKTxOut b_conv = *(LDKTxOut*)(b_ptr); - b_conv = TxOut_clone((LDKTxOut*)(((uint64_t)b) & ~1)); + b_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)b) & ~1)); LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ"); *ret_conv = C2Tuple_u32TxOutZ_new(a, b_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_u32TxOutZ_free"))) TS_C2Tuple_u32TxOutZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_u32TxOutZ _res_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_ptr); FREE((void*)_res); @@ -10625,10 +10638,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t u = 0; u < _res_constr.datalen; u++) { uint32_t _res_conv_20 = _res_vals[u]; - void* _res_conv_20_ptr = (void*)(((uint64_t)_res_conv_20) & ~1); + void* _res_conv_20_ptr = (void*)(((uintptr_t)_res_conv_20) & ~1); CHECK_ACCESS(_res_conv_20_ptr); LDKC2Tuple_u32TxOutZ _res_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_conv_20_ptr); FREE((void*)_res_conv_20); @@ -10640,11 +10653,11 @@ void __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2 static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR arg) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(uint32_t arg) { LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(arg & ~1); - int64_t ret_val = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv); return ret_val; } @@ -10652,36 +10665,36 @@ uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_cl LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(orig & ~1); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ"); *ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(int8_tArray a, uint32_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); - memcpy(a_ref.data, a->elems, 32); + memcpy(a_ref.data, a->elems, 32); FREE(a); LDKCVec_C2Tuple_u32TxOutZZ b_constr; b_constr.datalen = b->arr_len; if (b_constr.datalen > 0) 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; + uint32_t* b_vals = b->elems /* XXX b leaks */; for (size_t u = 0; u < b_constr.datalen; u++) { uint32_t b_conv_20 = b_vals[u]; - void* b_conv_20_ptr = (void*)(((uint64_t)b_conv_20) & ~1); + void* b_conv_20_ptr = (void*)(((uintptr_t)b_conv_20) & ~1); CHECK_ACCESS(b_conv_20_ptr); LDKC2Tuple_u32TxOutZ b_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(b_conv_20_ptr); - b_conv_20_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)(((uint64_t)b_conv_20) & ~1)); + b_conv_20_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)(((uintptr_t)b_conv_20) & ~1)); b_constr.data[u] = b_conv_20_conv; } 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 ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_ptr); FREE((void*)_res); @@ -10695,10 +10708,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t n = 0; n < _res_constr.datalen; n++) { uint32_t _res_conv_39 = _res_vals[n]; - void* _res_conv_39_ptr = (void*)(((uint64_t)_res_conv_39) & ~1); + void* _res_conv_39_ptr = (void*)(((uintptr_t)_res_conv_39) & ~1); CHECK_ACCESS(_res_conv_39_ptr); LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv_39_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_conv_39_ptr); FREE((void*)_res_conv_39); @@ -10714,12 +10727,12 @@ 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; + int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; 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); + memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } CVec_TxidZ_free(_res_constr); @@ -10732,10 +10745,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t j = 0; j < _res_constr.datalen; j++) { uint32_t _res_conv_9 = _res_vals[j]; - void* _res_conv_9_ptr = (void*)(((uint64_t)_res_conv_9) & ~1); + void* _res_conv_9_ptr = (void*)(((uintptr_t)_res_conv_9) & ~1); CHECK_ACCESS(_res_conv_9_ptr); LDKBalance _res_conv_9_conv = *(LDKBalance*)(_res_conv_9_ptr); FREE((void*)_res_conv_9); @@ -10747,11 +10760,11 @@ void __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_fre static inline uintptr_t C2Tuple_BlockHashChannelMonitorZ_clone_ptr(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR arg) { LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr(uint32_t arg) { LDKC2Tuple_BlockHashChannelMonitorZ* arg_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(arg & ~1); - int64_t ret_val = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv); return ret_val; } @@ -10759,13 +10772,13 @@ uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone" LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(orig & ~1); LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new"))) TS_C2Tuple_BlockHashChannelMonitorZ_new(int8_tArray a, uint32_t b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); - memcpy(a_ref.data, a->elems, 32); + memcpy(a_ref.data, a->elems, 32); FREE(a); LDKChannelMonitor b_conv; b_conv.inner = (void*)(b & (~1)); b_conv.is_owned = (b & 1) || (b == 0); @@ -10773,12 +10786,12 @@ uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new")) b_conv = ChannelMonitor_clone(&b_conv); LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ"); *ret_conv = C2Tuple_BlockHashChannelMonitorZ_new(a_ref, b_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_BlockHashChannelMonitorZ _res_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(_res_ptr); FREE((void*)_res); @@ -10786,13 +10799,13 @@ void __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) T } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKC2Tuple_BlockHashChannelMonitorZ o_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(o_ptr); - o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)(((uint64_t)o) & ~1)); + o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)(((uintptr_t)o) & ~1)); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(uint32_t e) { @@ -10803,7 +10816,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitor e_conv = DecodeError_clone(&e_conv); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint32_t o) { @@ -10814,7 +10827,7 @@ jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitor void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10824,11 +10837,11 @@ void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDec static inline uintptr_t CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* arg_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -10836,7 +10849,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitor LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(orig & ~1); LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_CResult_RouteHopDecodeErrorZ_ok(uint32_t o) { @@ -10847,7 +10860,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_ o_conv = RouteHop_clone(&o_conv); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS_CResult_RouteHopDecodeErrorZ_err(uint32_t e) { @@ -10858,7 +10871,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHopDecodeErrorZ_is_ok(uint32_t o) { @@ -10869,7 +10882,7 @@ jboolean __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CResult_RouteHopDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHopDecodeErrorZ _res_conv = *(LDKCResult_RouteHopDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10879,11 +10892,11 @@ void __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CR static inline uintptr_t CResult_RouteHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHopDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHopDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RouteHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHopDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -10891,7 +10904,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone"))) LDKCResult_RouteHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHopDecodeErrorZ*)(orig & ~1); LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = CResult_RouteHopDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_free(uint32_tArray _res) { @@ -10901,7 +10914,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t k = 0; k < _res_constr.datalen; k++) { uint32_t _res_conv_10 = _res_vals[k]; LDKRouteHop _res_conv_10_conv; @@ -10920,7 +10933,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; + uint32_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; for (size_t m = 0; m < _res_constr.datalen; m++) { uint32_tArray _res_conv_12 = _res_vals[m]; LDKCVec_RouteHopZ _res_conv_12_constr; @@ -10929,7 +10942,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; + uint32_t* _res_conv_12_vals = _res_conv_12->elems /* XXX _res_conv_12 leaks */; 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; @@ -10951,7 +10964,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_ok"))) TS_CRe o_conv = Route_clone(&o_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CResult_RouteDecodeErrorZ_err(uint32_t e) { @@ -10962,7 +10975,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CR e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_is_ok"))) TS_CResult_RouteDecodeErrorZ_is_ok(uint32_t o) { @@ -10973,7 +10986,7 @@ jboolean __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_is_ok"))) TS_ void __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResult_RouteDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RouteDecodeErrorZ _res_conv = *(LDKCResult_RouteDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -10983,11 +10996,11 @@ void __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResu static inline uintptr_t CResult_RouteDecodeErrorZ_clone_ptr(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone_ptr"))) TS_CResult_RouteDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone_ptr"))) TS_CResult_RouteDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RouteDecodeErrorZ* arg_conv = (LDKCResult_RouteDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -10995,7 +11008,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone"))) TS_ LDKCResult_RouteDecodeErrorZ* orig_conv = (LDKCResult_RouteDecodeErrorZ*)(orig & ~1); LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = CResult_RouteDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok"))) TS_CResult_RouteParametersDecodeErrorZ_ok(uint32_t o) { @@ -11006,7 +11019,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok" o_conv = RouteParameters_clone(&o_conv); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err"))) TS_CResult_RouteParametersDecodeErrorZ_err(uint32_t e) { @@ -11017,7 +11030,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_is_ok"))) TS_CResult_RouteParametersDecodeErrorZ_is_ok(uint32_t o) { @@ -11028,7 +11041,7 @@ jboolean __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_is_ void __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free"))) TS_CResult_RouteParametersDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RouteParametersDecodeErrorZ _res_conv = *(LDKCResult_RouteParametersDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11038,11 +11051,11 @@ void __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free")) static inline uintptr_t CResult_RouteParametersDecodeErrorZ_clone_ptr(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone_ptr"))) TS_CResult_RouteParametersDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone_ptr"))) TS_CResult_RouteParametersDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RouteParametersDecodeErrorZ* arg_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11050,7 +11063,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clo LDKCResult_RouteParametersDecodeErrorZ* orig_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(orig & ~1); LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = CResult_RouteParametersDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ_free(uint32_tArray _res) { @@ -11060,7 +11073,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t l = 0; l < _res_constr.datalen; l++) { uint32_t _res_conv_11 = _res_vals[l]; LDKRouteHint _res_conv_11_conv; @@ -11075,20 +11088,20 @@ void __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ uint32_t __attribute__((export_name("TS_COption_u64Z_some"))) TS_COption_u64Z_some(int64_t o) { LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = COption_u64Z_some(o); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_u64Z_none"))) TS_COption_u64Z_none() { LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = COption_u64Z_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_u64Z_free"))) TS_COption_u64Z_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_u64Z _res_conv = *(LDKCOption_u64Z*)(_res_ptr); FREE((void*)_res); @@ -11098,12 +11111,12 @@ void __attribute__((export_name("TS_COption_u64Z_free"))) TS_COption_u64Z_free( static inline uintptr_t COption_u64Z_clone_ptr(LDKCOption_u64Z *NONNULL_PTR arg) { LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = COption_u64Z_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint32_t arg) { LDKCOption_u64Z* arg_conv = (LDKCOption_u64Z*)arg; - int64_t ret_val = COption_u64Z_clone_ptr(arg_conv); + intptr_t ret_val = COption_u64Z_clone_ptr(arg_conv); return ret_val; } @@ -11111,7 +11124,7 @@ uint32_t __attribute__((export_name("TS_COption_u64Z_clone"))) TS_COption_u64Z_ LDKCOption_u64Z* orig_conv = (LDKCOption_u64Z*)orig; LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = COption_u64Z_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -11123,7 +11136,7 @@ uint32_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_ok"))) TS_CRe o_conv = Payee_clone(&o_conv); LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ"); *ret_conv = CResult_PayeeDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_err"))) TS_CResult_PayeeDecodeErrorZ_err(uint32_t e) { @@ -11134,7 +11147,7 @@ uint32_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_err"))) TS_CR e_conv = DecodeError_clone(&e_conv); LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ"); *ret_conv = CResult_PayeeDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_is_ok"))) TS_CResult_PayeeDecodeErrorZ_is_ok(uint32_t o) { @@ -11145,7 +11158,7 @@ jboolean __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_is_ok"))) TS_ void __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_free"))) TS_CResult_PayeeDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PayeeDecodeErrorZ _res_conv = *(LDKCResult_PayeeDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11155,11 +11168,11 @@ void __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_free"))) TS_CResu static inline uintptr_t CResult_PayeeDecodeErrorZ_clone_ptr(LDKCResult_PayeeDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ"); *ret_conv = CResult_PayeeDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_clone_ptr"))) TS_CResult_PayeeDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_clone_ptr"))) TS_CResult_PayeeDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_PayeeDecodeErrorZ* arg_conv = (LDKCResult_PayeeDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_PayeeDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PayeeDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11167,7 +11180,7 @@ uint32_t __attribute__((export_name("TS_CResult_PayeeDecodeErrorZ_clone"))) TS_ LDKCResult_PayeeDecodeErrorZ* orig_conv = (LDKCResult_PayeeDecodeErrorZ*)(orig & ~1); LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ"); *ret_conv = CResult_PayeeDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHintHopZ_free(uint32_tArray _res) { @@ -11177,7 +11190,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t o = 0; o < _res_constr.datalen; o++) { uint32_t _res_conv_14 = _res_vals[o]; LDKRouteHintHop _res_conv_14_conv; @@ -11197,7 +11210,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_ok"))) TS o_conv = RouteHint_clone(&o_conv); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) TS_CResult_RouteHintDecodeErrorZ_err(uint32_t e) { @@ -11208,7 +11221,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) T e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_is_ok"))) TS_CResult_RouteHintDecodeErrorZ_is_ok(uint32_t o) { @@ -11219,7 +11232,7 @@ jboolean __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_CResult_RouteHintDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHintDecodeErrorZ _res_conv = *(LDKCResult_RouteHintDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11229,11 +11242,11 @@ void __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_C static inline uintptr_t CResult_RouteHintDecodeErrorZ_clone_ptr(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RouteHintDecodeErrorZ* arg_conv = (LDKCResult_RouteHintDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11241,7 +11254,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone"))) LDKCResult_RouteHintDecodeErrorZ* orig_conv = (LDKCResult_RouteHintDecodeErrorZ*)(orig & ~1); LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = CResult_RouteHintDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_ok(uint32_t o) { @@ -11252,7 +11265,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok"))) o_conv = RouteHintHop_clone(&o_conv); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err"))) TS_CResult_RouteHintHopDecodeErrorZ_err(uint32_t e) { @@ -11263,7 +11276,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err")) e_conv = DecodeError_clone(&e_conv); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_is_ok(uint32_t o) { @@ -11274,7 +11287,7 @@ jboolean __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_is_ok" void __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) TS_CResult_RouteHintHopDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RouteHintHopDecodeErrorZ _res_conv = *(LDKCResult_RouteHintHopDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11284,11 +11297,11 @@ void __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) T static inline uintptr_t CResult_RouteHintHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RouteHintHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11296,7 +11309,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone" LDKCResult_RouteHintHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(orig & ~1); LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = CResult_RouteHintHopDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_ChannelDetailsZ_free(uint32_tArray _res) { @@ -11306,7 +11319,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t q = 0; q < _res_constr.datalen; q++) { uint32_t _res_conv_16 = _res_vals[q]; LDKChannelDetails _res_conv_16_conv; @@ -11326,7 +11339,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_ok"))) TS_ o_conv = Route_clone(&o_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS_CResult_RouteLightningErrorZ_err(uint32_t e) { @@ -11337,7 +11350,7 @@ uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS e_conv = LightningError_clone(&e_conv); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RouteLightningErrorZ_is_ok"))) TS_CResult_RouteLightningErrorZ_is_ok(uint32_t o) { @@ -11348,7 +11361,7 @@ jboolean __attribute__((export_name("TS_CResult_RouteLightningErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CResult_RouteLightningErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RouteLightningErrorZ _res_conv = *(LDKCResult_RouteLightningErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11358,11 +11371,11 @@ void __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CR static inline uintptr_t CResult_RouteLightningErrorZ_clone_ptr(LDKCResult_RouteLightningErrorZ *NONNULL_PTR arg) { LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone_ptr"))) TS_CResult_RouteLightningErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone_ptr"))) TS_CResult_RouteLightningErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RouteLightningErrorZ* arg_conv = (LDKCResult_RouteLightningErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RouteLightningErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RouteLightningErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11370,13 +11383,13 @@ uint32_t __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone"))) LDKCResult_RouteLightningErrorZ* orig_conv = (LDKCResult_RouteLightningErrorZ*)(orig & ~1); LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = CResult_RouteLightningErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_ok"))) TS_CResult_NoneLightningErrorZ_ok() { LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_ok(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_CResult_NoneLightningErrorZ_err(uint32_t e) { @@ -11387,7 +11400,7 @@ uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_ e_conv = LightningError_clone(&e_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) TS_CResult_NoneLightningErrorZ_is_ok(uint32_t o) { @@ -11398,7 +11411,7 @@ jboolean __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) T void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CResult_NoneLightningErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NoneLightningErrorZ _res_conv = *(LDKCResult_NoneLightningErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11408,11 +11421,11 @@ void __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CRe static inline uintptr_t CResult_NoneLightningErrorZ_clone_ptr(LDKCResult_NoneLightningErrorZ *NONNULL_PTR arg) { LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone_ptr"))) TS_CResult_NoneLightningErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone_ptr"))) TS_CResult_NoneLightningErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NoneLightningErrorZ* arg_conv = (LDKCResult_NoneLightningErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NoneLightningErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NoneLightningErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11420,17 +11433,17 @@ uint32_t __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone"))) T LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)(orig & ~1); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = CResult_NoneLightningErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } static inline uintptr_t C2Tuple_PublicKeyTypeZ_clone_ptr(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR arg) { LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv = C2Tuple_PublicKeyTypeZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone_ptr"))) TS_C2Tuple_PublicKeyTypeZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone_ptr"))) TS_C2Tuple_PublicKeyTypeZ_clone_ptr(uint32_t arg) { LDKC2Tuple_PublicKeyTypeZ* arg_conv = (LDKC2Tuple_PublicKeyTypeZ*)(arg & ~1); - int64_t ret_val = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv); return ret_val; } @@ -11438,24 +11451,24 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone"))) TS_C2T LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)(orig & ~1); LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv = C2Tuple_PublicKeyTypeZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tuple_PublicKeyTypeZ_new(int8_tArray a, uint32_t b) { LDKPublicKey a_ref; CHECK(a->arr_len == 33); - memcpy(a_ref.compressed_form, a->elems, 33); - void* b_ptr = (void*)(((uint64_t)b) & ~1); + memcpy(a_ref.compressed_form, a->elems, 33); FREE(a); + void* b_ptr = (void*)(((uintptr_t)b) & ~1); CHECK_ACCESS(b_ptr); LDKType b_conv = *(LDKType*)(b_ptr); LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ"); *ret_conv = C2Tuple_PublicKeyTypeZ_new(a_ref, b_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_free"))) TS_C2Tuple_PublicKeyTypeZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PublicKeyTypeZ _res_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_ptr); FREE((void*)_res); @@ -11469,10 +11482,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t z = 0; z < _res_constr.datalen; z++) { uint32_t _res_conv_25 = _res_vals[z]; - void* _res_conv_25_ptr = (void*)(((uint64_t)_res_conv_25) & ~1); + void* _res_conv_25_ptr = (void*)(((uintptr_t)_res_conv_25) & ~1); CHECK_ACCESS(_res_conv_25_ptr); LDKC2Tuple_PublicKeyTypeZ _res_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_conv_25_ptr); FREE((void*)_res_conv_25); @@ -11488,10 +11501,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t s = 0; s < _res_constr.datalen; s++) { uint32_t _res_conv_18 = _res_vals[s]; - void* _res_conv_18_ptr = (void*)(((uint64_t)_res_conv_18) & ~1); + void* _res_conv_18_ptr = (void*)(((uintptr_t)_res_conv_18) & ~1); CHECK_ACCESS(_res_conv_18_ptr); LDKMessageSendEvent _res_conv_18_conv = *(LDKMessageSendEvent*)(_res_conv_18_ptr); FREE((void*)_res_conv_18); @@ -11503,7 +11516,7 @@ void __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_Mes uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_ok"))) TS_CResult_boolLightningErrorZ_ok(jboolean o) { LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_ok(o); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_CResult_boolLightningErrorZ_err(uint32_t e) { @@ -11514,7 +11527,7 @@ uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_ e_conv = LightningError_clone(&e_conv); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) TS_CResult_boolLightningErrorZ_is_ok(uint32_t o) { @@ -11525,7 +11538,7 @@ jboolean __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) T void __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CResult_boolLightningErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_boolLightningErrorZ _res_conv = *(LDKCResult_boolLightningErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11535,11 +11548,11 @@ void __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CRe static inline uintptr_t CResult_boolLightningErrorZ_clone_ptr(LDKCResult_boolLightningErrorZ *NONNULL_PTR arg) { LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone_ptr"))) TS_CResult_boolLightningErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone_ptr"))) TS_CResult_boolLightningErrorZ_clone_ptr(uint32_t arg) { LDKCResult_boolLightningErrorZ* arg_conv = (LDKCResult_boolLightningErrorZ*)(arg & ~1); - int64_t ret_val = CResult_boolLightningErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_boolLightningErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11547,17 +11560,17 @@ uint32_t __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone"))) T LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)(orig & ~1); LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ"); *ret_conv = CResult_boolLightningErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } static inline uintptr_t C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR arg) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(uint32_t arg) { LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* arg_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(arg & ~1); - int64_t ret_val = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv); + intptr_t ret_val = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv); return ret_val; } @@ -11565,7 +11578,7 @@ uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdat LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(orig & ~1); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(uint32_t a, uint32_t b, uint32_t c) { @@ -11586,12 +11599,12 @@ uint32_t __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdat c_conv = ChannelUpdate_clone(&c_conv); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ"); *ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(a_conv, b_conv, c_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_ptr); FREE((void*)_res); @@ -11605,10 +11618,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t h = 0; h < _res_constr.datalen; h++) { uint32_t _res_conv_59 = _res_vals[h]; - void* _res_conv_59_ptr = (void*)(((uint64_t)_res_conv_59) & ~1); + void* _res_conv_59_ptr = (void*)(((uintptr_t)_res_conv_59) & ~1); CHECK_ACCESS(_res_conv_59_ptr); LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_conv_59_ptr); FREE((void*)_res_conv_59); @@ -11624,7 +11637,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t s = 0; s < _res_constr.datalen; s++) { uint32_t _res_conv_18 = _res_vals[s]; LDKNodeAnnouncement _res_conv_18_conv; @@ -11643,12 +11656,12 @@ 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; + int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKPublicKey _res_conv_12_ref; CHECK(_res_conv_12->arr_len == 33); - memcpy(_res_conv_12_ref.compressed_form, _res_conv_12->elems, 33); + memcpy(_res_conv_12_ref.compressed_form, _res_conv_12->elems, 33); FREE(_res_conv_12); _res_constr.data[m] = _res_conv_12_ref; } CVec_PublicKeyZ_free(_res_constr); @@ -11658,7 +11671,7 @@ void __attribute__((export_name("TS_CVec_u8Z_free"))) TS_CVec_u8Z_free(int8_tAr LDKCVec_u8Z _res_ref; _res_ref.datalen = _res->arr_len; _res_ref.data = MALLOC(_res_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(_res_ref.data, _res->elems, _res_ref.datalen); + memcpy(_res_ref.data, _res->elems, _res_ref.datalen); FREE(_res); CVec_u8Z_free(_res_ref); } @@ -11666,10 +11679,10 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_ok"))) LDKCVec_u8Z o_ref; o_ref.datalen = o->arr_len; o_ref.data = MALLOC(o_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(o_ref.data, o->elems, o_ref.datalen); + memcpy(o_ref.data, o->elems, o_ref.datalen); FREE(o); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_err(uint32_t e) { @@ -11680,7 +11693,7 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err")) e_conv = PeerHandleError_clone(&e_conv); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint32_t o) { @@ -11691,7 +11704,7 @@ jboolean __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok" void __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_free"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_u8ZPeerHandleErrorZ _res_conv = *(LDKCResult_CVec_u8ZPeerHandleErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11701,11 +11714,11 @@ void __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_free"))) T static inline uintptr_t CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR arg) { LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(uint32_t arg) { LDKCResult_CVec_u8ZPeerHandleErrorZ* arg_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(arg & ~1); - int64_t ret_val = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11713,13 +11726,13 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone" LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(orig & ~1); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_ok"))) TS_CResult_NonePeerHandleErrorZ_ok() { LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_ok(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS_CResult_NonePeerHandleErrorZ_err(uint32_t e) { @@ -11730,7 +11743,7 @@ uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS e_conv = PeerHandleError_clone(&e_conv); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint32_t o) { @@ -11741,7 +11754,7 @@ jboolean __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CResult_NonePeerHandleErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NonePeerHandleErrorZ _res_conv = *(LDKCResult_NonePeerHandleErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11751,11 +11764,11 @@ void __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CR static inline uintptr_t CResult_NonePeerHandleErrorZ_clone_ptr(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR arg) { LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone_ptr"))) TS_CResult_NonePeerHandleErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone_ptr"))) TS_CResult_NonePeerHandleErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NonePeerHandleErrorZ* arg_conv = (LDKCResult_NonePeerHandleErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11763,13 +11776,13 @@ uint32_t __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone"))) LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)(orig & ~1); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = CResult_NonePeerHandleErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_ok"))) TS_CResult_boolPeerHandleErrorZ_ok(jboolean o) { LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_ok(o); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS_CResult_boolPeerHandleErrorZ_err(uint32_t e) { @@ -11780,7 +11793,7 @@ uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS e_conv = PeerHandleError_clone(&e_conv); LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint32_t o) { @@ -11791,7 +11804,7 @@ jboolean __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CResult_boolPeerHandleErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_boolPeerHandleErrorZ _res_conv = *(LDKCResult_boolPeerHandleErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11801,11 +11814,11 @@ void __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CR static inline uintptr_t CResult_boolPeerHandleErrorZ_clone_ptr(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR arg) { LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone_ptr"))) TS_CResult_boolPeerHandleErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone_ptr"))) TS_CResult_boolPeerHandleErrorZ_clone_ptr(uint32_t arg) { LDKCResult_boolPeerHandleErrorZ* arg_conv = (LDKCResult_boolPeerHandleErrorZ*)(arg & ~1); - int64_t ret_val = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11813,24 +11826,24 @@ uint32_t __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone"))) LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)(orig & ~1); LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = CResult_boolPeerHandleErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_ok"))) TS_CResult_TxOutAccessErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKTxOut o_conv = *(LDKTxOut*)(o_ptr); - o_conv = TxOut_clone((LDKTxOut*)(((uint64_t)o) & ~1)); + o_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)o) & ~1)); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_err"))) TS_CResult_TxOutAccessErrorZ_err(uint32_t e) { LDKAccessError e_conv = LDKAccessError_from_js(e); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint32_t o) { @@ -11841,7 +11854,7 @@ jboolean __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_ void __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResult_TxOutAccessErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_TxOutAccessErrorZ _res_conv = *(LDKCResult_TxOutAccessErrorZ*)(_res_ptr); FREE((void*)_res); @@ -11851,11 +11864,11 @@ void __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResu static inline uintptr_t CResult_TxOutAccessErrorZ_clone_ptr(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR arg) { LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone_ptr"))) TS_CResult_TxOutAccessErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone_ptr"))) TS_CResult_TxOutAccessErrorZ_clone_ptr(uint32_t arg) { LDKCResult_TxOutAccessErrorZ* arg_conv = (LDKCResult_TxOutAccessErrorZ*)(arg & ~1); - int64_t ret_val = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -11863,20 +11876,20 @@ uint32_t __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone"))) TS_ LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)(orig & ~1); LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ"); *ret_conv = CResult_TxOutAccessErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_ok() { LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = CResult_NoneChannelMonitorUpdateErrZ_ok(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_err(uint32_t e) { LDKChannelMonitorUpdateErr e_conv = LDKChannelMonitorUpdateErr_from_js(e); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = CResult_NoneChannelMonitorUpdateErrZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint32_t o) { @@ -11887,7 +11900,7 @@ jboolean __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NoneChannelMonitorUpdateErrZ _res_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(_res_ptr); FREE((void*)_res); @@ -11897,11 +11910,11 @@ void __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free") static inline uintptr_t CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR arg) { LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(uint32_t arg) { LDKCResult_NoneChannelMonitorUpdateErrZ* arg_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(arg & ~1); - int64_t ret_val = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv); return ret_val; } @@ -11909,30 +11922,30 @@ uint32_t __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_cl LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(orig & ~1); LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ"); *ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKC2Tuple_usizeTransactionZ o_conv = *(LDKC2Tuple_usizeTransactionZ*)(o_ptr); - o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uint64_t)o) & ~1)); + o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)o) & ~1)); LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_none"))) TS_COption_C2Tuple_usizeTransactionZZ_none() { LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_free"))) TS_COption_C2Tuple_usizeTransactionZZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_C2Tuple_usizeTransactionZZ _res_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(_res_ptr); FREE((void*)_res); @@ -11942,12 +11955,12 @@ void __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_free"))) static inline uintptr_t COption_C2Tuple_usizeTransactionZZ_clone_ptr(LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR arg) { LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr"))) TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr"))) TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr(uint32_t arg) { LDKCOption_C2Tuple_usizeTransactionZZ* arg_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)arg; - int64_t ret_val = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv); + intptr_t ret_val = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv); return ret_val; } @@ -11955,31 +11968,31 @@ uint32_t __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clon LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)orig; LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ"); *ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_some"))) TS_COption_ClosureReasonZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKClosureReason o_conv = *(LDKClosureReason*)(o_ptr); - o_conv = ClosureReason_clone((LDKClosureReason*)(((uint64_t)o) & ~1)); + o_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)o) & ~1)); LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_none"))) TS_COption_ClosureReasonZ_none() { LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_ClosureReasonZ_free"))) TS_COption_ClosureReasonZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_ClosureReasonZ _res_conv = *(LDKCOption_ClosureReasonZ*)(_res_ptr); FREE((void*)_res); @@ -11989,12 +12002,12 @@ void __attribute__((export_name("TS_COption_ClosureReasonZ_free"))) TS_COption_ static inline uintptr_t COption_ClosureReasonZ_clone_ptr(LDKCOption_ClosureReasonZ *NONNULL_PTR arg) { LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint32_t arg) { LDKCOption_ClosureReasonZ* arg_conv = (LDKCOption_ClosureReasonZ*)arg; - int64_t ret_val = COption_ClosureReasonZ_clone_ptr(arg_conv); + intptr_t ret_val = COption_ClosureReasonZ_clone_ptr(arg_conv); return ret_val; } @@ -12002,18 +12015,18 @@ uint32_t __attribute__((export_name("TS_COption_ClosureReasonZ_clone"))) TS_COp LDKCOption_ClosureReasonZ* orig_conv = (LDKCOption_ClosureReasonZ*)orig; LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ"); *ret_copy = COption_ClosureReasonZ_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKCOption_ClosureReasonZ o_conv = *(LDKCOption_ClosureReasonZ*)(o_ptr); - o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)(((uint64_t)o) & ~1)); + o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)(((uintptr_t)o) & ~1)); LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_err(uint32_t e) { @@ -12024,7 +12037,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr e_conv = DecodeError_clone(&e_conv); LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(uint32_t o) { @@ -12035,7 +12048,7 @@ jboolean __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr void __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_free"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_COption_ClosureReasonZDecodeErrorZ _res_conv = *(LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12045,11 +12058,11 @@ void __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_ static inline uintptr_t CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_COption_ClosureReasonZDecodeErrorZ* arg_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12057,30 +12070,30 @@ uint32_t __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr LDKCResult_COption_ClosureReasonZDecodeErrorZ* orig_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(orig & ~1); LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COption_NetworkUpdateZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKNetworkUpdate o_conv = *(LDKNetworkUpdate*)(o_ptr); - o_conv = NetworkUpdate_clone((LDKNetworkUpdate*)(((uint64_t)o) & ~1)); + o_conv = NetworkUpdate_clone((LDKNetworkUpdate*)(((uintptr_t)o) & ~1)); LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_none"))) TS_COption_NetworkUpdateZ_none() { LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_NetworkUpdateZ_free"))) TS_COption_NetworkUpdateZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_NetworkUpdateZ _res_conv = *(LDKCOption_NetworkUpdateZ*)(_res_ptr); FREE((void*)_res); @@ -12090,12 +12103,12 @@ void __attribute__((export_name("TS_COption_NetworkUpdateZ_free"))) TS_COption_ static inline uintptr_t COption_NetworkUpdateZ_clone_ptr(LDKCOption_NetworkUpdateZ *NONNULL_PTR arg) { LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint32_t arg) { LDKCOption_NetworkUpdateZ* arg_conv = (LDKCOption_NetworkUpdateZ*)arg; - int64_t ret_val = COption_NetworkUpdateZ_clone_ptr(arg_conv); + intptr_t ret_val = COption_NetworkUpdateZ_clone_ptr(arg_conv); return ret_val; } @@ -12103,7 +12116,7 @@ uint32_t __attribute__((export_name("TS_COption_NetworkUpdateZ_clone"))) TS_COp LDKCOption_NetworkUpdateZ* orig_conv = (LDKCOption_NetworkUpdateZ*)orig; LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ"); *ret_copy = COption_NetworkUpdateZ_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -12114,10 +12127,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t b = 0; b < _res_constr.datalen; b++) { uint32_t _res_conv_27 = _res_vals[b]; - void* _res_conv_27_ptr = (void*)(((uint64_t)_res_conv_27) & ~1); + void* _res_conv_27_ptr = (void*)(((uintptr_t)_res_conv_27) & ~1); CHECK_ACCESS(_res_conv_27_ptr); LDKSpendableOutputDescriptor _res_conv_27_conv = *(LDKSpendableOutputDescriptor*)(_res_conv_27_ptr); FREE((void*)_res_conv_27); @@ -12127,26 +12140,26 @@ void __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS } uint32_t __attribute__((export_name("TS_COption_EventZ_some"))) TS_COption_EventZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKEvent o_conv = *(LDKEvent*)(o_ptr); - o_conv = Event_clone((LDKEvent*)(((uint64_t)o) & ~1)); + o_conv = Event_clone((LDKEvent*)(((uintptr_t)o) & ~1)); LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_EventZ_none"))) TS_COption_EventZ_none() { LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_EventZ_free"))) TS_COption_EventZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_EventZ _res_conv = *(LDKCOption_EventZ*)(_res_ptr); FREE((void*)_res); @@ -12156,12 +12169,12 @@ void __attribute__((export_name("TS_COption_EventZ_free"))) TS_COption_EventZ_f static inline uintptr_t COption_EventZ_clone_ptr(LDKCOption_EventZ *NONNULL_PTR arg) { LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint32_t arg) { LDKCOption_EventZ* arg_conv = (LDKCOption_EventZ*)arg; - int64_t ret_val = COption_EventZ_clone_ptr(arg_conv); + intptr_t ret_val = COption_EventZ_clone_ptr(arg_conv); return ret_val; } @@ -12169,18 +12182,18 @@ uint32_t __attribute__((export_name("TS_COption_EventZ_clone"))) TS_COption_Eve LDKCOption_EventZ* orig_conv = (LDKCOption_EventZ*)orig; LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ"); *ret_copy = COption_EventZ_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_ok"))) TS_CResult_COption_EventZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKCOption_EventZ o_conv = *(LDKCOption_EventZ*)(o_ptr); - o_conv = COption_EventZ_clone((LDKCOption_EventZ*)(((uint64_t)o) & ~1)); + o_conv = COption_EventZ_clone((LDKCOption_EventZ*)(((uintptr_t)o) & ~1)); LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err"))) TS_CResult_COption_EventZDecodeErrorZ_err(uint32_t e) { @@ -12191,7 +12204,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err" e_conv = DecodeError_clone(&e_conv); LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_is_ok"))) TS_CResult_COption_EventZDecodeErrorZ_is_ok(uint32_t o) { @@ -12202,7 +12215,7 @@ jboolean __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_is_o void __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_free"))) TS_CResult_COption_EventZDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_COption_EventZDecodeErrorZ _res_conv = *(LDKCResult_COption_EventZDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12212,11 +12225,11 @@ void __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_free"))) static inline uintptr_t CResult_COption_EventZDecodeErrorZ_clone_ptr(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_EventZDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_EventZDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_COption_EventZDecodeErrorZ* arg_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12224,7 +12237,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clon LDKCResult_COption_EventZDecodeErrorZ* orig_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(orig & ~1); LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = CResult_COption_EventZDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CResult_NodeIdDecodeErrorZ_ok(uint32_t o) { @@ -12235,7 +12248,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CR o_conv = NodeId_clone(&o_conv); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_CResult_NodeIdDecodeErrorZ_err(uint32_t e) { @@ -12246,7 +12259,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_C e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint32_t o) { @@ -12257,7 +12270,7 @@ jboolean __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS void __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CResult_NodeIdDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NodeIdDecodeErrorZ _res_conv = *(LDKCResult_NodeIdDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12267,11 +12280,11 @@ void __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CRes static inline uintptr_t CResult_NodeIdDecodeErrorZ_clone_ptr(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone_ptr"))) TS_CResult_NodeIdDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone_ptr"))) TS_CResult_NodeIdDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NodeIdDecodeErrorZ* arg_conv = (LDKCResult_NodeIdDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12279,17 +12292,17 @@ uint32_t __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone"))) TS LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)(orig & ~1); LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = CResult_NodeIdDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKCOption_NetworkUpdateZ o_conv = *(LDKCOption_NetworkUpdateZ*)(o_ptr); - o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uint64_t)o) & ~1)); + o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)o) & ~1)); LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err(uint32_t e) { @@ -12300,7 +12313,7 @@ uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErr e_conv = DecodeError_clone(&e_conv); LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint32_t o) { @@ -12311,7 +12324,7 @@ jboolean __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErr void __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_COption_NetworkUpdateZDecodeErrorZ _res_conv = *(LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12321,11 +12334,11 @@ void __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ static inline uintptr_t CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_COption_NetworkUpdateZDecodeErrorZ* arg_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12333,29 +12346,29 @@ uint32_t __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErr LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(orig & ~1); LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_AccessZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKAccess o_conv = *(LDKAccess*)(o_ptr); LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ"); *ret_copy = COption_AccessZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_AccessZ_none"))) TS_COption_AccessZ_none() { LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ"); *ret_copy = COption_AccessZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_AccessZ_free"))) TS_COption_AccessZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_AccessZ _res_conv = *(LDKCOption_AccessZ*)(_res_ptr); FREE((void*)_res); @@ -12370,7 +12383,7 @@ uint32_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErr o_conv = DirectionalChannelInfo_clone(&o_conv); LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ"); *ret_conv = CResult_DirectionalChannelInfoDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_err"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_err(uint32_t e) { @@ -12381,7 +12394,7 @@ uint32_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErr e_conv = DecodeError_clone(&e_conv); LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ"); *ret_conv = CResult_DirectionalChannelInfoDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_is_ok(uint32_t o) { @@ -12392,7 +12405,7 @@ jboolean __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErr void __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_free"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_DirectionalChannelInfoDecodeErrorZ _res_conv = *(LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12402,11 +12415,11 @@ void __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_ static inline uintptr_t CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_DirectionalChannelInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ"); *ret_conv = CResult_DirectionalChannelInfoDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_DirectionalChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12414,7 +12427,7 @@ uint32_t __attribute__((export_name("TS_CResult_DirectionalChannelInfoDecodeErr LDKCResult_DirectionalChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(orig & ~1); LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ"); *ret_conv = CResult_DirectionalChannelInfoDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_ok(uint32_t o) { @@ -12425,7 +12438,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) o_conv = ChannelInfo_clone(&o_conv); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) TS_CResult_ChannelInfoDecodeErrorZ_err(uint32_t e) { @@ -12436,7 +12449,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint32_t o) { @@ -12447,7 +12460,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok") void __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelInfoDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12457,11 +12470,11 @@ void __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS static inline uintptr_t CResult_ChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12469,7 +12482,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone") LDKCResult_ChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_ok(uint32_t o) { @@ -12480,7 +12493,7 @@ uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) o_conv = RoutingFees_clone(&o_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) TS_CResult_RoutingFeesDecodeErrorZ_err(uint32_t e) { @@ -12491,7 +12504,7 @@ uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) e_conv = DecodeError_clone(&e_conv); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint32_t o) { @@ -12502,7 +12515,7 @@ jboolean __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok") void __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RoutingFeesDecodeErrorZ _res_conv = *(LDKCResult_RoutingFeesDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12512,11 +12525,11 @@ void __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS static inline uintptr_t CResult_RoutingFeesDecodeErrorZ_clone_ptr(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr"))) TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr"))) TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RoutingFeesDecodeErrorZ* arg_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12524,7 +12537,7 @@ uint32_t __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone") LDKCResult_RoutingFeesDecodeErrorZ* orig_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(orig & ~1); LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddressZ_free(uint32_tArray _res) { @@ -12534,10 +12547,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t m = 0; m < _res_constr.datalen; m++) { uint32_t _res_conv_12 = _res_vals[m]; - void* _res_conv_12_ptr = (void*)(((uint64_t)_res_conv_12) & ~1); + void* _res_conv_12_ptr = (void*)(((uintptr_t)_res_conv_12) & ~1); CHECK_ACCESS(_res_conv_12_ptr); LDKNetAddress _res_conv_12_conv = *(LDKNetAddress*)(_res_conv_12_ptr); FREE((void*)_res_conv_12); @@ -12554,7 +12567,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError o_conv = NodeAnnouncementInfo_clone(&o_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err(uint32_t e) { @@ -12565,7 +12578,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint32_t o) { @@ -12576,7 +12589,7 @@ jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError void __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12586,11 +12599,11 @@ void __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_fr static inline uintptr_t CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NodeAnnouncementInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12598,7 +12611,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(orig & ~1); LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_tArray _res) { @@ -12608,7 +12621,7 @@ void __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_ _res_constr.data = MALLOC(_res_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements"); else _res_constr.data = NULL; - int64_t* _res_vals = _res->elems; + 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; @@ -12624,7 +12637,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_ o_conv = NodeInfo_clone(&o_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS_CResult_NodeInfoDecodeErrorZ_err(uint32_t e) { @@ -12635,7 +12648,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint32_t o) { @@ -12646,7 +12659,7 @@ jboolean __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NodeInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeInfoDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12656,11 +12669,11 @@ void __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CR static inline uintptr_t CResult_NodeInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeInfoDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeInfoDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NodeInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12668,7 +12681,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone"))) LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(orig & ~1); LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = CResult_NodeInfoDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint32_t o) { @@ -12679,7 +12692,7 @@ uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) o_conv = NetworkGraph_clone(&o_conv); LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err"))) TS_CResult_NetworkGraphDecodeErrorZ_err(uint32_t e) { @@ -12690,7 +12703,7 @@ uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err")) e_conv = DecodeError_clone(&e_conv); LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint32_t o) { @@ -12701,7 +12714,7 @@ jboolean __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok" void __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NetworkGraphDecodeErrorZ _res_conv = *(LDKCResult_NetworkGraphDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12711,11 +12724,11 @@ void __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) T static inline uintptr_t CResult_NetworkGraphDecodeErrorZ_clone_ptr(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_clone_ptr"))) TS_CResult_NetworkGraphDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_clone_ptr"))) TS_CResult_NetworkGraphDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NetworkGraphDecodeErrorZ* arg_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NetworkGraphDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NetworkGraphDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -12723,7 +12736,7 @@ uint32_t __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_clone" LDKCResult_NetworkGraphDecodeErrorZ* orig_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(orig & ~1); LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = CResult_NetworkGraphDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_COption_CVec_NetAddressZZ_some(uint32_tArray o) { @@ -12733,31 +12746,31 @@ 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; + uint32_t* o_vals = o->elems /* XXX o leaks */; for (size_t m = 0; m < o_constr.datalen; m++) { uint32_t o_conv_12 = o_vals[m]; - void* o_conv_12_ptr = (void*)(((uint64_t)o_conv_12) & ~1); + void* o_conv_12_ptr = (void*)(((uintptr_t)o_conv_12) & ~1); CHECK_ACCESS(o_conv_12_ptr); LDKNetAddress o_conv_12_conv = *(LDKNetAddress*)(o_conv_12_ptr); - o_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uint64_t)o_conv_12) & ~1)); + o_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o_conv_12) & ~1)); o_constr.data[m] = o_conv_12_conv; } LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_some(o_constr); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_none"))) TS_COption_CVec_NetAddressZZ_none() { LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_CVec_NetAddressZZ_free"))) TS_COption_CVec_NetAddressZZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_CVec_NetAddressZZ _res_conv = *(LDKCOption_CVec_NetAddressZZ*)(_res_ptr); FREE((void*)_res); @@ -12767,12 +12780,12 @@ void __attribute__((export_name("TS_COption_CVec_NetAddressZZ_free"))) TS_COpti static inline uintptr_t COption_CVec_NetAddressZZ_clone_ptr(LDKCOption_CVec_NetAddressZZ *NONNULL_PTR arg) { LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone_ptr"))) TS_COption_CVec_NetAddressZZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone_ptr"))) TS_COption_CVec_NetAddressZZ_clone_ptr(uint32_t arg) { LDKCOption_CVec_NetAddressZZ* arg_conv = (LDKCOption_CVec_NetAddressZZ*)arg; - int64_t ret_val = COption_CVec_NetAddressZZ_clone_ptr(arg_conv); + intptr_t ret_val = COption_CVec_NetAddressZZ_clone_ptr(arg_conv); return ret_val; } @@ -12780,7 +12793,7 @@ uint32_t __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone"))) TS_ LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)orig; LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = COption_CVec_NetAddressZZ_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -12792,7 +12805,7 @@ uint32_t __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_o // Warning: we need a move here but no clone is available for LDKScoringParameters LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ"); *ret_conv = CResult_ScoringParametersDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_err"))) TS_CResult_ScoringParametersDecodeErrorZ_err(uint32_t e) { @@ -12803,7 +12816,7 @@ uint32_t __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_e e_conv = DecodeError_clone(&e_conv); LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ"); *ret_conv = CResult_ScoringParametersDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_is_ok"))) TS_CResult_ScoringParametersDecodeErrorZ_is_ok(uint32_t o) { @@ -12814,7 +12827,7 @@ jboolean __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_i void __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_free"))) TS_CResult_ScoringParametersDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ScoringParametersDecodeErrorZ _res_conv = *(LDKCResult_ScoringParametersDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12829,7 +12842,7 @@ uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_ok"))) o_conv = InitFeatures_clone(&o_conv); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint32_t e) { @@ -12840,7 +12853,7 @@ uint32_t __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err")) e_conv = DecodeError_clone(&e_conv); LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = CResult_InitFeaturesDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_is_ok(uint32_t o) { @@ -12851,7 +12864,7 @@ jboolean __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_is_ok" void __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_free"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_InitFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InitFeaturesDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12866,7 +12879,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_ok" o_conv = ChannelFeatures_clone(&o_conv); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_err(uint32_t e) { @@ -12877,7 +12890,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelFeaturesDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok(uint32_t o) { @@ -12888,7 +12901,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_is_ void __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelFeaturesDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelFeaturesDecodeErrorZ _res_conv = *(LDKCResult_ChannelFeaturesDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12903,7 +12916,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_ok"))) o_conv = NodeFeatures_clone(&o_conv); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint32_t e) { @@ -12914,7 +12927,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err")) e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = CResult_NodeFeaturesDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_is_ok(uint32_t o) { @@ -12925,7 +12938,7 @@ jboolean __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_is_ok" void __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_free"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NodeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_NodeFeaturesDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12940,7 +12953,7 @@ uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_ok" o_conv = InvoiceFeatures_clone(&o_conv); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint32_t e) { @@ -12951,7 +12964,7 @@ uint32_t __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err e_conv = DecodeError_clone(&e_conv); LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok(uint32_t o) { @@ -12962,7 +12975,7 @@ jboolean __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ void __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_free"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_InvoiceFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InvoiceFeaturesDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -12977,7 +12990,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ o_conv = ChannelTypeFeatures_clone(&o_conv); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err(uint32_t e) { @@ -12988,7 +13001,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(uint32_t o) { @@ -12999,7 +13012,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ void __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelTypeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13007,13 +13020,13 @@ void __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_fre } uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_ok"))) TS_CResult_NetAddressDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKNetAddress o_conv = *(LDKNetAddress*)(o_ptr); - o_conv = NetAddress_clone((LDKNetAddress*)(((uint64_t)o) & ~1)); + o_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o) & ~1)); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err"))) TS_CResult_NetAddressDecodeErrorZ_err(uint32_t e) { @@ -13024,7 +13037,7 @@ uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err"))) e_conv = DecodeError_clone(&e_conv); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_is_ok"))) TS_CResult_NetAddressDecodeErrorZ_is_ok(uint32_t o) { @@ -13035,7 +13048,7 @@ jboolean __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_is_ok")) void __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_CResult_NetAddressDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NetAddressDecodeErrorZ _res_conv = *(LDKCResult_NetAddressDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13045,11 +13058,11 @@ void __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_ static inline uintptr_t CResult_NetAddressDecodeErrorZ_clone_ptr(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone_ptr"))) TS_CResult_NetAddressDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone_ptr"))) TS_CResult_NetAddressDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NetAddressDecodeErrorZ* arg_conv = (LDKCResult_NetAddressDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13057,7 +13070,7 @@ uint32_t __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone")) LDKCResult_NetAddressDecodeErrorZ* orig_conv = (LDKCResult_NetAddressDecodeErrorZ*)(orig & ~1); LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = CResult_NetAddressDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_UpdateAddHTLCZ_free(uint32_tArray _res) { @@ -13067,7 +13080,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t p = 0; p < _res_constr.datalen; p++) { uint32_t _res_conv_15 = _res_vals[p]; LDKUpdateAddHTLC _res_conv_15_conv; @@ -13086,7 +13099,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t t = 0; t < _res_constr.datalen; t++) { uint32_t _res_conv_19 = _res_vals[t]; LDKUpdateFulfillHTLC _res_conv_19_conv; @@ -13105,7 +13118,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t q = 0; q < _res_constr.datalen; q++) { uint32_t _res_conv_16 = _res_vals[q]; LDKUpdateFailHTLC _res_conv_16_conv; @@ -13124,7 +13137,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t z = 0; z < _res_constr.datalen; z++) { uint32_t _res_conv_25 = _res_vals[z]; LDKUpdateFailMalformedHTLC _res_conv_25_conv; @@ -13144,7 +13157,7 @@ uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_ok")) o_conv = AcceptChannel_clone(&o_conv); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err"))) TS_CResult_AcceptChannelDecodeErrorZ_err(uint32_t e) { @@ -13155,7 +13168,7 @@ uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_is_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_is_ok(uint32_t o) { @@ -13166,7 +13179,7 @@ jboolean __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free"))) TS_CResult_AcceptChannelDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_AcceptChannelDecodeErrorZ _res_conv = *(LDKCResult_AcceptChannelDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13176,11 +13189,11 @@ void __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free"))) static inline uintptr_t CResult_AcceptChannelDecodeErrorZ_clone_ptr(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr"))) TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr"))) TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_AcceptChannelDecodeErrorZ* arg_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13188,7 +13201,7 @@ uint32_t __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone LDKCResult_AcceptChannelDecodeErrorZ* orig_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(orig & ~1); LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = CResult_AcceptChannelDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok(uint32_t o) { @@ -13199,7 +13212,7 @@ uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErr o_conv = AnnouncementSignatures_clone(&o_conv); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_err(uint32_t e) { @@ -13210,7 +13223,7 @@ uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErr e_conv = DecodeError_clone(&e_conv); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(uint32_t o) { @@ -13221,7 +13234,7 @@ jboolean __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErr void __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_free"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_AnnouncementSignaturesDecodeErrorZ _res_conv = *(LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13231,11 +13244,11 @@ void __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_ static inline uintptr_t CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_AnnouncementSignaturesDecodeErrorZ* arg_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13243,7 +13256,7 @@ uint32_t __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErr LDKCResult_AnnouncementSignaturesDecodeErrorZ* orig_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(orig & ~1); LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_ok(uint32_t o) { @@ -13254,7 +13267,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ o_conv = ChannelReestablish_clone(&o_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_err(uint32_t e) { @@ -13265,7 +13278,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_is_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_is_ok(uint32_t o) { @@ -13276,7 +13289,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ void __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelReestablishDecodeErrorZ _res_conv = *(LDKCResult_ChannelReestablishDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13286,11 +13299,11 @@ void __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free static inline uintptr_t CResult_ChannelReestablishDecodeErrorZ_clone_ptr(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelReestablishDecodeErrorZ* arg_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13298,7 +13311,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ LDKCResult_ChannelReestablishDecodeErrorZ* orig_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_ok(uint32_t o) { @@ -13309,7 +13322,7 @@ uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok")) o_conv = ClosingSigned_clone(&o_conv); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err"))) TS_CResult_ClosingSignedDecodeErrorZ_err(uint32_t e) { @@ -13320,7 +13333,7 @@ uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_is_ok(uint32_t o) { @@ -13331,7 +13344,7 @@ jboolean __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free"))) TS_CResult_ClosingSignedDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ClosingSignedDecodeErrorZ _res_conv = *(LDKCResult_ClosingSignedDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13341,11 +13354,11 @@ void __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free"))) static inline uintptr_t CResult_ClosingSignedDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ClosingSignedDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13353,7 +13366,7 @@ uint32_t __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone LDKCResult_ClosingSignedDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(orig & ~1); LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = CResult_ClosingSignedDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(uint32_t o) { @@ -13364,7 +13377,7 @@ uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErro o_conv = ClosingSignedFeeRange_clone(&o_conv); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err(uint32_t e) { @@ -13375,7 +13388,7 @@ uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErro e_conv = DecodeError_clone(&e_conv); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(uint32_t o) { @@ -13386,7 +13399,7 @@ jboolean __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErro void __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ _res_conv = *(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13396,11 +13409,11 @@ void __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_f static inline uintptr_t CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13408,7 +13421,7 @@ uint32_t __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErro LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(orig & ~1); LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_ok(uint32_t o) { @@ -13419,7 +13432,7 @@ uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok o_conv = CommitmentSigned_clone(&o_conv); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_err(uint32_t e) { @@ -13430,7 +13443,7 @@ uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_er e_conv = DecodeError_clone(&e_conv); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_is_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_is_ok(uint32_t o) { @@ -13441,7 +13454,7 @@ jboolean __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_is void __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free"))) TS_CResult_CommitmentSignedDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_CommitmentSignedDecodeErrorZ _res_conv = *(LDKCResult_CommitmentSignedDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13451,11 +13464,11 @@ void __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free") static inline uintptr_t CResult_CommitmentSignedDecodeErrorZ_clone_ptr(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_CommitmentSignedDecodeErrorZ* arg_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13463,7 +13476,7 @@ uint32_t __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_cl LDKCResult_CommitmentSignedDecodeErrorZ* orig_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(orig & ~1); LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_ok(uint32_t o) { @@ -13474,7 +13487,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok") o_conv = FundingCreated_clone(&o_conv); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err"))) TS_CResult_FundingCreatedDecodeErrorZ_err(uint32_t e) { @@ -13485,7 +13498,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err" e_conv = DecodeError_clone(&e_conv); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_is_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_is_ok(uint32_t o) { @@ -13496,7 +13509,7 @@ jboolean __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_is_o void __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free"))) TS_CResult_FundingCreatedDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_FundingCreatedDecodeErrorZ _res_conv = *(LDKCResult_FundingCreatedDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13506,11 +13519,11 @@ void __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free"))) static inline uintptr_t CResult_FundingCreatedDecodeErrorZ_clone_ptr(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_FundingCreatedDecodeErrorZ* arg_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13518,7 +13531,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clon LDKCResult_FundingCreatedDecodeErrorZ* orig_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(orig & ~1); LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = CResult_FundingCreatedDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok"))) TS_CResult_FundingSignedDecodeErrorZ_ok(uint32_t o) { @@ -13529,7 +13542,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok")) o_conv = FundingSigned_clone(&o_conv); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err"))) TS_CResult_FundingSignedDecodeErrorZ_err(uint32_t e) { @@ -13540,7 +13553,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_is_ok"))) TS_CResult_FundingSignedDecodeErrorZ_is_ok(uint32_t o) { @@ -13551,7 +13564,7 @@ jboolean __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free"))) TS_CResult_FundingSignedDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_FundingSignedDecodeErrorZ _res_conv = *(LDKCResult_FundingSignedDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13561,11 +13574,11 @@ void __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free"))) static inline uintptr_t CResult_FundingSignedDecodeErrorZ_clone_ptr(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingSignedDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingSignedDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_FundingSignedDecodeErrorZ* arg_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13573,7 +13586,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone LDKCResult_FundingSignedDecodeErrorZ* orig_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(orig & ~1); LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = CResult_FundingSignedDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_ok"))) TS_CResult_FundingLockedDecodeErrorZ_ok(uint32_t o) { @@ -13584,7 +13597,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_ok")) o_conv = FundingLocked_clone(&o_conv); LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ"); *ret_conv = CResult_FundingLockedDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_err"))) TS_CResult_FundingLockedDecodeErrorZ_err(uint32_t e) { @@ -13595,7 +13608,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ"); *ret_conv = CResult_FundingLockedDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_is_ok"))) TS_CResult_FundingLockedDecodeErrorZ_is_ok(uint32_t o) { @@ -13606,7 +13619,7 @@ jboolean __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_free"))) TS_CResult_FundingLockedDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_FundingLockedDecodeErrorZ _res_conv = *(LDKCResult_FundingLockedDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13616,11 +13629,11 @@ void __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_free"))) static inline uintptr_t CResult_FundingLockedDecodeErrorZ_clone_ptr(LDKCResult_FundingLockedDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ"); *ret_conv = CResult_FundingLockedDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingLockedDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingLockedDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_FundingLockedDecodeErrorZ* arg_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_FundingLockedDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_FundingLockedDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13628,7 +13641,7 @@ uint32_t __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_clone LDKCResult_FundingLockedDecodeErrorZ* orig_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(orig & ~1); LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ"); *ret_conv = CResult_FundingLockedDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CResult_InitDecodeErrorZ_ok(uint32_t o) { @@ -13639,7 +13652,7 @@ uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CRes o_conv = Init_clone(&o_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CResult_InitDecodeErrorZ_err(uint32_t e) { @@ -13650,7 +13663,7 @@ uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CRe e_conv = DecodeError_clone(&e_conv); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_InitDecodeErrorZ_is_ok"))) TS_CResult_InitDecodeErrorZ_is_ok(uint32_t o) { @@ -13661,7 +13674,7 @@ jboolean __attribute__((export_name("TS_CResult_InitDecodeErrorZ_is_ok"))) TS_C void __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResult_InitDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_InitDecodeErrorZ _res_conv = *(LDKCResult_InitDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13671,11 +13684,11 @@ void __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResul static inline uintptr_t CResult_InitDecodeErrorZ_clone_ptr(LDKCResult_InitDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone_ptr"))) TS_CResult_InitDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone_ptr"))) TS_CResult_InitDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_InitDecodeErrorZ* arg_conv = (LDKCResult_InitDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_InitDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_InitDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13683,7 +13696,7 @@ uint32_t __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone"))) TS_C LDKCResult_InitDecodeErrorZ* orig_conv = (LDKCResult_InitDecodeErrorZ*)(orig & ~1); LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = CResult_InitDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok"))) TS_CResult_OpenChannelDecodeErrorZ_ok(uint32_t o) { @@ -13694,7 +13707,7 @@ uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok"))) o_conv = OpenChannel_clone(&o_conv); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err"))) TS_CResult_OpenChannelDecodeErrorZ_err(uint32_t e) { @@ -13705,7 +13718,7 @@ uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err"))) e_conv = DecodeError_clone(&e_conv); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_is_ok"))) TS_CResult_OpenChannelDecodeErrorZ_is_ok(uint32_t o) { @@ -13716,7 +13729,7 @@ jboolean __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_is_ok") void __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS_CResult_OpenChannelDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_OpenChannelDecodeErrorZ _res_conv = *(LDKCResult_OpenChannelDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13726,11 +13739,11 @@ void __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS static inline uintptr_t CResult_OpenChannelDecodeErrorZ_clone_ptr(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone_ptr"))) TS_CResult_OpenChannelDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone_ptr"))) TS_CResult_OpenChannelDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_OpenChannelDecodeErrorZ* arg_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13738,7 +13751,7 @@ uint32_t __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone") LDKCResult_OpenChannelDecodeErrorZ* orig_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(orig & ~1); LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = CResult_OpenChannelDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_ok(uint32_t o) { @@ -13749,7 +13762,7 @@ uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok"))) o_conv = RevokeAndACK_clone(&o_conv); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_err(uint32_t e) { @@ -13760,7 +13773,7 @@ uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err")) e_conv = DecodeError_clone(&e_conv); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_is_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_is_ok(uint32_t o) { @@ -13771,7 +13784,7 @@ jboolean __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_is_ok" void __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) TS_CResult_RevokeAndACKDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RevokeAndACKDecodeErrorZ _res_conv = *(LDKCResult_RevokeAndACKDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13781,11 +13794,11 @@ void __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) T static inline uintptr_t CResult_RevokeAndACKDecodeErrorZ_clone_ptr(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_RevokeAndACKDecodeErrorZ* arg_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13793,7 +13806,7 @@ uint32_t __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone" LDKCResult_RevokeAndACKDecodeErrorZ* orig_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(orig & ~1); LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_CResult_ShutdownDecodeErrorZ_ok(uint32_t o) { @@ -13804,7 +13817,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_ o_conv = Shutdown_clone(&o_conv); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS_CResult_ShutdownDecodeErrorZ_err(uint32_t e) { @@ -13815,7 +13828,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS e_conv = DecodeError_clone(&e_conv); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_is_ok"))) TS_CResult_ShutdownDecodeErrorZ_is_ok(uint32_t o) { @@ -13826,7 +13839,7 @@ jboolean __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CResult_ShutdownDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ShutdownDecodeErrorZ _res_conv = *(LDKCResult_ShutdownDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13836,11 +13849,11 @@ void __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CR static inline uintptr_t CResult_ShutdownDecodeErrorZ_clone_ptr(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ShutdownDecodeErrorZ* arg_conv = (LDKCResult_ShutdownDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13848,7 +13861,7 @@ uint32_t __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone"))) LDKCResult_ShutdownDecodeErrorZ* orig_conv = (LDKCResult_ShutdownDecodeErrorZ*)(orig & ~1); LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = CResult_ShutdownDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_ok(uint32_t o) { @@ -13859,7 +13872,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok") o_conv = UpdateFailHTLC_clone(&o_conv); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_err(uint32_t e) { @@ -13870,7 +13883,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err" e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok(uint32_t o) { @@ -13881,7 +13894,7 @@ jboolean __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_is_o void __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFailHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFailHTLCDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13891,11 +13904,11 @@ void __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free"))) static inline uintptr_t CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UpdateFailHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13903,7 +13916,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clon LDKCResult_UpdateFailHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(orig & ~1); LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(uint32_t o) { @@ -13914,7 +13927,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeEr o_conv = UpdateFailMalformedHTLC_clone(&o_conv); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(uint32_t e) { @@ -13925,7 +13938,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeEr e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(uint32_t o) { @@ -13936,7 +13949,7 @@ jboolean __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeEr void __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -13946,11 +13959,11 @@ void __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ static inline uintptr_t CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -13958,7 +13971,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeEr LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(orig & ~1); LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_ok(uint32_t o) { @@ -13969,7 +13982,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS o_conv = UpdateFee_clone(&o_conv); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) TS_CResult_UpdateFeeDecodeErrorZ_err(uint32_t e) { @@ -13980,7 +13993,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) T e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_is_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_is_ok(uint32_t o) { @@ -13991,7 +14004,7 @@ jboolean __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_is_ok"))) void __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_CResult_UpdateFeeDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFeeDecodeErrorZ _res_conv = *(LDKCResult_UpdateFeeDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14001,11 +14014,11 @@ void __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_C static inline uintptr_t CResult_UpdateFeeDecodeErrorZ_clone_ptr(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UpdateFeeDecodeErrorZ* arg_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14013,7 +14026,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone"))) LDKCResult_UpdateFeeDecodeErrorZ* orig_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(orig & ~1); LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = CResult_UpdateFeeDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok(uint32_t o) { @@ -14024,7 +14037,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_o o_conv = UpdateFulfillHTLC_clone(&o_conv); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err(uint32_t e) { @@ -14035,7 +14048,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_e e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(uint32_t o) { @@ -14046,7 +14059,7 @@ jboolean __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_i void __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateFulfillHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14056,11 +14069,11 @@ void __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free" static inline uintptr_t CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UpdateFulfillHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14068,7 +14081,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_c LDKCResult_UpdateFulfillHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(orig & ~1); LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_ok(uint32_t o) { @@ -14079,7 +14092,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok")) o_conv = UpdateAddHTLC_clone(&o_conv); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_err(uint32_t e) { @@ -14090,7 +14103,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok(uint32_t o) { @@ -14101,7 +14114,7 @@ jboolean __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UpdateAddHTLCDecodeErrorZ _res_conv = *(LDKCResult_UpdateAddHTLCDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14111,11 +14124,11 @@ void __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free"))) static inline uintptr_t CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UpdateAddHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14123,7 +14136,7 @@ uint32_t __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone LDKCResult_UpdateAddHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(orig & ~1); LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CResult_PingDecodeErrorZ_ok(uint32_t o) { @@ -14134,7 +14147,7 @@ uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CRes o_conv = Ping_clone(&o_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CResult_PingDecodeErrorZ_err(uint32_t e) { @@ -14145,7 +14158,7 @@ uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CRe e_conv = DecodeError_clone(&e_conv); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PingDecodeErrorZ_is_ok"))) TS_CResult_PingDecodeErrorZ_is_ok(uint32_t o) { @@ -14156,7 +14169,7 @@ jboolean __attribute__((export_name("TS_CResult_PingDecodeErrorZ_is_ok"))) TS_C void __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResult_PingDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PingDecodeErrorZ _res_conv = *(LDKCResult_PingDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14166,11 +14179,11 @@ void __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResul static inline uintptr_t CResult_PingDecodeErrorZ_clone_ptr(LDKCResult_PingDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone_ptr"))) TS_CResult_PingDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone_ptr"))) TS_CResult_PingDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_PingDecodeErrorZ* arg_conv = (LDKCResult_PingDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_PingDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PingDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14178,7 +14191,7 @@ uint32_t __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone"))) TS_C LDKCResult_PingDecodeErrorZ* orig_conv = (LDKCResult_PingDecodeErrorZ*)(orig & ~1); LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = CResult_PingDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CResult_PongDecodeErrorZ_ok(uint32_t o) { @@ -14189,7 +14202,7 @@ uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CRes o_conv = Pong_clone(&o_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CResult_PongDecodeErrorZ_err(uint32_t e) { @@ -14200,7 +14213,7 @@ uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CRe e_conv = DecodeError_clone(&e_conv); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PongDecodeErrorZ_is_ok"))) TS_CResult_PongDecodeErrorZ_is_ok(uint32_t o) { @@ -14211,7 +14224,7 @@ jboolean __attribute__((export_name("TS_CResult_PongDecodeErrorZ_is_ok"))) TS_C void __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResult_PongDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PongDecodeErrorZ _res_conv = *(LDKCResult_PongDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14221,11 +14234,11 @@ void __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResul static inline uintptr_t CResult_PongDecodeErrorZ_clone_ptr(LDKCResult_PongDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone_ptr"))) TS_CResult_PongDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone_ptr"))) TS_CResult_PongDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_PongDecodeErrorZ* arg_conv = (LDKCResult_PongDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_PongDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PongDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14233,7 +14246,7 @@ uint32_t __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone"))) TS_C LDKCResult_PongDecodeErrorZ* orig_conv = (LDKCResult_PongDecodeErrorZ*)(orig & ~1); LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = CResult_PongDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(uint32_t o) { @@ -14244,7 +14257,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDeco o_conv = UnsignedChannelAnnouncement_clone(&o_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(uint32_t e) { @@ -14255,7 +14268,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDeco e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) { @@ -14266,7 +14279,7 @@ jboolean __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDeco void __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14276,11 +14289,11 @@ void __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeEr static inline uintptr_t CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14288,7 +14301,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDeco LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(orig & ~1); LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_ok(uint32_t o) { @@ -14299,7 +14312,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ o_conv = ChannelAnnouncement_clone(&o_conv); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_err(uint32_t e) { @@ -14310,7 +14323,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) { @@ -14321,7 +14334,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ void __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_ChannelAnnouncementDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14331,11 +14344,11 @@ void __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_fre static inline uintptr_t CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14343,7 +14356,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ LDKCResult_ChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok(uint32_t o) { @@ -14354,7 +14367,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErro o_conv = UnsignedChannelUpdate_clone(&o_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err(uint32_t e) { @@ -14365,7 +14378,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErro e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(uint32_t o) { @@ -14376,7 +14389,7 @@ jboolean __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErro void __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14386,11 +14399,11 @@ void __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_f static inline uintptr_t CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UnsignedChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14398,7 +14411,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErro LDKCResult_UnsignedChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(orig & ~1); LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_ok(uint32_t o) { @@ -14409,7 +14422,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok")) o_conv = ChannelUpdate_clone(&o_conv); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_err(uint32_t e) { @@ -14420,7 +14433,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err") e_conv = DecodeError_clone(&e_conv); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_is_ok(uint32_t o) { @@ -14431,7 +14444,7 @@ jboolean __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_is_ok void __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free"))) TS_CResult_ChannelUpdateDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ChannelUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelUpdateDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14441,11 +14454,11 @@ void __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free"))) static inline uintptr_t CResult_ChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14453,7 +14466,7 @@ uint32_t __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone LDKCResult_ChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(orig & ~1); LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_ok(uint32_t o) { @@ -14464,7 +14477,7 @@ uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok"))) o_conv = ErrorMessage_clone(&o_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err"))) TS_CResult_ErrorMessageDecodeErrorZ_err(uint32_t e) { @@ -14475,7 +14488,7 @@ uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err")) e_conv = DecodeError_clone(&e_conv); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_is_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_is_ok(uint32_t o) { @@ -14486,7 +14499,7 @@ jboolean __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_is_ok" void __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ErrorMessageDecodeErrorZ _res_conv = *(LDKCResult_ErrorMessageDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14496,11 +14509,11 @@ void __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) T static inline uintptr_t CResult_ErrorMessageDecodeErrorZ_clone_ptr(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr"))) TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr"))) TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ErrorMessageDecodeErrorZ* arg_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14508,7 +14521,7 @@ uint32_t __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone" LDKCResult_ErrorMessageDecodeErrorZ* orig_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(orig & ~1); LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = CResult_ErrorMessageDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(uint32_t o) { @@ -14519,7 +14532,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeE o_conv = UnsignedNodeAnnouncement_clone(&o_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(uint32_t e) { @@ -14530,7 +14543,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeE e_conv = DecodeError_clone(&e_conv); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) { @@ -14541,7 +14554,7 @@ jboolean __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeE void __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14551,11 +14564,11 @@ void __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeError static inline uintptr_t CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14563,7 +14576,7 @@ uint32_t __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeE LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(orig & ~1); LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_ok(uint32_t o) { @@ -14574,7 +14587,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok o_conv = NodeAnnouncement_clone(&o_conv); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_err(uint32_t e) { @@ -14585,7 +14598,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_er e_conv = DecodeError_clone(&e_conv); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) { @@ -14596,7 +14609,7 @@ jboolean __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_is void __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NodeAnnouncementDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14606,11 +14619,11 @@ void __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free") static inline uintptr_t CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14618,7 +14631,7 @@ uint32_t __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_cl LDKCResult_NodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(orig & ~1); LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok(uint32_t o) { @@ -14629,7 +14642,7 @@ uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeError o_conv = QueryShortChannelIds_clone(&o_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_err(uint32_t e) { @@ -14640,7 +14653,7 @@ uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeError e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(uint32_t o) { @@ -14651,7 +14664,7 @@ jboolean __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeError void __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_free"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_QueryShortChannelIdsDecodeErrorZ _res_conv = *(LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14661,11 +14674,11 @@ void __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_fr static inline uintptr_t CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_QueryShortChannelIdsDecodeErrorZ* arg_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14673,7 +14686,7 @@ uint32_t __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeError LDKCResult_QueryShortChannelIdsDecodeErrorZ* orig_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(orig & ~1); LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(uint32_t o) { @@ -14684,7 +14697,7 @@ uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeEr o_conv = ReplyShortChannelIdsEnd_clone(&o_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(uint32_t e) { @@ -14695,7 +14708,7 @@ uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeEr e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(uint32_t o) { @@ -14706,7 +14719,7 @@ jboolean __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeEr void __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ _res_conv = *(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14716,11 +14729,11 @@ void __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ static inline uintptr_t CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* arg_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14728,7 +14741,7 @@ uint32_t __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeEr LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* orig_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(orig & ~1); LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_ok(uint32_t o) { @@ -14739,7 +14752,7 @@ uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_o o_conv = QueryChannelRange_clone(&o_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_err(uint32_t e) { @@ -14750,7 +14763,7 @@ uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_e e_conv = DecodeError_clone(&e_conv); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok(uint32_t o) { @@ -14761,7 +14774,7 @@ jboolean __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_i void __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_QueryChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_QueryChannelRangeDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14771,11 +14784,11 @@ void __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free" static inline uintptr_t CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_QueryChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14783,7 +14796,7 @@ uint32_t __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_c LDKCResult_QueryChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(orig & ~1); LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_ok(uint32_t o) { @@ -14794,7 +14807,7 @@ uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_o o_conv = ReplyChannelRange_clone(&o_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_err(uint32_t e) { @@ -14805,7 +14818,7 @@ uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_e e_conv = DecodeError_clone(&e_conv); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok(uint32_t o) { @@ -14816,7 +14829,7 @@ jboolean __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_i void __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_ReplyChannelRangeDecodeErrorZ _res_conv = *(LDKCResult_ReplyChannelRangeDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14826,11 +14839,11 @@ void __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free" static inline uintptr_t CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_ReplyChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14838,7 +14851,7 @@ uint32_t __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_c LDKCResult_ReplyChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(orig & ~1); LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_ok(uint32_t o) { @@ -14849,7 +14862,7 @@ uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErro o_conv = GossipTimestampFilter_clone(&o_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_err(uint32_t e) { @@ -14860,7 +14873,7 @@ uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErro e_conv = DecodeError_clone(&e_conv); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok(uint32_t o) { @@ -14871,7 +14884,7 @@ jboolean __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErro void __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_free"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_GossipTimestampFilterDecodeErrorZ _res_conv = *(LDKCResult_GossipTimestampFilterDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14881,11 +14894,11 @@ void __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_f static inline uintptr_t CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_GossipTimestampFilterDecodeErrorZ* arg_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14893,7 +14906,7 @@ uint32_t __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErro LDKCResult_GossipTimestampFilterDecodeErrorZ* orig_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(orig & ~1); LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) { @@ -14904,7 +14917,7 @@ uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorD o_conv = DelayedPaymentOutputDescriptor_clone(&o_conv); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) { @@ -14915,7 +14928,7 @@ uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorD e_conv = DecodeError_clone(&e_conv); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { @@ -14926,7 +14939,7 @@ jboolean __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorD void __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14936,11 +14949,11 @@ void __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecod static inline uintptr_t CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -14948,7 +14961,7 @@ uint32_t __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorD LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1); LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) { @@ -14959,7 +14972,7 @@ uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDe o_conv = StaticPaymentOutputDescriptor_clone(&o_conv); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) { @@ -14970,7 +14983,7 @@ uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDe e_conv = DecodeError_clone(&e_conv); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { @@ -14981,7 +14994,7 @@ jboolean __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDe void __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -14991,11 +15004,11 @@ void __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecode static inline uintptr_t CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -15003,17 +15016,17 @@ uint32_t __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDe LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1); LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKSpendableOutputDescriptor o_conv = *(LDKSpendableOutputDescriptor*)(o_ptr); - o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uint64_t)o) & ~1)); + o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)o) & ~1)); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err(uint32_t e) { @@ -15024,7 +15037,7 @@ uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecode e_conv = DecodeError_clone(&e_conv); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) { @@ -15035,7 +15048,7 @@ jboolean __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecode void __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -15045,11 +15058,11 @@ void __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErro static inline uintptr_t CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_SpendableOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -15057,17 +15070,17 @@ uint32_t __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecode LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(orig & ~1); LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } static inline uintptr_t C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR arg) { LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(uint32_t arg) { LDKC2Tuple_SignatureCVec_SignatureZZ* arg_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(arg & ~1); - int64_t ret_val = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv); return ret_val; } @@ -15075,35 +15088,35 @@ uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(orig & ~1); LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new"))) TS_C2Tuple_SignatureCVec_SignatureZZ_new(int8_tArray a, ptrArray b) { LDKSignature a_ref; CHECK(a->arr_len == 64); - memcpy(a_ref.compact_form, a->elems, 64); + memcpy(a_ref.compact_form, a->elems, 64); FREE(a); LDKCVec_SignatureZ b_constr; b_constr.datalen = b->arr_len; if (b_constr.datalen > 0) b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements"); else b_constr.data = NULL; - int8_tArray* b_vals = (void*) b->elems; + int8_tArray* b_vals = (void*) b->elems /* XXX b leaks */; for (size_t m = 0; m < b_constr.datalen; m++) { int8_tArray b_conv_12 = b_vals[m]; LDKSignature b_conv_12_ref; CHECK(b_conv_12->arr_len == 64); - memcpy(b_conv_12_ref.compact_form, b_conv_12->elems, 64); + memcpy(b_conv_12_ref.compact_form, b_conv_12->elems, 64); FREE(b_conv_12); b_constr.data[m] = b_conv_12_ref; } LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ"); *ret_conv = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_constr); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_free"))) TS_C2Tuple_SignatureCVec_SignatureZZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_SignatureCVec_SignatureZZ _res_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(_res_ptr); FREE((void*)_res); @@ -15111,19 +15124,19 @@ void __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_free"))) } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKC2Tuple_SignatureCVec_SignatureZZ o_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(o_ptr); - o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uint64_t)o) & ~1)); + o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uintptr_t)o) & ~1)); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err() { LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint32_t o) { @@ -15134,7 +15147,7 @@ jboolean __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_Signature void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(_res_ptr); FREE((void*)_res); @@ -15144,11 +15157,11 @@ void __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNo static inline uintptr_t CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR arg) { LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(uint32_t arg) { LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(arg & ~1); - int64_t ret_val = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -15156,22 +15169,22 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_Signature LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(orig & ~1); LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ"); *ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_ok"))) TS_CResult_SignatureNoneZ_ok(int8_tArray o) { LDKSignature o_ref; CHECK(o->arr_len == 64); - memcpy(o_ref.compact_form, o->elems, 64); + memcpy(o_ref.compact_form, o->elems, 64); FREE(o); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_err"))) TS_CResult_SignatureNoneZ_err() { LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CResult_SignatureNoneZ_is_ok(uint32_t o) { @@ -15182,7 +15195,7 @@ jboolean __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CRe void __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_SignatureNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_SignatureNoneZ _res_conv = *(LDKCResult_SignatureNoneZ*)(_res_ptr); FREE((void*)_res); @@ -15192,11 +15205,11 @@ void __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_ static inline uintptr_t CResult_SignatureNoneZ_clone_ptr(LDKCResult_SignatureNoneZ *NONNULL_PTR arg) { LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone_ptr"))) TS_CResult_SignatureNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone_ptr"))) TS_CResult_SignatureNoneZ_clone_ptr(uint32_t arg) { LDKCResult_SignatureNoneZ* arg_conv = (LDKCResult_SignatureNoneZ*)(arg & ~1); - int64_t ret_val = CResult_SignatureNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_SignatureNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -15204,16 +15217,16 @@ uint32_t __attribute__((export_name("TS_CResult_SignatureNoneZ_clone"))) TS_CRe LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)(orig & ~1); LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ"); *ret_conv = CResult_SignatureNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CResult_SignDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKSign o_conv = *(LDKSign*)(o_ptr); LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CResult_SignDecodeErrorZ_err(uint32_t e) { @@ -15224,7 +15237,7 @@ uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CRe e_conv = DecodeError_clone(&e_conv); LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) TS_CResult_SignDecodeErrorZ_is_ok(uint32_t o) { @@ -15235,7 +15248,7 @@ jboolean __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) TS_C void __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResult_SignDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_SignDecodeErrorZ _res_conv = *(LDKCResult_SignDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -15245,11 +15258,11 @@ void __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResul static inline uintptr_t CResult_SignDecodeErrorZ_clone_ptr(LDKCResult_SignDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone_ptr"))) TS_CResult_SignDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone_ptr"))) TS_CResult_SignDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_SignDecodeErrorZ* arg_conv = (LDKCResult_SignDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_SignDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_SignDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -15257,22 +15270,22 @@ uint32_t __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone"))) TS_C LDKCResult_SignDecodeErrorZ* orig_conv = (LDKCResult_SignDecodeErrorZ*)(orig & ~1); LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ"); *ret_conv = CResult_SignDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_ok"))) TS_CResult_RecoverableSignatureNoneZ_ok(int8_tArray o) { LDKRecoverableSignature o_ref; CHECK(o->arr_len == 68); - memcpy(o_ref.serialized_form, o->elems, 68); + memcpy(o_ref.serialized_form, o->elems, 68); FREE(o); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_err"))) TS_CResult_RecoverableSignatureNoneZ_err() { LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint32_t o) { @@ -15283,7 +15296,7 @@ jboolean __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) TS_CResult_RecoverableSignatureNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_RecoverableSignatureNoneZ _res_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(_res_ptr); FREE((void*)_res); @@ -15293,11 +15306,11 @@ void __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) static inline uintptr_t CResult_RecoverableSignatureNoneZ_clone_ptr(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR arg) { LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone_ptr"))) TS_CResult_RecoverableSignatureNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone_ptr"))) TS_CResult_RecoverableSignatureNoneZ_clone_ptr(uint32_t arg) { LDKCResult_RecoverableSignatureNoneZ* arg_conv = (LDKCResult_RecoverableSignatureNoneZ*)(arg & ~1); - int64_t ret_val = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -15305,7 +15318,7 @@ uint32_t __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)(orig & ~1); LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ"); *ret_conv = CResult_RecoverableSignatureNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_CVec_u8ZZ_free"))) TS_CVec_CVec_u8ZZ_free(ptrArray _res) { @@ -15315,13 +15328,13 @@ 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; + int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */; for (size_t m = 0; m < _res_constr.datalen; m++) { int8_tArray _res_conv_12 = _res_vals[m]; LDKCVec_u8Z _res_conv_12_ref; _res_conv_12_ref.datalen = _res_conv_12->arr_len; _res_conv_12_ref.data = MALLOC(_res_conv_12_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); + 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; } CVec_CVec_u8ZZ_free(_res_constr); @@ -15334,24 +15347,24 @@ 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; + int8_tArray* o_vals = (void*) o->elems /* XXX o leaks */; for (size_t m = 0; m < o_constr.datalen; m++) { int8_tArray o_conv_12 = o_vals[m]; LDKCVec_u8Z o_conv_12_ref; o_conv_12_ref.datalen = o_conv_12->arr_len; o_conv_12_ref.data = MALLOC(o_conv_12_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(o_conv_12_ref.data, o_conv_12->elems, o_conv_12_ref.datalen); + 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; } 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 (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_err() { LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = CResult_CVec_CVec_u8ZZNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint32_t o) { @@ -15362,7 +15375,7 @@ jboolean __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) T void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_free"))) TS_CResult_CVec_CVec_u8ZZNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_CVec_CVec_u8ZZNoneZ _res_conv = *(LDKCResult_CVec_CVec_u8ZZNoneZ*)(_res_ptr); FREE((void*)_res); @@ -15372,11 +15385,11 @@ void __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_free"))) TS_CRe static inline uintptr_t CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR arg) { LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(uint32_t arg) { LDKCResult_CVec_CVec_u8ZZNoneZ* arg_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(arg & ~1); - int64_t ret_val = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -15384,7 +15397,7 @@ uint32_t __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone"))) T LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(orig & ~1); LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_ok(uint32_t o) { @@ -15395,7 +15408,7 @@ uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok") o_conv = InMemorySigner_clone(&o_conv); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err"))) TS_CResult_InMemorySignerDecodeErrorZ_err(uint32_t e) { @@ -15406,7 +15419,7 @@ uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err" e_conv = DecodeError_clone(&e_conv); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint32_t o) { @@ -15417,7 +15430,7 @@ jboolean __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_o void __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_InMemorySignerDecodeErrorZ _res_conv = *(LDKCResult_InMemorySignerDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -15427,11 +15440,11 @@ void __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) static inline uintptr_t CResult_InMemorySignerDecodeErrorZ_clone_ptr(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR arg) { LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr"))) TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr"))) TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr(uint32_t arg) { LDKCResult_InMemorySignerDecodeErrorZ* arg_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(arg & ~1); - int64_t ret_val = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -15439,7 +15452,7 @@ uint32_t __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clon LDKCResult_InMemorySignerDecodeErrorZ* orig_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(orig & ~1); LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(uint32_tArray _res) { @@ -15449,10 +15462,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t h = 0; h < _res_constr.datalen; h++) { uint32_t _res_conv_7 = _res_vals[h]; - void* _res_conv_7_ptr = (void*)(((uint64_t)_res_conv_7) & ~1); + void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1); CHECK_ACCESS(_res_conv_7_ptr); LDKTxOut _res_conv_7_conv = *(LDKTxOut*)(_res_conv_7_ptr); FREE((void*)_res_conv_7); @@ -15465,17 +15478,17 @@ uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CRes LDKTransaction o_ref; o_ref.datalen = o->arr_len; o_ref.data = MALLOC(o_ref.datalen, "LDKTransaction Bytes"); - memcpy(o_ref.data, o->elems, o_ref.datalen); + memcpy(o_ref.data, o->elems, o_ref.datalen); FREE(o); o_ref.data_is_owned = true; LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_err"))) TS_CResult_TransactionNoneZ_err() { LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_CResult_TransactionNoneZ_is_ok(uint32_t o) { @@ -15486,7 +15499,7 @@ jboolean __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_C void __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResult_TransactionNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_TransactionNoneZ _res_conv = *(LDKCResult_TransactionNoneZ*)(_res_ptr); FREE((void*)_res); @@ -15496,11 +15509,11 @@ void __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResul static inline uintptr_t CResult_TransactionNoneZ_clone_ptr(LDKCResult_TransactionNoneZ *NONNULL_PTR arg) { LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone_ptr"))) TS_CResult_TransactionNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone_ptr"))) TS_CResult_TransactionNoneZ_clone_ptr(uint32_t arg) { LDKCResult_TransactionNoneZ* arg_conv = (LDKCResult_TransactionNoneZ*)(arg & ~1); - int64_t ret_val = CResult_TransactionNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_TransactionNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -15508,29 +15521,29 @@ uint32_t __attribute__((export_name("TS_CResult_TransactionNoneZ_clone"))) TS_C LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)(orig & ~1); LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = CResult_TransactionNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_FilterZ_some(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKFilter o_conv = *(LDKFilter*)(o_ptr); LDKCOption_FilterZ *ret_copy = MALLOC(sizeof(LDKCOption_FilterZ), "LDKCOption_FilterZ"); *ret_copy = COption_FilterZ_some(o_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_FilterZ_none"))) TS_COption_FilterZ_none() { LDKCOption_FilterZ *ret_copy = MALLOC(sizeof(LDKCOption_FilterZ), "LDKCOption_FilterZ"); *ret_copy = COption_FilterZ_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_FilterZ_free"))) TS_COption_FilterZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_FilterZ _res_conv = *(LDKCOption_FilterZ*)(_res_ptr); FREE((void*)_res); @@ -15545,13 +15558,13 @@ uint32_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_ok")) // Warning: we need a move here but no clone is available for LDKLockedChannelMonitor LDKCResult_LockedChannelMonitorNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_LockedChannelMonitorNoneZ), "LDKCResult_LockedChannelMonitorNoneZ"); *ret_conv = CResult_LockedChannelMonitorNoneZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_err"))) TS_CResult_LockedChannelMonitorNoneZ_err() { LDKCResult_LockedChannelMonitorNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_LockedChannelMonitorNoneZ), "LDKCResult_LockedChannelMonitorNoneZ"); *ret_conv = CResult_LockedChannelMonitorNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_is_ok"))) TS_CResult_LockedChannelMonitorNoneZ_is_ok(uint32_t o) { @@ -15562,7 +15575,7 @@ jboolean __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_is_ok void __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_free"))) TS_CResult_LockedChannelMonitorNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_LockedChannelMonitorNoneZ _res_conv = *(LDKCResult_LockedChannelMonitorNoneZ*)(_res_ptr); FREE((void*)_res); @@ -15576,7 +15589,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t k = 0; k < _res_constr.datalen; k++) { uint32_t _res_conv_10 = _res_vals[k]; LDKOutPoint _res_conv_10_conv; @@ -15591,17 +15604,17 @@ void __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_f uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_ok"))) TS_CResult_NoneAPIErrorZ_ok() { LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_ok(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_err"))) TS_CResult_NoneAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uint64_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CResult_NoneAPIErrorZ_is_ok(uint32_t o) { @@ -15612,7 +15625,7 @@ jboolean __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CRes void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_NoneAPIErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NoneAPIErrorZ _res_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_ptr); FREE((void*)_res); @@ -15622,11 +15635,11 @@ void __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_N static inline uintptr_t CResult_NoneAPIErrorZ_clone_ptr(LDKCResult_NoneAPIErrorZ *NONNULL_PTR arg) { LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone_ptr"))) TS_CResult_NoneAPIErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone_ptr"))) TS_CResult_NoneAPIErrorZ_clone_ptr(uint32_t arg) { LDKCResult_NoneAPIErrorZ* arg_conv = (LDKCResult_NoneAPIErrorZ*)(arg & ~1); - int64_t ret_val = CResult_NoneAPIErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NoneAPIErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -15634,26 +15647,26 @@ uint32_t __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone"))) TS_CRes LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)(orig & ~1); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = CResult_NoneAPIErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_COption_u16Z_some"))) TS_COption_u16Z_some(int16_t o) { LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = COption_u16Z_some(o); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_COption_u16Z_none"))) TS_COption_u16Z_none() { LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = COption_u16Z_none(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_COption_u16Z_free"))) TS_COption_u16Z_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCOption_u16Z _res_conv = *(LDKCOption_u16Z*)(_res_ptr); FREE((void*)_res); @@ -15663,12 +15676,12 @@ void __attribute__((export_name("TS_COption_u16Z_free"))) TS_COption_u16Z_free( static inline uintptr_t COption_u16Z_clone_ptr(LDKCOption_u16Z *NONNULL_PTR arg) { LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = COption_u16Z_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint32_t arg) { LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)arg; - int64_t ret_val = COption_u16Z_clone_ptr(arg_conv); + intptr_t ret_val = COption_u16Z_clone_ptr(arg_conv); return ret_val; } @@ -15676,7 +15689,7 @@ uint32_t __attribute__((export_name("TS_COption_u16Z_clone"))) TS_COption_u16Z_ LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)orig; LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = COption_u16Z_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -15687,10 +15700,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t w = 0; w < _res_constr.datalen; w++) { uint32_t _res_conv_22 = _res_vals[w]; - void* _res_conv_22_ptr = (void*)(((uint64_t)_res_conv_22) & ~1); + void* _res_conv_22_ptr = (void*)(((uintptr_t)_res_conv_22) & ~1); CHECK_ACCESS(_res_conv_22_ptr); LDKCResult_NoneAPIErrorZ _res_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_conv_22_ptr); FREE((void*)_res_conv_22); @@ -15706,10 +15719,10 @@ 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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t k = 0; k < _res_constr.datalen; k++) { uint32_t _res_conv_10 = _res_vals[k]; - void* _res_conv_10_ptr = (void*)(((uint64_t)_res_conv_10) & ~1); + void* _res_conv_10_ptr = (void*)(((uintptr_t)_res_conv_10) & ~1); CHECK_ACCESS(_res_conv_10_ptr); LDKAPIError _res_conv_10_conv = *(LDKAPIError*)(_res_conv_10_ptr); FREE((void*)_res_conv_10); @@ -15721,20 +15734,20 @@ void __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_f uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_ok"))) TS_CResult__u832APIErrorZ_ok(int8_tArray o) { LDKThirtyTwoBytes o_ref; CHECK(o->arr_len == 32); - memcpy(o_ref.data, o->elems, 32); + memcpy(o_ref.data, o->elems, 32); FREE(o); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_err"))) TS_CResult__u832APIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uint64_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CResult__u832APIErrorZ_is_ok(uint32_t o) { @@ -15745,7 +15758,7 @@ jboolean __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CRe void __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult__u832APIErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult__u832APIErrorZ _res_conv = *(LDKCResult__u832APIErrorZ*)(_res_ptr); FREE((void*)_res); @@ -15755,11 +15768,11 @@ void __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult_ static inline uintptr_t CResult__u832APIErrorZ_clone_ptr(LDKCResult__u832APIErrorZ *NONNULL_PTR arg) { LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone_ptr"))) TS_CResult__u832APIErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone_ptr"))) TS_CResult__u832APIErrorZ_clone_ptr(uint32_t arg) { LDKCResult__u832APIErrorZ* arg_conv = (LDKCResult__u832APIErrorZ*)(arg & ~1); - int64_t ret_val = CResult__u832APIErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult__u832APIErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -15767,26 +15780,26 @@ uint32_t __attribute__((export_name("TS_CResult__u832APIErrorZ_clone"))) TS_CRe LDKCResult__u832APIErrorZ* orig_conv = (LDKCResult__u832APIErrorZ*)(orig & ~1); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = CResult__u832APIErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_ok(int8_tArray o) { LDKThirtyTwoBytes o_ref; CHECK(o->arr_len == 32); - memcpy(o_ref.data, o->elems, 32); + memcpy(o_ref.data, o->elems, 32); FREE(o); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uint64_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint32_t o) { @@ -15797,7 +15810,7 @@ jboolean __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is void __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentIdPaymentSendFailureZ _res_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(_res_ptr); FREE((void*)_res); @@ -15807,11 +15820,11 @@ void __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free") static inline uintptr_t CResult_PaymentIdPaymentSendFailureZ_clone_ptr(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR arg) { LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr(uint32_t arg) { LDKCResult_PaymentIdPaymentSendFailureZ* arg_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(arg & ~1); - int64_t ret_val = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv); return ret_val; } @@ -15819,23 +15832,23 @@ uint32_t __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_cl LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(orig & ~1); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_ok"))) TS_CResult_NonePaymentSendFailureZ_ok() { LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_ok(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_err"))) TS_CResult_NonePaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uint64_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint32_t o) { @@ -15846,7 +15859,7 @@ jboolean __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok") void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS_CResult_NonePaymentSendFailureZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_NonePaymentSendFailureZ _res_conv = *(LDKCResult_NonePaymentSendFailureZ*)(_res_ptr); FREE((void*)_res); @@ -15856,11 +15869,11 @@ void __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS static inline uintptr_t CResult_NonePaymentSendFailureZ_clone_ptr(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR arg) { LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone_ptr"))) TS_CResult_NonePaymentSendFailureZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone_ptr"))) TS_CResult_NonePaymentSendFailureZ_clone_ptr(uint32_t arg) { LDKCResult_NonePaymentSendFailureZ* arg_conv = (LDKCResult_NonePaymentSendFailureZ*)(arg & ~1); - int64_t ret_val = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv); return ret_val; } @@ -15868,17 +15881,17 @@ uint32_t __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone") LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)(orig & ~1); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = CResult_NonePaymentSendFailureZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } static inline uintptr_t C2Tuple_PaymentHashPaymentIdZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR arg) { LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(arg); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr(uint32_t arg) { LDKC2Tuple_PaymentHashPaymentIdZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(arg & ~1); - int64_t ret_val = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv); return ret_val; } @@ -15886,24 +15899,24 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone"))) LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(orig & ~1); LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_new"))) TS_C2Tuple_PaymentHashPaymentIdZ_new(int8_tArray a, int8_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); - memcpy(a_ref.data, a->elems, 32); + memcpy(a_ref.data, a->elems, 32); FREE(a); LDKThirtyTwoBytes b_ref; CHECK(b->arr_len == 32); - memcpy(b_ref.data, b->elems, 32); + memcpy(b_ref.data, b->elems, 32); FREE(b); LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ"); *ret_conv = C2Tuple_PaymentHashPaymentIdZ_new(a_ref, b_ref); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C2Tuple_PaymentHashPaymentIdZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PaymentHashPaymentIdZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(_res_ptr); FREE((void*)_res); @@ -15911,23 +15924,23 @@ void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentIdZ o_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)(((uint64_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)(((uintptr_t)o) & ~1)); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr); - e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uint64_t)e) & ~1)); + e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1)); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint32_t o) { @@ -15938,7 +15951,7 @@ jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(_res_ptr); FREE((void*)_res); @@ -15948,11 +15961,11 @@ void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymen static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR arg) { LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(uint32_t arg) { LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(arg & ~1); - int64_t ret_val = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv); return ret_val; } @@ -15960,17 +15973,17 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(orig & ~1); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } 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); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } -int64_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(uint32_t arg) { LDKC2Tuple_PaymentHashPaymentSecretZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(arg & ~1); - int64_t ret_val = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv); + intptr_t ret_val = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv); return ret_val; } @@ -15978,24 +15991,24 @@ uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(orig & ~1); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(orig_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_t __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_new"))) TS_C2Tuple_PaymentHashPaymentSecretZ_new(int8_tArray a, int8_tArray b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); - memcpy(a_ref.data, a->elems, 32); + memcpy(a_ref.data, a->elems, 32); FREE(a); LDKThirtyTwoBytes b_ref; CHECK(b->arr_len == 32); - memcpy(b_ref.data, b->elems, 32); + memcpy(b_ref.data, b->elems, 32); FREE(b); LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ"); *ret_conv = C2Tuple_PaymentHashPaymentSecretZ_new(a_ref, b_ref); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) TS_C2Tuple_PaymentHashPaymentSecretZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(_res_ptr); FREE((void*)_res); @@ -16003,19 +16016,19 @@ void __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uint64_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err() { LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint32_t o) { @@ -16026,7 +16039,7 @@ jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(_res_ptr); FREE((void*)_res); @@ -16036,11 +16049,11 @@ void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNo static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR arg) { LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(uint32_t arg) { LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(arg & ~1); - int64_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -16048,27 +16061,27 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(orig & ~1); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr); - o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uint64_t)o) & ~1)); + o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uint64_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint32_t o) { @@ -16079,7 +16092,7 @@ jboolean __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(_res_ptr); FREE((void*)_res); @@ -16089,11 +16102,11 @@ void __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAP static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR arg) { LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(uint32_t arg) { LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(arg & ~1); - int64_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -16101,22 +16114,22 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(orig & ~1); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_ok"))) TS_CResult_PaymentSecretNoneZ_ok(int8_tArray o) { LDKThirtyTwoBytes o_ref; CHECK(o->arr_len == 32); - memcpy(o_ref.data, o->elems, 32); + memcpy(o_ref.data, o->elems, 32); FREE(o); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_err"))) TS_CResult_PaymentSecretNoneZ_err() { LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_err(); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint32_t o) { @@ -16127,7 +16140,7 @@ jboolean __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CResult_PaymentSecretNoneZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentSecretNoneZ _res_conv = *(LDKCResult_PaymentSecretNoneZ*)(_res_ptr); FREE((void*)_res); @@ -16137,11 +16150,11 @@ void __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CRes static inline uintptr_t CResult_PaymentSecretNoneZ_clone_ptr(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR arg) { LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone_ptr"))) TS_CResult_PaymentSecretNoneZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone_ptr"))) TS_CResult_PaymentSecretNoneZ_clone_ptr(uint32_t arg) { LDKCResult_PaymentSecretNoneZ* arg_conv = (LDKCResult_PaymentSecretNoneZ*)(arg & ~1); - int64_t ret_val = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv); return ret_val; } @@ -16149,26 +16162,26 @@ uint32_t __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone"))) TS LDKCResult_PaymentSecretNoneZ* orig_conv = (LDKCResult_PaymentSecretNoneZ*)(orig & ~1); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = CResult_PaymentSecretNoneZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_ok"))) TS_CResult_PaymentSecretAPIErrorZ_ok(int8_tArray o) { LDKThirtyTwoBytes o_ref; CHECK(o->arr_len == 32); - memcpy(o_ref.data, o->elems, 32); + memcpy(o_ref.data, o->elems, 32); FREE(o); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_err"))) TS_CResult_PaymentSecretAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uint64_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint32_t o) { @@ -16179,7 +16192,7 @@ jboolean __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok")) void __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentSecretAPIErrorZ _res_conv = *(LDKCResult_PaymentSecretAPIErrorZ*)(_res_ptr); FREE((void*)_res); @@ -16189,11 +16202,11 @@ void __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_ static inline uintptr_t CResult_PaymentSecretAPIErrorZ_clone_ptr(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone_ptr"))) TS_CResult_PaymentSecretAPIErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone_ptr"))) TS_CResult_PaymentSecretAPIErrorZ_clone_ptr(uint32_t arg) { LDKCResult_PaymentSecretAPIErrorZ* arg_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(arg & ~1); - int64_t ret_val = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -16201,26 +16214,26 @@ uint32_t __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone")) LDKCResult_PaymentSecretAPIErrorZ* orig_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(orig & ~1); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = CResult_PaymentSecretAPIErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_ok(int8_tArray o) { LDKThirtyTwoBytes o_ref; CHECK(o->arr_len == 32); - memcpy(o_ref.data, o->elems, 32); + memcpy(o_ref.data, o->elems, 32); FREE(o); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_ok(o_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_err"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint32_t e) { - void* e_ptr = (void*)(((uint64_t)e) & ~1); + void* e_ptr = (void*)(((uintptr_t)e) & ~1); CHECK_ACCESS(e_ptr); LDKAPIError e_conv = *(LDKAPIError*)(e_ptr); - e_conv = APIError_clone((LDKAPIError*)(((uint64_t)e) & ~1)); + e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1)); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint32_t o) { @@ -16231,7 +16244,7 @@ jboolean __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok" void __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_PaymentPreimageAPIErrorZ _res_conv = *(LDKCResult_PaymentPreimageAPIErrorZ*)(_res_ptr); FREE((void*)_res); @@ -16241,11 +16254,11 @@ void __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) T static inline uintptr_t CResult_PaymentPreimageAPIErrorZ_clone_ptr(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR arg) { LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(arg); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -int64_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr"))) TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr"))) TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr(uint32_t arg) { LDKCResult_PaymentPreimageAPIErrorZ* arg_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(arg & ~1); - int64_t ret_val = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv); + intptr_t ret_val = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv); return ret_val; } @@ -16253,7 +16266,7 @@ uint32_t __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone" LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(orig & ~1); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(orig_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_ChannelMonitorZ_free(uint32_tArray _res) { @@ -16263,7 +16276,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; + uint32_t* _res_vals = _res->elems /* XXX _res leaks */; for (size_t q = 0; q < _res_constr.datalen; q++) { uint32_t _res_conv_16 = _res_vals[q]; LDKChannelMonitor _res_conv_16_conv; @@ -16278,7 +16291,7 @@ void __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_Chann uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new"))) TS_C2Tuple_BlockHashChannelManagerZ_new(int8_tArray a, uint32_t b) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); - memcpy(a_ref.data, a->elems, 32); + memcpy(a_ref.data, a->elems, 32); FREE(a); LDKChannelManager b_conv; b_conv.inner = (void*)(b & (~1)); b_conv.is_owned = (b & 1) || (b == 0); @@ -16286,12 +16299,12 @@ uint32_t __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new")) // Warning: we need a move here but no clone is available for LDKChannelManager LDKC2Tuple_BlockHashChannelManagerZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelManagerZ), "LDKC2Tuple_BlockHashChannelManagerZ"); *ret_conv = C2Tuple_BlockHashChannelManagerZ_new(a_ref, b_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } void __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKC2Tuple_BlockHashChannelManagerZ _res_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(_res_ptr); FREE((void*)_res); @@ -16299,13 +16312,13 @@ void __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) T } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint32_t o) { - void* o_ptr = (void*)(((uint64_t)o) & ~1); + void* o_ptr = (void*)(((uintptr_t)o) & ~1); CHECK_ACCESS(o_ptr); LDKC2Tuple_BlockHashChannelManagerZ o_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(o_ptr); // Warning: we may need a move here but no clone is available for LDKC2Tuple_BlockHashChannelManagerZ LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(uint32_t e) { @@ -16316,7 +16329,7 @@ uint32_t __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManager e_conv = DecodeError_clone(&e_conv); LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ"); *ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint32_t o) { @@ -16327,7 +16340,7 @@ jboolean __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManager void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(uint32_t _res) { if ((_res & 1) != 0) return; - void* _res_ptr = (void*)(((uint64_t)_res) & ~1); + void* _res_ptr = (void*)(((uintptr_t)_res) & ~1); CHECK_ACCESS(_res_ptr); LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(_res_ptr); FREE((void*)_res); @@ -16336,7 +16349,7 @@ void __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDec void __attribute__((export_name("TS_PaymentPurpose_free"))) TS_PaymentPurpose_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKPaymentPurpose this_ptr_conv = *(LDKPaymentPurpose*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -16346,12 +16359,12 @@ void __attribute__((export_name("TS_PaymentPurpose_free"))) TS_PaymentPurpose_f static inline uintptr_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg) { LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint32_t arg) { LDKPaymentPurpose* arg_conv = (LDKPaymentPurpose*)arg; - int64_t ret_val = PaymentPurpose_clone_ptr(arg_conv); + intptr_t ret_val = PaymentPurpose_clone_ptr(arg_conv); return ret_val; } @@ -16359,36 +16372,36 @@ uint32_t __attribute__((export_name("TS_PaymentPurpose_clone"))) TS_PaymentPurp LDKPaymentPurpose* orig_conv = (LDKPaymentPurpose*)orig; LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_PaymentPurpose_invoice_payment"))) TS_PaymentPurpose_invoice_payment(int8_tArray payment_preimage, int8_tArray payment_secret) { LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); - memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); + memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); LDKThirtyTwoBytes payment_secret_ref; CHECK(payment_secret->arr_len == 32); - memcpy(payment_secret_ref.data, payment_secret->elems, 32); + memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_invoice_payment(payment_preimage_ref, payment_secret_ref); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_PaymentPurpose_spontaneous_payment"))) TS_PaymentPurpose_spontaneous_payment(int8_tArray a) { LDKThirtyTwoBytes a_ref; CHECK(a->arr_len == 32); - memcpy(a_ref.data, a->elems, 32); + memcpy(a_ref.data, a->elems, 32); FREE(a); LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose"); *ret_copy = PaymentPurpose_spontaneous_payment(a_ref); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_ClosureReason_free"))) TS_ClosureReason_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKClosureReason this_ptr_conv = *(LDKClosureReason*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -16398,12 +16411,12 @@ void __attribute__((export_name("TS_ClosureReason_free"))) TS_ClosureReason_fre static inline uintptr_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg) { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint32_t arg) { LDKClosureReason* arg_conv = (LDKClosureReason*)arg; - int64_t ret_val = ClosureReason_clone_ptr(arg_conv); + intptr_t ret_val = ClosureReason_clone_ptr(arg_conv); return ret_val; } @@ -16411,7 +16424,7 @@ uint32_t __attribute__((export_name("TS_ClosureReason_clone"))) TS_ClosureReaso LDKClosureReason* orig_conv = (LDKClosureReason*)orig; LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -16419,35 +16432,35 @@ uint32_t __attribute__((export_name("TS_ClosureReason_counterparty_force_closed LDKStr peer_msg_conv = str_ref_to_owned_c(peer_msg); LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_counterparty_force_closed(peer_msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ClosureReason_holder_force_closed"))) TS_ClosureReason_holder_force_closed() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_holder_force_closed(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ClosureReason_cooperative_closure"))) TS_ClosureReason_cooperative_closure() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_cooperative_closure(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ClosureReason_commitment_tx_confirmed"))) TS_ClosureReason_commitment_tx_confirmed() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_commitment_tx_confirmed(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ClosureReason_funding_timed_out"))) TS_ClosureReason_funding_timed_out() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_funding_timed_out(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -16455,28 +16468,28 @@ uint32_t __attribute__((export_name("TS_ClosureReason_processing_error"))) TS_C LDKStr err_conv = str_ref_to_owned_c(err); LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_processing_error(err_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ClosureReason_disconnected_peer"))) TS_ClosureReason_disconnected_peer() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_disconnected_peer(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ClosureReason_outdated_channel_manager"))) TS_ClosureReason_outdated_channel_manager() { LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason"); *ret_copy = ClosureReason_outdated_channel_manager(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } int8_tArray __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureReason_write(uint32_t obj) { LDKClosureReason* obj_conv = (LDKClosureReason*)obj; LDKCVec_u8Z ret_var = ClosureReason_write(obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -16485,15 +16498,15 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ"); *ret_conv = ClosureReason_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_Event_free"))) TS_Event_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKEvent this_ptr_conv = *(LDKEvent*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -16503,12 +16516,12 @@ void __attribute__((export_name("TS_Event_free"))) TS_Event_free(uint32_t this_ static inline uintptr_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg) { LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint32_t arg) { LDKEvent* arg_conv = (LDKEvent*)arg; - int64_t ret_val = Event_clone_ptr(arg_conv); + intptr_t ret_val = Event_clone_ptr(arg_conv); return ret_val; } @@ -16516,76 +16529,76 @@ uint32_t __attribute__((export_name("TS_Event_clone"))) TS_Event_clone(uint32_t LDKEvent* orig_conv = (LDKEvent*)orig; LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_Event_funding_generation_ready(int8_tArray temporary_channel_id, int64_t channel_value_satoshis, int8_tArray output_script, int64_t user_channel_id) { LDKThirtyTwoBytes temporary_channel_id_ref; CHECK(temporary_channel_id->arr_len == 32); - memcpy(temporary_channel_id_ref.data, temporary_channel_id->elems, 32); + memcpy(temporary_channel_id_ref.data, temporary_channel_id->elems, 32); FREE(temporary_channel_id); LDKCVec_u8Z output_script_ref; output_script_ref.datalen = output_script->arr_len; output_script_ref.data = MALLOC(output_script_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(output_script_ref.data, output_script->elems, output_script_ref.datalen); + memcpy(output_script_ref.data, output_script->elems, output_script_ref.datalen); FREE(output_script); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_funding_generation_ready(temporary_channel_id_ref, channel_value_satoshis, output_script_ref, user_channel_id); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_payment_received"))) TS_Event_payment_received(int8_tArray payment_hash, int64_t amt, uint32_t purpose) { LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); - memcpy(payment_hash_ref.data, payment_hash->elems, 32); - void* purpose_ptr = (void*)(((uint64_t)purpose) & ~1); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + void* purpose_ptr = (void*)(((uintptr_t)purpose) & ~1); CHECK_ACCESS(purpose_ptr); LDKPaymentPurpose purpose_conv = *(LDKPaymentPurpose*)(purpose_ptr); - purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uint64_t)purpose) & ~1)); + purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)purpose) & ~1)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_received(payment_hash_ref, amt, purpose_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_payment_sent"))) TS_Event_payment_sent(int8_tArray payment_id, int8_tArray payment_preimage, int8_tArray payment_hash, uint32_t fee_paid_msat) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); - memcpy(payment_id_ref.data, payment_id->elems, 32); + memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); - memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); + memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); - memcpy(payment_hash_ref.data, payment_hash->elems, 32); - void* fee_paid_msat_ptr = (void*)(((uint64_t)fee_paid_msat) & ~1); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + void* fee_paid_msat_ptr = (void*)(((uintptr_t)fee_paid_msat) & ~1); CHECK_ACCESS(fee_paid_msat_ptr); LDKCOption_u64Z fee_paid_msat_conv = *(LDKCOption_u64Z*)(fee_paid_msat_ptr); - fee_paid_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)fee_paid_msat) & ~1)); + fee_paid_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)fee_paid_msat) & ~1)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_sent(payment_id_ref, payment_preimage_ref, payment_hash_ref, fee_paid_msat_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_payment_path_failed(int8_tArray payment_id, int8_tArray payment_hash, jboolean rejected_by_dest, uint32_t network_update, jboolean all_paths_failed, uint32_tArray path, uint32_t short_channel_id, uint32_t retry) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); - memcpy(payment_id_ref.data, payment_id->elems, 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); - void* network_update_ptr = (void*)(((uint64_t)network_update) & ~1); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + void* network_update_ptr = (void*)(((uintptr_t)network_update) & ~1); CHECK_ACCESS(network_update_ptr); LDKCOption_NetworkUpdateZ network_update_conv = *(LDKCOption_NetworkUpdateZ*)(network_update_ptr); - network_update_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uint64_t)network_update) & ~1)); + network_update_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)network_update) & ~1)); 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; + uint32_t* path_vals = path->elems /* XXX path leaks */; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -16595,10 +16608,10 @@ 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; } - void* short_channel_id_ptr = (void*)(((uint64_t)short_channel_id) & ~1); + 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*)(((uint64_t)short_channel_id) & ~1)); + short_channel_id_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id) & ~1)); LDKRouteParameters retry_conv; retry_conv.inner = (void*)(retry & (~1)); retry_conv.is_owned = (retry & 1) || (retry == 0); @@ -16606,27 +16619,27 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_ retry_conv = RouteParameters_clone(&retry_conv); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_path_failed(payment_id_ref, payment_hash_ref, rejected_by_dest, network_update_conv, all_paths_failed, path_constr, short_channel_id_conv, retry_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_payment_failed"))) TS_Event_payment_failed(int8_tArray payment_id, int8_tArray payment_hash) { LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); - memcpy(payment_id_ref.data, payment_id->elems, 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); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_failed(payment_id_ref, payment_hash_ref); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_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); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -16637,75 +16650,75 @@ 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; + uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */; for (size_t b = 0; b < outputs_constr.datalen; b++) { uint32_t outputs_conv_27 = outputs_vals[b]; - void* outputs_conv_27_ptr = (void*)(((uint64_t)outputs_conv_27) & ~1); + void* outputs_conv_27_ptr = (void*)(((uintptr_t)outputs_conv_27) & ~1); CHECK_ACCESS(outputs_conv_27_ptr); LDKSpendableOutputDescriptor outputs_conv_27_conv = *(LDKSpendableOutputDescriptor*)(outputs_conv_27_ptr); - outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uint64_t)outputs_conv_27) & ~1)); + outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)outputs_conv_27) & ~1)); outputs_constr.data[b] = outputs_conv_27_conv; } LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_spendable_outputs(outputs_constr); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_payment_forwarded"))) TS_Event_payment_forwarded(uint32_t fee_earned_msat, jboolean claim_from_onchain_tx) { - void* fee_earned_msat_ptr = (void*)(((uint64_t)fee_earned_msat) & ~1); + void* fee_earned_msat_ptr = (void*)(((uintptr_t)fee_earned_msat) & ~1); CHECK_ACCESS(fee_earned_msat_ptr); LDKCOption_u64Z fee_earned_msat_conv = *(LDKCOption_u64Z*)(fee_earned_msat_ptr); - fee_earned_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)fee_earned_msat) & ~1)); + fee_earned_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)fee_earned_msat) & ~1)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_forwarded(fee_earned_msat_conv, claim_from_onchain_tx); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_channel_closed"))) TS_Event_channel_closed(int8_tArray channel_id, int64_t user_channel_id, uint32_t reason) { LDKThirtyTwoBytes channel_id_ref; CHECK(channel_id->arr_len == 32); - memcpy(channel_id_ref.data, channel_id->elems, 32); - void* reason_ptr = (void*)(((uint64_t)reason) & ~1); + memcpy(channel_id_ref.data, channel_id->elems, 32); FREE(channel_id); + void* reason_ptr = (void*)(((uintptr_t)reason) & ~1); CHECK_ACCESS(reason_ptr); LDKClosureReason reason_conv = *(LDKClosureReason*)(reason_ptr); - reason_conv = ClosureReason_clone((LDKClosureReason*)(((uint64_t)reason) & ~1)); + reason_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)reason) & ~1)); LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_channel_closed(channel_id_ref, user_channel_id, reason_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_discard_funding"))) TS_Event_discard_funding(int8_tArray channel_id, int8_tArray transaction) { LDKThirtyTwoBytes channel_id_ref; CHECK(channel_id->arr_len == 32); - memcpy(channel_id_ref.data, channel_id->elems, 32); + memcpy(channel_id_ref.data, channel_id->elems, 32); FREE(channel_id); LDKTransaction transaction_ref; transaction_ref.datalen = transaction->arr_len; transaction_ref.data = MALLOC(transaction_ref.datalen, "LDKTransaction Bytes"); - memcpy(transaction_ref.data, transaction->elems, transaction_ref.datalen); + memcpy(transaction_ref.data, transaction->elems, transaction_ref.datalen); FREE(transaction); transaction_ref.data_is_owned = true; LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_discard_funding(channel_id_ref, transaction_ref); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Event_payment_path_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); + 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); + 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; + uint32_t* path_vals = path->elems /* XXX path leaks */; for (size_t k = 0; k < path_constr.datalen; k++) { uint32_t path_conv_10 = path_vals[k]; LDKRouteHop path_conv_10_conv; @@ -16717,14 +16730,14 @@ uint32_t __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Ev } LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent"); *ret_copy = Event_payment_path_successful(payment_id_ref, payment_hash_ref, path_constr); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_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); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -16733,15 +16746,15 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ"); *ret_conv = Event_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_MessageSendEvent_free"))) TS_MessageSendEvent_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKMessageSendEvent this_ptr_conv = *(LDKMessageSendEvent*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -16751,12 +16764,12 @@ void __attribute__((export_name("TS_MessageSendEvent_free"))) TS_MessageSendEve static inline uintptr_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg) { LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint32_t arg) { LDKMessageSendEvent* arg_conv = (LDKMessageSendEvent*)arg; - int64_t ret_val = MessageSendEvent_clone_ptr(arg_conv); + intptr_t ret_val = MessageSendEvent_clone_ptr(arg_conv); return ret_val; } @@ -16764,14 +16777,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_clone"))) TS_MessageSe LDKMessageSendEvent* orig_conv = (LDKMessageSendEvent*)orig; LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_accept_channel"))) TS_MessageSendEvent_send_accept_channel(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKAcceptChannel msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16779,14 +16792,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_accept_channel")) msg_conv = AcceptChannel_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_accept_channel(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_open_channel"))) TS_MessageSendEvent_send_open_channel(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKOpenChannel msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16794,14 +16807,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_open_channel"))) msg_conv = OpenChannel_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_open_channel(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_funding_created"))) TS_MessageSendEvent_send_funding_created(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKFundingCreated msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16809,14 +16822,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_funding_created") msg_conv = FundingCreated_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_funding_created(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_funding_signed"))) TS_MessageSendEvent_send_funding_signed(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKFundingSigned msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16824,14 +16837,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_funding_signed")) msg_conv = FundingSigned_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_funding_signed(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_funding_locked"))) TS_MessageSendEvent_send_funding_locked(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKFundingLocked msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16839,14 +16852,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_funding_locked")) msg_conv = FundingLocked_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_funding_locked(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_announcement_signatures"))) TS_MessageSendEvent_send_announcement_signatures(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKAnnouncementSignatures msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16854,14 +16867,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_announcement_sign msg_conv = AnnouncementSignatures_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_announcement_signatures(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_update_htlcs"))) TS_MessageSendEvent_update_htlcs(int8_tArray node_id, uint32_t updates) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKCommitmentUpdate updates_conv; updates_conv.inner = (void*)(updates & (~1)); updates_conv.is_owned = (updates & 1) || (updates == 0); @@ -16869,14 +16882,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_update_htlcs"))) TS_Me updates_conv = CommitmentUpdate_clone(&updates_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_update_htlcs(node_id_ref, updates_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_revoke_and_ack"))) TS_MessageSendEvent_send_revoke_and_ack(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKRevokeAndACK msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16884,14 +16897,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_revoke_and_ack")) msg_conv = RevokeAndACK_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_revoke_and_ack(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_closing_signed"))) TS_MessageSendEvent_send_closing_signed(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKClosingSigned msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16899,14 +16912,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_closing_signed")) msg_conv = ClosingSigned_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_closing_signed(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_shutdown"))) TS_MessageSendEvent_send_shutdown(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKShutdown msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16914,14 +16927,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_shutdown"))) TS_M msg_conv = Shutdown_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_shutdown(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_reestablish"))) TS_MessageSendEvent_send_channel_reestablish(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKChannelReestablish msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16929,7 +16942,7 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_reestabli msg_conv = ChannelReestablish_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_reestablish(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -16946,7 +16959,7 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_anno update_msg_conv = ChannelUpdate_clone(&update_msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_broadcast_channel_announcement(msg_conv, update_msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -16958,7 +16971,7 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_node_announc msg_conv = NodeAnnouncement_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_broadcast_node_announcement(msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -16970,14 +16983,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_upda msg_conv = ChannelUpdate_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_broadcast_channel_update(msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_update"))) TS_MessageSendEvent_send_channel_update(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKChannelUpdate msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -16985,28 +16998,28 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_update")) msg_conv = ChannelUpdate_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_update(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_handle_error"))) TS_MessageSendEvent_handle_error(int8_tArray node_id, uint32_t action) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); - void* action_ptr = (void*)(((uint64_t)action) & ~1); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); + void* action_ptr = (void*)(((uintptr_t)action) & ~1); CHECK_ACCESS(action_ptr); LDKErrorAction action_conv = *(LDKErrorAction*)(action_ptr); - action_conv = ErrorAction_clone((LDKErrorAction*)(((uint64_t)action) & ~1)); + action_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action) & ~1)); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_handle_error(node_id_ref, action_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_range_query"))) TS_MessageSendEvent_send_channel_range_query(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKQueryChannelRange msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -17014,14 +17027,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_channel_range_que msg_conv = QueryChannelRange_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_channel_range_query(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_short_ids_query"))) TS_MessageSendEvent_send_short_ids_query(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKQueryShortChannelIds msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -17029,14 +17042,14 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_short_ids_query") msg_conv = QueryShortChannelIds_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_short_ids_query(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_MessageSendEvent_send_reply_channel_range"))) TS_MessageSendEvent_send_reply_channel_range(int8_tArray node_id, uint32_t msg) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKReplyChannelRange msg_conv; msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = (msg & 1) || (msg == 0); @@ -17044,13 +17057,13 @@ uint32_t __attribute__((export_name("TS_MessageSendEvent_send_reply_channel_ran msg_conv = ReplyChannelRange_clone(&msg_conv); LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent"); *ret_copy = MessageSendEvent_send_reply_channel_range(node_id_ref, msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } void __attribute__((export_name("TS_MessageSendEventsProvider_free"))) TS_MessageSendEventsProvider_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKMessageSendEventsProvider this_ptr_conv = *(LDKMessageSendEventsProvider*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -17059,7 +17072,7 @@ void __attribute__((export_name("TS_MessageSendEventsProvider_free"))) TS_Messa void __attribute__((export_name("TS_EventsProvider_free"))) TS_EventsProvider_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKEventsProvider this_ptr_conv = *(LDKEventsProvider*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -17068,7 +17081,7 @@ void __attribute__((export_name("TS_EventsProvider_free"))) TS_EventsProvider_f void __attribute__((export_name("TS_EventHandler_free"))) TS_EventHandler_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKEventHandler this_ptr_conv = *(LDKEventHandler*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -17077,7 +17090,7 @@ void __attribute__((export_name("TS_EventHandler_free"))) TS_EventHandler_free( void __attribute__((export_name("TS_APIError_free"))) TS_APIError_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKAPIError this_ptr_conv = *(LDKAPIError*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -17087,12 +17100,12 @@ void __attribute__((export_name("TS_APIError_free"))) TS_APIError_free(uint32_t static inline uintptr_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg) { LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint32_t arg) { LDKAPIError* arg_conv = (LDKAPIError*)arg; - int64_t ret_val = APIError_clone_ptr(arg_conv); + intptr_t ret_val = APIError_clone_ptr(arg_conv); return ret_val; } @@ -17100,7 +17113,7 @@ uint32_t __attribute__((export_name("TS_APIError_clone"))) TS_APIError_clone(ui LDKAPIError* orig_conv = (LDKAPIError*)orig; LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -17108,7 +17121,7 @@ uint32_t __attribute__((export_name("TS_APIError_apimisuse_error"))) TS_APIErro LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_apimisuse_error(err_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -17116,7 +17129,7 @@ uint32_t __attribute__((export_name("TS_APIError_fee_rate_too_high"))) TS_APIEr LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_fee_rate_too_high(err_conv, feerate); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -17124,7 +17137,7 @@ uint32_t __attribute__((export_name("TS_APIError_route_error"))) TS_APIError_ro LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_route_error(err_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -17132,14 +17145,14 @@ uint32_t __attribute__((export_name("TS_APIError_channel_unavailable"))) TS_API LDKStr err_conv = str_ref_to_owned_c(err); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_channel_unavailable(err_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_APIError_monitor_update_failed"))) TS_APIError_monitor_update_failed() { LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_monitor_update_failed(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -17151,41 +17164,41 @@ uint32_t __attribute__((export_name("TS_APIError_incompatible_shutdown_script") script_conv = ShutdownScript_clone(&script_conv); LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError"); *ret_copy = APIError_incompatible_shutdown_script(script_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } 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; + msg_ref.data = msg->elems /* XXX msg leaks */; unsigned char sk_arr[32]; CHECK(sk->arr_len == 32); - memcpy(sk_arr, sk->elems, 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); - return (uint64_t)ret_conv; + return (uintptr_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; + msg_ref.data = msg->elems /* XXX msg leaks */; 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); - return (uint64_t)ret_conv; + return (uintptr_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; + msg_ref.data = msg->elems /* XXX msg leaks */; 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); + memcpy(pk_ref.compressed_form, pk->elems, 33); FREE(pk); jboolean ret_val = verify(msg_ref, sig_conv, pk_ref); return ret_val; } @@ -17349,22 +17362,22 @@ void __attribute__((export_name("TS_Record_set_line"))) TS_Record_set_line(uint static inline uintptr_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg) { LDKRecord ret_var = Record_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint32_t arg) { LDKRecord arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = Record_clone_ptr(&arg_conv); + intptr_t ret_val = Record_clone_ptr(&arg_conv); return ret_val; } @@ -17374,11 +17387,11 @@ uint32_t __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint32 orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRecord ret_var = Record_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17387,7 +17400,7 @@ uint32_t __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint32 void __attribute__((export_name("TS_Logger_free"))) TS_Logger_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKLogger this_ptr_conv = *(LDKLogger*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -17455,11 +17468,11 @@ void __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_htlc_minimum 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) { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17468,22 +17481,22 @@ uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_Chann static inline uintptr_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg) { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint32_t arg) { LDKChannelHandshakeConfig arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelHandshakeConfig_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelHandshakeConfig_clone_ptr(&arg_conv); return ret_val; } @@ -17493,11 +17506,11 @@ uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_Cha orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17506,11 +17519,11 @@ uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_Cha uint32_t __attribute__((export_name("TS_ChannelHandshakeConfig_default"))) TS_ChannelHandshakeConfig_default() { LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_default(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17663,11 +17676,11 @@ void __attribute__((export_name("TS_ChannelHandshakeLimits_set_their_to_self_de uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_ChannelHandshakeLimits_new(int64_t min_funding_satoshis_arg, int64_t max_htlc_minimum_msat_arg, int64_t min_max_htlc_value_in_flight_msat_arg, int64_t max_channel_reserve_satoshis_arg, int16_t min_max_accepted_htlcs_arg, int32_t max_minimum_depth_arg, jboolean force_announced_channel_preference_arg, int16_t their_to_self_delay_arg) { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_htlc_minimum_msat_arg, min_max_htlc_value_in_flight_msat_arg, max_channel_reserve_satoshis_arg, min_max_accepted_htlcs_arg, max_minimum_depth_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17676,22 +17689,22 @@ uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_Chann static inline uintptr_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg) { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint32_t arg) { LDKChannelHandshakeLimits arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelHandshakeLimits_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelHandshakeLimits_clone_ptr(&arg_conv); return ret_val; } @@ -17701,11 +17714,11 @@ uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_Cha orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17714,11 +17727,11 @@ uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_Cha uint32_t __attribute__((export_name("TS_ChannelHandshakeLimits_default"))) TS_ChannelHandshakeLimits_default() { LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_default(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17854,11 +17867,11 @@ void __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max 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); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17867,22 +17880,22 @@ uint32_t __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_ static inline uintptr_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg) { LDKChannelConfig ret_var = ChannelConfig_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint32_t arg) { LDKChannelConfig arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelConfig_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelConfig_clone_ptr(&arg_conv); return ret_val; } @@ -17892,11 +17905,11 @@ uint32_t __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfi orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelConfig ret_var = ChannelConfig_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17905,11 +17918,11 @@ uint32_t __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfi uint32_t __attribute__((export_name("TS_ChannelConfig_default"))) TS_ChannelConfig_default() { LDKChannelConfig ret_var = ChannelConfig_default(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17922,7 +17935,7 @@ int8_tArray __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelCo obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelConfig_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -17931,10 +17944,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ"); *ret_conv = ChannelConfig_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint32_t this_obj) { @@ -17951,11 +17964,11 @@ uint32_t __attribute__((export_name("TS_UserConfig_get_own_channel_config"))) T 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); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -17981,11 +17994,11 @@ uint32_t __attribute__((export_name("TS_UserConfig_get_peer_channel_config_limi 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); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18011,11 +18024,11 @@ uint32_t __attribute__((export_name("TS_UserConfig_get_channel_options"))) TS_U 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); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18086,11 +18099,11 @@ uint32_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(ui 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); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18099,22 +18112,22 @@ uint32_t __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(ui static inline uintptr_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg) { LDKUserConfig ret_var = UserConfig_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint32_t arg) { LDKUserConfig arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UserConfig_clone_ptr(&arg_conv); + intptr_t ret_val = UserConfig_clone_ptr(&arg_conv); return ret_val; } @@ -18124,11 +18137,11 @@ uint32_t __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clon orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUserConfig ret_var = UserConfig_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18137,11 +18150,11 @@ uint32_t __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clon uint32_t __attribute__((export_name("TS_UserConfig_default"))) TS_UserConfig_default() { LDKUserConfig ret_var = UserConfig_default(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18158,22 +18171,22 @@ void __attribute__((export_name("TS_BestBlock_free"))) TS_BestBlock_free(uint32 static inline uintptr_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg) { LDKBestBlock ret_var = BestBlock_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint32_t arg) { LDKBestBlock arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = BestBlock_clone_ptr(&arg_conv); + intptr_t ret_val = BestBlock_clone_ptr(&arg_conv); return ret_val; } @@ -18183,11 +18196,11 @@ uint32_t __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone( orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKBestBlock ret_var = BestBlock_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18197,11 +18210,11 @@ uint32_t __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone( uint32_t __attribute__((export_name("TS_BestBlock_from_genesis"))) TS_BestBlock_from_genesis(uint32_t network) { LDKNetwork network_conv = LDKNetwork_from_js(network); LDKBestBlock ret_var = BestBlock_from_genesis(network_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18211,13 +18224,13 @@ uint32_t __attribute__((export_name("TS_BestBlock_from_genesis"))) TS_BestBlock uint32_t __attribute__((export_name("TS_BestBlock_new"))) TS_BestBlock_new(int8_tArray block_hash, int32_t height) { LDKThirtyTwoBytes block_hash_ref; CHECK(block_hash->arr_len == 32); - memcpy(block_hash_ref.data, block_hash->elems, 32); + memcpy(block_hash_ref.data, block_hash->elems, 32); FREE(block_hash); LDKBestBlock ret_var = BestBlock_new(block_hash_ref, height); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18229,7 +18242,7 @@ int8_tArray __attribute__((export_name("TS_BestBlock_block_hash"))) TS_BestBloc 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(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, BestBlock_block_hash(&this_arg_conv).data, 32); return ret_arr; } @@ -18261,7 +18274,7 @@ uint32_t __attribute__((export_name("TS_AccessError_unknown_tx"))) TS_AccessErr void __attribute__((export_name("TS_Access_free"))) TS_Access_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKAccess this_ptr_conv = *(LDKAccess*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18270,7 +18283,7 @@ void __attribute__((export_name("TS_Access_free"))) TS_Access_free(uint32_t thi void __attribute__((export_name("TS_Listen_free"))) TS_Listen_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKListen this_ptr_conv = *(LDKListen*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18279,7 +18292,7 @@ void __attribute__((export_name("TS_Listen_free"))) TS_Listen_free(uint32_t thi void __attribute__((export_name("TS_Confirm_free"))) TS_Confirm_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKConfirm this_ptr_conv = *(LDKConfirm*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18304,7 +18317,7 @@ uint32_t __attribute__((export_name("TS_ChannelMonitorUpdateErr_permanent_failu void __attribute__((export_name("TS_Watch_free"))) TS_Watch_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKWatch this_ptr_conv = *(LDKWatch*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18313,7 +18326,7 @@ void __attribute__((export_name("TS_Watch_free"))) TS_Watch_free(uint32_t this_ void __attribute__((export_name("TS_Filter_free"))) TS_Filter_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKFilter this_ptr_conv = *(LDKFilter*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18333,7 +18346,7 @@ int8_tArray __attribute__((export_name("TS_WatchedOutput_get_block_hash"))) TS_ 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, WatchedOutput_get_block_hash(&this_ptr_conv).data, 32); return ret_arr; } @@ -18345,7 +18358,7 @@ void __attribute__((export_name("TS_WatchedOutput_set_block_hash"))) TS_Watched CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); WatchedOutput_set_block_hash(&this_ptr_conv, val_ref); } @@ -18355,11 +18368,11 @@ uint32_t __attribute__((export_name("TS_WatchedOutput_get_outpoint"))) TS_Watch this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKOutPoint ret_var = WatchedOutput_get_outpoint(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18385,7 +18398,7 @@ int8_tArray __attribute__((export_name("TS_WatchedOutput_get_script_pubkey"))) this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKu8slice ret_var = WatchedOutput_get_script_pubkey(&this_ptr_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -18398,14 +18411,14 @@ void __attribute__((export_name("TS_WatchedOutput_set_script_pubkey"))) TS_Watc LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(val_ref.data, val->elems, val_ref.datalen); + memcpy(val_ref.data, val->elems, val_ref.datalen); FREE(val); WatchedOutput_set_script_pubkey(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_new(int8_tArray block_hash_arg, uint32_t outpoint_arg, int8_tArray script_pubkey_arg) { LDKThirtyTwoBytes block_hash_arg_ref; CHECK(block_hash_arg->arr_len == 32); - memcpy(block_hash_arg_ref.data, block_hash_arg->elems, 32); + memcpy(block_hash_arg_ref.data, block_hash_arg->elems, 32); FREE(block_hash_arg); LDKOutPoint outpoint_arg_conv; outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1)); outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0); @@ -18414,13 +18427,13 @@ uint32_t __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_ LDKCVec_u8Z script_pubkey_arg_ref; script_pubkey_arg_ref.datalen = script_pubkey_arg->arr_len; script_pubkey_arg_ref.data = MALLOC(script_pubkey_arg_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(script_pubkey_arg_ref.data, script_pubkey_arg->elems, script_pubkey_arg_ref.datalen); + memcpy(script_pubkey_arg_ref.data, script_pubkey_arg->elems, script_pubkey_arg_ref.datalen); FREE(script_pubkey_arg); LDKWatchedOutput ret_var = WatchedOutput_new(block_hash_arg_ref, outpoint_arg_conv, script_pubkey_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18429,22 +18442,22 @@ uint32_t __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_ static inline uintptr_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg) { LDKWatchedOutput ret_var = WatchedOutput_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint32_t arg) { LDKWatchedOutput arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = WatchedOutput_clone_ptr(&arg_conv); + intptr_t ret_val = WatchedOutput_clone_ptr(&arg_conv); return ret_val; } @@ -18454,11 +18467,11 @@ uint32_t __attribute__((export_name("TS_WatchedOutput_clone"))) TS_WatchedOutpu orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKWatchedOutput ret_var = WatchedOutput_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18476,7 +18489,7 @@ int64_t __attribute__((export_name("TS_WatchedOutput_hash"))) TS_WatchedOutput_ void __attribute__((export_name("TS_BroadcasterInterface_free"))) TS_BroadcasterInterface_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKBroadcasterInterface this_ptr_conv = *(LDKBroadcasterInterface*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18513,7 +18526,7 @@ jboolean __attribute__((export_name("TS_ConfirmationTarget_eq"))) TS_Confirmati void __attribute__((export_name("TS_FeeEstimator_free"))) TS_FeeEstimator_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKFeeEstimator this_ptr_conv = *(LDKFeeEstimator*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18530,22 +18543,22 @@ void __attribute__((export_name("TS_MonitorUpdateId_free"))) TS_MonitorUpdateId static inline uintptr_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg) { LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint32_t arg) { LDKMonitorUpdateId arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = MonitorUpdateId_clone_ptr(&arg_conv); + intptr_t ret_val = MonitorUpdateId_clone_ptr(&arg_conv); return ret_val; } @@ -18555,11 +18568,11 @@ uint32_t __attribute__((export_name("TS_MonitorUpdateId_clone"))) TS_MonitorUpd orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18590,7 +18603,7 @@ jboolean __attribute__((export_name("TS_MonitorUpdateId_eq"))) TS_MonitorUpdate void __attribute__((export_name("TS_Persist_free"))) TS_Persist_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKPersist this_ptr_conv = *(LDKPersist*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18614,31 +18627,31 @@ void __attribute__((export_name("TS_ChainMonitor_free"))) TS_ChainMonitor_free( } uint32_t __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_new(uint32_t chain_source, uint32_t broadcaster, uint32_t logger, uint32_t feeest, uint32_t persister) { - void* chain_source_ptr = (void*)(((uint64_t)chain_source) & ~1); + void* chain_source_ptr = (void*)(((uintptr_t)chain_source) & ~1); CHECK_ACCESS(chain_source_ptr); LDKCOption_FilterZ chain_source_conv = *(LDKCOption_FilterZ*)(chain_source_ptr); // Warning: we may need a move here but no clone is available for LDKCOption_FilterZ if (chain_source_conv.tag == LDKCOption_FilterZ_Some) { // Manually implement clone for Java trait instances } - void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1); + void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); - void* feeest_ptr = (void*)(((uint64_t)feeest) & ~1); + void* feeest_ptr = (void*)(((uintptr_t)feeest) & ~1); CHECK_ACCESS(feeest_ptr); LDKFeeEstimator feeest_conv = *(LDKFeeEstimator*)(feeest_ptr); - void* persister_ptr = (void*)(((uint64_t)persister) & ~1); + void* persister_ptr = (void*)(((uintptr_t)persister) & ~1); CHECK_ACCESS(persister_ptr); LDKPersist persister_conv = *(LDKPersist*)(persister_ptr); LDKChainMonitor ret_var = ChainMonitor_new(chain_source_conv, broadcaster_conv, logger_conv, feeest_conv, persister_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18656,7 +18669,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; + uint32_t* ignored_channels_vals = ignored_channels->elems /* XXX ignored_channels leaks */; 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; @@ -18668,12 +18681,12 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_get_claimable_balance } 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - uint64_t ret_conv_9_ref = (uint64_t)ret_conv_9_copy; + uintptr_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy; ret_arr_ptr[j] = ret_conv_9_ref; } @@ -18693,7 +18706,7 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_get_monitor"))) TS_ChainMo funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKCResult_LockedChannelMonitorNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_LockedChannelMonitorNoneZ), "LDKCResult_LockedChannelMonitorNoneZ"); *ret_conv = ChainMonitor_get_monitor(&this_arg_conv, funding_txo_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ChainMonitor_list_monitors(uint32_t this_arg) { @@ -18703,15 +18716,15 @@ uint32_tArray __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCVec_OutPointZ ret_var = ChainMonitor_list_monitors(&this_arg_conv); uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t k = 0; k < ret_var.datalen; k++) { LDKOutPoint ret_conv_10_var = ret_var.data[k]; - uint64_t ret_conv_10_ref = 0; - CHECK((((uint64_t)ret_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_10_ref = 0; + CHECK((((uintptr_t)ret_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_10_var); - ret_conv_10_ref = (uint64_t)ret_conv_10_var.inner; + ret_conv_10_ref = (uintptr_t)ret_conv_10_var.inner; if (ret_conv_10_var.is_owned) { ret_conv_10_ref |= 1; } @@ -18739,7 +18752,7 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_channel_monitor_updated")) completed_update_id_conv = MonitorUpdateId_clone(&completed_update_id_conv); LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChainMonitor_channel_monitor_updated(&this_arg_conv, funding_txo_conv, completed_update_id_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMonitor_as_Listen(uint32_t this_arg) { @@ -18749,7 +18762,7 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMoni CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen"); *ret_ret = ChainMonitor_as_Listen(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMonitor_as_Confirm(uint32_t this_arg) { @@ -18759,7 +18772,7 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMon CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *ret_ret = ChainMonitor_as_Confirm(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonitor_as_Watch(uint32_t this_arg) { @@ -18769,7 +18782,7 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonit CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKWatch* ret_ret = MALLOC(sizeof(LDKWatch), "LDKWatch"); *ret_ret = ChainMonitor_as_Watch(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_ChainMonitor_as_EventsProvider(uint32_t this_arg) { @@ -18779,7 +18792,7 @@ uint32_t __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_C CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *ret_ret = ChainMonitor_as_EventsProvider(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_ChannelMonitorUpdate_free"))) TS_ChannelMonitorUpdate_free(uint32_t this_obj) { @@ -18809,22 +18822,22 @@ void __attribute__((export_name("TS_ChannelMonitorUpdate_set_update_id"))) TS_C static inline uintptr_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg) { LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint32_t arg) { LDKChannelMonitorUpdate arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelMonitorUpdate_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelMonitorUpdate_clone_ptr(&arg_conv); return ret_val; } @@ -18834,11 +18847,11 @@ uint32_t __attribute__((export_name("TS_ChannelMonitorUpdate_clone"))) TS_Chann orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -18851,7 +18864,7 @@ int8_tArray __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_Ch obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelMonitorUpdate_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -18860,15 +18873,15 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ"); *ret_conv = ChannelMonitorUpdate_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_MonitorEvent_free"))) TS_MonitorEvent_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKMonitorEvent this_ptr_conv = *(LDKMonitorEvent*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -18878,12 +18891,12 @@ void __attribute__((export_name("TS_MonitorEvent_free"))) TS_MonitorEvent_free( static inline uintptr_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg) { LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint32_t arg) { LDKMonitorEvent* arg_conv = (LDKMonitorEvent*)arg; - int64_t ret_val = MonitorEvent_clone_ptr(arg_conv); + intptr_t ret_val = MonitorEvent_clone_ptr(arg_conv); return ret_val; } @@ -18891,7 +18904,7 @@ uint32_t __attribute__((export_name("TS_MonitorEvent_clone"))) TS_MonitorEvent_ LDKMonitorEvent* orig_conv = (LDKMonitorEvent*)orig; LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -18903,7 +18916,7 @@ uint32_t __attribute__((export_name("TS_MonitorEvent_htlcevent"))) TS_MonitorEv a_conv = HTLCUpdate_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_htlcevent(a_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -18915,7 +18928,7 @@ uint32_t __attribute__((export_name("TS_MonitorEvent_commitment_tx_confirmed")) a_conv = OutPoint_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_commitment_tx_confirmed(a_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -18927,7 +18940,7 @@ uint32_t __attribute__((export_name("TS_MonitorEvent_update_completed"))) TS_Mo funding_txo_conv = OutPoint_clone(&funding_txo_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_update_completed(funding_txo_conv, monitor_update_id); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -18939,14 +18952,14 @@ uint32_t __attribute__((export_name("TS_MonitorEvent_update_failed"))) TS_Monit a_conv = OutPoint_clone(&a_conv); LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent"); *ret_copy = MonitorEvent_update_failed(a_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } int8_tArray __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEvent_write(uint32_t obj) { LDKMonitorEvent* obj_conv = (LDKMonitorEvent*)obj; LDKCVec_u8Z ret_var = MonitorEvent_write(obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -18955,10 +18968,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ"); *ret_conv = MonitorEvent_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint32_t this_obj) { @@ -18971,22 +18984,22 @@ void __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint static inline uintptr_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg) { LDKHTLCUpdate ret_var = HTLCUpdate_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint32_t arg) { LDKHTLCUpdate arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = HTLCUpdate_clone_ptr(&arg_conv); + intptr_t ret_val = HTLCUpdate_clone_ptr(&arg_conv); return ret_val; } @@ -18996,11 +19009,11 @@ uint32_t __attribute__((export_name("TS_HTLCUpdate_clone"))) TS_HTLCUpdate_clon orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKHTLCUpdate ret_var = HTLCUpdate_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19013,7 +19026,7 @@ int8_tArray __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_w obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = HTLCUpdate_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -19022,15 +19035,15 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ"); *ret_conv = HTLCUpdate_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_Balance_free"))) TS_Balance_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKBalance this_ptr_conv = *(LDKBalance*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -19040,12 +19053,12 @@ void __attribute__((export_name("TS_Balance_free"))) TS_Balance_free(uint32_t t static inline uintptr_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg) { LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint32_t arg) { LDKBalance* arg_conv = (LDKBalance*)arg; - int64_t ret_val = Balance_clone_ptr(arg_conv); + intptr_t ret_val = Balance_clone_ptr(arg_conv); return ret_val; } @@ -19053,35 +19066,35 @@ uint32_t __attribute__((export_name("TS_Balance_clone"))) TS_Balance_clone(uint LDKBalance* orig_conv = (LDKBalance*)orig; LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Balance_claimable_on_channel_close"))) TS_Balance_claimable_on_channel_close(int64_t claimable_amount_satoshis) { LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_claimable_on_channel_close(claimable_amount_satoshis); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Balance_claimable_awaiting_confirmations"))) TS_Balance_claimable_awaiting_confirmations(int64_t claimable_amount_satoshis, int32_t confirmation_height) { LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_claimable_awaiting_confirmations(claimable_amount_satoshis, confirmation_height); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Balance_contentious_claimable"))) TS_Balance_contentious_claimable(int64_t claimable_amount_satoshis, int32_t timeout_height) { LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_contentious_claimable(claimable_amount_satoshis, timeout_height); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_Balance_maybe_claimable_htlcawaiting_timeout"))) TS_Balance_maybe_claimable_htlcawaiting_timeout(int64_t claimable_amount_satoshis, int32_t claimable_height) { LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance"); *ret_copy = Balance_maybe_claimable_htlcawaiting_timeout(claimable_amount_satoshis, claimable_height); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -19102,22 +19115,22 @@ void __attribute__((export_name("TS_ChannelMonitor_free"))) TS_ChannelMonitor_f static inline uintptr_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg) { LDKChannelMonitor ret_var = ChannelMonitor_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint32_t arg) { LDKChannelMonitor arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelMonitor_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelMonitor_clone_ptr(&arg_conv); return ret_val; } @@ -19127,11 +19140,11 @@ uint32_t __attribute__((export_name("TS_ChannelMonitor_clone"))) TS_ChannelMoni orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelMonitor ret_var = ChannelMonitor_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19144,7 +19157,7 @@ int8_tArray __attribute__((export_name("TS_ChannelMonitor_write"))) TS_ChannelM obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelMonitor_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -19159,18 +19172,18 @@ uint32_t __attribute__((export_name("TS_ChannelMonitor_update_monitor"))) TS_Ch updates_conv.inner = (void*)(updates & (~1)); updates_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_conv); - void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1); + void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); if (!(broadcaster & 1)) { CHECK_ACCESS(broadcaster_ptr); } LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster_ptr; - void* fee_estimator_ptr = (void*)(((uint64_t)fee_estimator) & ~1); + 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; - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); } LDKLogger* logger_conv = (LDKLogger*)logger_ptr; LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ"); *ret_conv = ChannelMonitor_update_monitor(&this_arg_conv, &updates_conv, broadcaster_conv, fee_estimator_conv, logger_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int64_t __attribute__((export_name("TS_ChannelMonitor_get_latest_update_id"))) TS_ChannelMonitor_get_latest_update_id(uint32_t this_arg) { @@ -19189,7 +19202,7 @@ uint32_t __attribute__((export_name("TS_ChannelMonitor_get_funding_txo"))) TS_C CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ"); *ret_conv = ChannelMonitor_get_funding_txo(&this_arg_conv); - return ((uint64_t)ret_conv); + return ((uintptr_t)ret_conv); } uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watch"))) TS_ChannelMonitor_get_outputs_to_watch(uint32_t this_arg) { @@ -19199,12 +19212,12 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watc CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - ret_arr_ptr[o] = ((uint64_t)ret_conv_40_conv); + ret_arr_ptr[o] = ((uintptr_t)ret_conv_40_conv); } FREE(ret_var.data); @@ -19216,7 +19229,7 @@ void __attribute__((export_name("TS_ChannelMonitor_load_outputs_to_watch"))) TS this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* filter_ptr = (void*)(((uint64_t)filter) & ~1); + void* filter_ptr = (void*)(((uintptr_t)filter) & ~1); if (!(filter & 1)) { CHECK_ACCESS(filter_ptr); } LDKFilter* filter_conv = (LDKFilter*)filter_ptr; ChannelMonitor_load_outputs_to_watch(&this_arg_conv, filter_conv); @@ -19229,12 +19242,12 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - uint64_t ret_conv_14_ref = (uint64_t)ret_conv_14_copy; + uintptr_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy; ret_arr_ptr[o] = ret_conv_14_ref; } @@ -19249,12 +19262,12 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - uint64_t ret_conv_7_ref = (uint64_t)ret_conv_7_copy; + uintptr_t ret_conv_7_ref = (uintptr_t)ret_conv_7_copy; ret_arr_ptr[h] = ret_conv_7_ref; } @@ -19267,16 +19280,16 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_latest_holder_commit this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); } LDKLogger* logger_conv = (LDKLogger*)logger_ptr; 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); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); 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); + int8_tArray ret_conv_12_arr = init_int8_tArray(ret_conv_12_var.datalen, __LINE__); memcpy(ret_conv_12_arr->elems, ret_conv_12_var.data, ret_conv_12_var.datalen); Transaction_free(ret_conv_12_var); ret_arr_ptr[m] = ret_conv_12_arr; @@ -19293,7 +19306,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_block_connected"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char header_arr[80]; CHECK(header->arr_len == 80); - memcpy(header_arr, header->elems, 80); + memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; LDKCVec_C2Tuple_usizeTransactionZZ txdata_constr; txdata_constr.datalen = txdata->arr_len; @@ -19301,32 +19314,32 @@ 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; + uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */; for (size_t c = 0; c < txdata_constr.datalen; c++) { uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uint64_t)txdata_conv_28) & ~1); + void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); CHECK_ACCESS(txdata_conv_28_ptr); LDKC2Tuple_usizeTransactionZ txdata_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(txdata_conv_28_ptr); - txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uint64_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1)); txdata_constr.data[c] = txdata_conv_28_conv; } - void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1); + void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); - void* fee_estimator_ptr = (void*)(((uint64_t)fee_estimator) & ~1); + void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - ret_arr_ptr[n] = ((uint64_t)ret_conv_39_conv); + ret_arr_ptr[n] = ((uintptr_t)ret_conv_39_conv); } FREE(ret_var.data); @@ -19340,15 +19353,15 @@ void __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_Ch CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char header_arr[80]; CHECK(header->arr_len == 80); - memcpy(header_arr, header->elems, 80); + memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; - void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1); + void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); - void* fee_estimator_ptr = (void*)(((uint64_t)fee_estimator) & ~1); + void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); ChannelMonitor_block_disconnected(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv); @@ -19361,7 +19374,7 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_transactions_confir CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char header_arr[80]; CHECK(header->arr_len == 80); - memcpy(header_arr, header->elems, 80); + memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; LDKCVec_C2Tuple_usizeTransactionZZ txdata_constr; txdata_constr.datalen = txdata->arr_len; @@ -19369,32 +19382,32 @@ 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; + uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */; for (size_t c = 0; c < txdata_constr.datalen; c++) { uint32_t txdata_conv_28 = txdata_vals[c]; - void* txdata_conv_28_ptr = (void*)(((uint64_t)txdata_conv_28) & ~1); + void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1); CHECK_ACCESS(txdata_conv_28_ptr); LDKC2Tuple_usizeTransactionZ txdata_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(txdata_conv_28_ptr); - txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uint64_t)txdata_conv_28) & ~1)); + txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1)); txdata_constr.data[c] = txdata_conv_28_conv; } - void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1); + void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); - void* fee_estimator_ptr = (void*)(((uint64_t)fee_estimator) & ~1); + void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - ret_arr_ptr[n] = ((uint64_t)ret_conv_39_conv); + ret_arr_ptr[n] = ((uintptr_t)ret_conv_39_conv); } FREE(ret_var.data); @@ -19408,15 +19421,15 @@ void __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char txid_arr[32]; CHECK(txid->arr_len == 32); - memcpy(txid_arr, txid->elems, 32); + memcpy(txid_arr, txid->elems, 32); FREE(txid); unsigned char (*txid_ref)[32] = &txid_arr; - void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1); + void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); - void* fee_estimator_ptr = (void*)(((uint64_t)fee_estimator) & ~1); + void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); ChannelMonitor_transaction_unconfirmed(&this_arg_conv, txid_ref, broadcaster_conv, fee_estimator_conv, logger_conv); @@ -19429,25 +19442,25 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_best_block_updated" CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char header_arr[80]; CHECK(header->arr_len == 80); - memcpy(header_arr, header->elems, 80); + memcpy(header_arr, header->elems, 80); FREE(header); unsigned char (*header_ref)[80] = &header_arr; - void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1); + void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1); CHECK_ACCESS(broadcaster_ptr); LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr); - void* fee_estimator_ptr = (void*)(((uint64_t)fee_estimator) & ~1); + void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - ret_arr_ptr[n] = ((uint64_t)ret_conv_39_conv); + ret_arr_ptr[n] = ((uintptr_t)ret_conv_39_conv); } FREE(ret_var.data); @@ -19461,10 +19474,10 @@ ptrArray __attribute__((export_name("TS_ChannelMonitor_get_relevant_txids"))) T CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCVec_TxidZ ret_var = ChannelMonitor_get_relevant_txids(&this_arg_conv); ptrArray ret_arr = NULL; - ret_arr = init_ptrArray(ret_var.datalen); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); for (size_t m = 0; m < ret_var.datalen; m++) { - int8_tArray ret_conv_12_arr = init_int8_tArray(32); + int8_tArray ret_conv_12_arr = init_int8_tArray(32, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].data, 32); ret_arr_ptr[m] = ret_conv_12_arr; } @@ -19479,11 +19492,11 @@ uint32_t __attribute__((export_name("TS_ChannelMonitor_current_best_block"))) T this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKBestBlock ret_var = ChannelMonitor_current_best_block(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19497,12 +19510,12 @@ uint32_tArray __attribute__((export_name("TS_ChannelMonitor_get_claimable_balan CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCVec_BalanceZ ret_var = ChannelMonitor_get_claimable_balances(&this_arg_conv); uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); 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]; - uint64_t ret_conv_9_ref = (uint64_t)ret_conv_9_copy; + uintptr_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy; ret_arr_ptr[j] = ret_conv_9_ref; } @@ -19513,13 +19526,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; - void* arg_ptr = (void*)(((uint64_t)arg) & ~1); + ser_ref.data = ser->elems /* XXX ser leaks */; + 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); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_OutPoint_free"))) TS_OutPoint_free(uint32_t this_obj) { @@ -19535,7 +19548,7 @@ int8_tArray __attribute__((export_name("TS_OutPoint_get_txid"))) TS_OutPoint_ge 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *OutPoint_get_txid(&this_ptr_conv), 32); return ret_arr; } @@ -19547,7 +19560,7 @@ void __attribute__((export_name("TS_OutPoint_set_txid"))) TS_OutPoint_set_txid( CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); OutPoint_set_txid(&this_ptr_conv, val_ref); } @@ -19571,13 +19584,13 @@ void __attribute__((export_name("TS_OutPoint_set_index"))) TS_OutPoint_set_inde uint32_t __attribute__((export_name("TS_OutPoint_new"))) TS_OutPoint_new(int8_tArray txid_arg, int16_t index_arg) { LDKThirtyTwoBytes txid_arg_ref; CHECK(txid_arg->arr_len == 32); - memcpy(txid_arg_ref.data, txid_arg->elems, 32); + memcpy(txid_arg_ref.data, txid_arg->elems, 32); FREE(txid_arg); LDKOutPoint ret_var = OutPoint_new(txid_arg_ref, index_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19586,22 +19599,22 @@ uint32_t __attribute__((export_name("TS_OutPoint_new"))) TS_OutPoint_new(int8_t static inline uintptr_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg) { LDKOutPoint ret_var = OutPoint_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint32_t arg) { LDKOutPoint arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = OutPoint_clone_ptr(&arg_conv); + intptr_t ret_val = OutPoint_clone_ptr(&arg_conv); return ret_val; } @@ -19611,11 +19624,11 @@ uint32_t __attribute__((export_name("TS_OutPoint_clone"))) TS_OutPoint_clone(ui orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKOutPoint ret_var = OutPoint_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19649,7 +19662,7 @@ int8_tArray __attribute__((export_name("TS_OutPoint_to_channel_id"))) TS_OutPoi 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(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, OutPoint_to_channel_id(&this_arg_conv).data, 32); return ret_arr; } @@ -19660,7 +19673,7 @@ int8_tArray __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = OutPoint_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -19669,10 +19682,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ"); *ret_conv = OutPoint_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_free"))) TS_DelayedPaymentOutputDescriptor_free(uint32_t this_obj) { @@ -19689,11 +19702,11 @@ uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_outp this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKOutPoint ret_var = DelayedPaymentOutputDescriptor_get_outpoint(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19718,7 +19731,7 @@ int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_p 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, DelayedPaymentOutputDescriptor_get_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -19730,7 +19743,7 @@ void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_per_comm CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); DelayedPaymentOutputDescriptor_set_per_commitment_point(&this_ptr_conv, val_ref); } @@ -19756,10 +19769,10 @@ void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_output") 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKTxOut val_conv = *(LDKTxOut*)(val_ptr); - val_conv = TxOut_clone((LDKTxOut*)(((uint64_t)val) & ~1)); + val_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)val) & ~1)); DelayedPaymentOutputDescriptor_set_output(&this_ptr_conv, val_conv); } @@ -19768,7 +19781,7 @@ int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_r 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, DelayedPaymentOutputDescriptor_get_revocation_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -19780,7 +19793,7 @@ void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_revocati CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); DelayedPaymentOutputDescriptor_set_revocation_pubkey(&this_ptr_conv, val_ref); } @@ -19789,7 +19802,7 @@ int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_c 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *DelayedPaymentOutputDescriptor_get_channel_keys_id(&this_ptr_conv), 32); return ret_arr; } @@ -19801,7 +19814,7 @@ void __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); DelayedPaymentOutputDescriptor_set_channel_keys_id(&this_ptr_conv, val_ref); } @@ -19830,23 +19843,23 @@ uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv); LDKPublicKey per_commitment_point_arg_ref; CHECK(per_commitment_point_arg->arr_len == 33); - memcpy(per_commitment_point_arg_ref.compressed_form, per_commitment_point_arg->elems, 33); - void* output_arg_ptr = (void*)(((uint64_t)output_arg) & ~1); + memcpy(per_commitment_point_arg_ref.compressed_form, per_commitment_point_arg->elems, 33); FREE(per_commitment_point_arg); + void* output_arg_ptr = (void*)(((uintptr_t)output_arg) & ~1); CHECK_ACCESS(output_arg_ptr); LDKTxOut output_arg_conv = *(LDKTxOut*)(output_arg_ptr); - output_arg_conv = TxOut_clone((LDKTxOut*)(((uint64_t)output_arg) & ~1)); + output_arg_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output_arg) & ~1)); LDKPublicKey revocation_pubkey_arg_ref; CHECK(revocation_pubkey_arg->arr_len == 33); - memcpy(revocation_pubkey_arg_ref.compressed_form, revocation_pubkey_arg->elems, 33); + memcpy(revocation_pubkey_arg_ref.compressed_form, revocation_pubkey_arg->elems, 33); FREE(revocation_pubkey_arg); LDKThirtyTwoBytes channel_keys_id_arg_ref; CHECK(channel_keys_id_arg->arr_len == 32); - memcpy(channel_keys_id_arg_ref.data, channel_keys_id_arg->elems, 32); + memcpy(channel_keys_id_arg_ref.data, channel_keys_id_arg->elems, 32); FREE(channel_keys_id_arg); LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_new(outpoint_arg_conv, per_commitment_point_arg_ref, to_self_delay_arg, output_arg_conv, revocation_pubkey_arg_ref, channel_keys_id_arg_ref, channel_value_satoshis_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19855,22 +19868,22 @@ uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new"))) static inline uintptr_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg) { LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint32_t arg) { LDKDelayedPaymentOutputDescriptor arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv); + intptr_t ret_val = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv); return ret_val; } @@ -19880,11 +19893,11 @@ uint32_t __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone")) orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19897,7 +19910,7 @@ int8_tArray __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = DelayedPaymentOutputDescriptor_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -19906,10 +19919,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = DelayedPaymentOutputDescriptor_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_free"))) TS_StaticPaymentOutputDescriptor_free(uint32_t this_obj) { @@ -19926,11 +19939,11 @@ uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_outpo this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKOutPoint ret_var = StaticPaymentOutputDescriptor_get_outpoint(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -19955,10 +19968,10 @@ void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_output")) 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKTxOut val_conv = *(LDKTxOut*)(val_ptr); - val_conv = TxOut_clone((LDKTxOut*)(((uint64_t)val) & ~1)); + val_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)val) & ~1)); StaticPaymentOutputDescriptor_set_output(&this_ptr_conv, val_conv); } @@ -19967,7 +19980,7 @@ int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_ch 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *StaticPaymentOutputDescriptor_get_channel_keys_id(&this_ptr_conv), 32); return ret_arr; } @@ -19979,7 +19992,7 @@ void __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_k CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); StaticPaymentOutputDescriptor_set_channel_keys_id(&this_ptr_conv, val_ref); } @@ -20006,19 +20019,19 @@ uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) T outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv); outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv); - void* output_arg_ptr = (void*)(((uint64_t)output_arg) & ~1); + void* output_arg_ptr = (void*)(((uintptr_t)output_arg) & ~1); CHECK_ACCESS(output_arg_ptr); LDKTxOut output_arg_conv = *(LDKTxOut*)(output_arg_ptr); - output_arg_conv = TxOut_clone((LDKTxOut*)(((uint64_t)output_arg) & ~1)); + output_arg_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output_arg) & ~1)); LDKThirtyTwoBytes channel_keys_id_arg_ref; CHECK(channel_keys_id_arg->arr_len == 32); - memcpy(channel_keys_id_arg_ref.data, channel_keys_id_arg->elems, 32); + memcpy(channel_keys_id_arg_ref.data, channel_keys_id_arg->elems, 32); FREE(channel_keys_id_arg); LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_new(outpoint_arg_conv, output_arg_conv, channel_keys_id_arg_ref, channel_value_satoshis_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20027,22 +20040,22 @@ uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) T static inline uintptr_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg) { LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint32_t arg) { LDKStaticPaymentOutputDescriptor arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv); + intptr_t ret_val = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv); return ret_val; } @@ -20052,11 +20065,11 @@ uint32_t __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone"))) orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20069,7 +20082,7 @@ int8_tArray __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write" obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = StaticPaymentOutputDescriptor_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -20078,15 +20091,15 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ"); *ret_conv = StaticPaymentOutputDescriptor_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_SpendableOutputDescriptor_free"))) TS_SpendableOutputDescriptor_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKSpendableOutputDescriptor this_ptr_conv = *(LDKSpendableOutputDescriptor*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -20096,12 +20109,12 @@ void __attribute__((export_name("TS_SpendableOutputDescriptor_free"))) TS_Spend static inline uintptr_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg) { LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint32_t arg) { LDKSpendableOutputDescriptor* arg_conv = (LDKSpendableOutputDescriptor*)arg; - int64_t ret_val = SpendableOutputDescriptor_clone_ptr(arg_conv); + intptr_t ret_val = SpendableOutputDescriptor_clone_ptr(arg_conv); return ret_val; } @@ -20109,7 +20122,7 @@ uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_clone"))) TS_ LDKSpendableOutputDescriptor* orig_conv = (LDKSpendableOutputDescriptor*)orig; LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -20119,13 +20132,13 @@ uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_output outpoint_conv.is_owned = (outpoint & 1) || (outpoint == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_conv); outpoint_conv = OutPoint_clone(&outpoint_conv); - void* output_ptr = (void*)(((uint64_t)output) & ~1); + void* output_ptr = (void*)(((uintptr_t)output) & ~1); CHECK_ACCESS(output_ptr); LDKTxOut output_conv = *(LDKTxOut*)(output_ptr); - output_conv = TxOut_clone((LDKTxOut*)(((uint64_t)output) & ~1)); + output_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output) & ~1)); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_static_output(outpoint_conv, output_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -20137,7 +20150,7 @@ uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_delayed_payme a_conv = DelayedPaymentOutputDescriptor_clone(&a_conv); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_delayed_payment_output(a_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -20149,14 +20162,14 @@ uint32_t __attribute__((export_name("TS_SpendableOutputDescriptor_static_paymen a_conv = StaticPaymentOutputDescriptor_clone(&a_conv); LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor"); *ret_copy = SpendableOutputDescriptor_static_payment_output(a_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } int8_tArray __attribute__((export_name("TS_SpendableOutputDescriptor_write"))) TS_SpendableOutputDescriptor_write(uint32_t obj) { LDKSpendableOutputDescriptor* obj_conv = (LDKSpendableOutputDescriptor*)obj; LDKCVec_u8Z ret_var = SpendableOutputDescriptor_write(obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -20165,15 +20178,15 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ"); *ret_conv = SpendableOutputDescriptor_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_BaseSign_free"))) TS_BaseSign_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKBaseSign this_ptr_conv = *(LDKBaseSign*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -20183,28 +20196,28 @@ void __attribute__((export_name("TS_BaseSign_free"))) TS_BaseSign_free(uint32_t static inline uintptr_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg) { LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = Sign_clone(arg); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } -int64_t __attribute__((export_name("TS_Sign_clone_ptr"))) TS_Sign_clone_ptr(uint32_t arg) { - void* arg_ptr = (void*)(((uint64_t)arg) & ~1); +intptr_t __attribute__((export_name("TS_Sign_clone_ptr"))) TS_Sign_clone_ptr(uint32_t arg) { + void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); } LDKSign* arg_conv = (LDKSign*)arg_ptr; - int64_t ret_val = Sign_clone_ptr(arg_conv); + intptr_t ret_val = Sign_clone_ptr(arg_conv); return ret_val; } uint32_t __attribute__((export_name("TS_Sign_clone"))) TS_Sign_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uint64_t)orig) & ~1); + void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } LDKSign* orig_conv = (LDKSign*)orig_ptr; LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = Sign_clone(orig_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_Sign_free"))) TS_Sign_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKSign this_ptr_conv = *(LDKSign*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -20213,7 +20226,7 @@ void __attribute__((export_name("TS_Sign_free"))) TS_Sign_free(uint32_t this_pt void __attribute__((export_name("TS_KeysInterface_free"))) TS_KeysInterface_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKKeysInterface this_ptr_conv = *(LDKKeysInterface*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -20233,7 +20246,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_get_funding_key"))) T 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_funding_key(&this_ptr_conv), 32); return ret_arr; } @@ -20245,7 +20258,7 @@ void __attribute__((export_name("TS_InMemorySigner_set_funding_key"))) TS_InMem CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSecretKey val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.bytes, val->elems, 32); + memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_funding_key(&this_ptr_conv, val_ref); } @@ -20254,7 +20267,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_get_revocation_base_k 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_revocation_base_key(&this_ptr_conv), 32); return ret_arr; } @@ -20266,7 +20279,7 @@ void __attribute__((export_name("TS_InMemorySigner_set_revocation_base_key"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSecretKey val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.bytes, val->elems, 32); + memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_revocation_base_key(&this_ptr_conv, val_ref); } @@ -20275,7 +20288,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_get_payment_key"))) T 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_payment_key(&this_ptr_conv), 32); return ret_arr; } @@ -20287,7 +20300,7 @@ void __attribute__((export_name("TS_InMemorySigner_set_payment_key"))) TS_InMem CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSecretKey val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.bytes, val->elems, 32); + memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_payment_key(&this_ptr_conv, val_ref); } @@ -20296,7 +20309,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_get_delayed_payment_b 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_delayed_payment_base_key(&this_ptr_conv), 32); return ret_arr; } @@ -20308,7 +20321,7 @@ void __attribute__((export_name("TS_InMemorySigner_set_delayed_payment_base_key CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSecretKey val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.bytes, val->elems, 32); + memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_delayed_payment_base_key(&this_ptr_conv, val_ref); } @@ -20317,7 +20330,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_get_htlc_base_key"))) 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_htlc_base_key(&this_ptr_conv), 32); return ret_arr; } @@ -20329,7 +20342,7 @@ void __attribute__((export_name("TS_InMemorySigner_set_htlc_base_key"))) TS_InM CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSecretKey val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.bytes, val->elems, 32); + memcpy(val_ref.bytes, val->elems, 32); FREE(val); InMemorySigner_set_htlc_base_key(&this_ptr_conv, val_ref); } @@ -20338,7 +20351,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_get_commitment_seed") 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *InMemorySigner_get_commitment_seed(&this_ptr_conv), 32); return ret_arr; } @@ -20350,28 +20363,28 @@ void __attribute__((export_name("TS_InMemorySigner_set_commitment_seed"))) TS_I CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); InMemorySigner_set_commitment_seed(&this_ptr_conv, val_ref); } static inline uintptr_t InMemorySigner_clone_ptr(LDKInMemorySigner *NONNULL_PTR arg) { LDKInMemorySigner ret_var = InMemorySigner_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint32_t arg) { LDKInMemorySigner arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = InMemorySigner_clone_ptr(&arg_conv); + intptr_t ret_val = InMemorySigner_clone_ptr(&arg_conv); return ret_val; } @@ -20381,11 +20394,11 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySig orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKInMemorySigner ret_var = InMemorySigner_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20395,31 +20408,31 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySig uint32_t __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigner_new(int8_tArray funding_key, int8_tArray revocation_base_key, int8_tArray payment_key, int8_tArray delayed_payment_base_key, int8_tArray htlc_base_key, int8_tArray commitment_seed, int64_t channel_value_satoshis, int8_tArray channel_keys_id) { LDKSecretKey funding_key_ref; CHECK(funding_key->arr_len == 32); - memcpy(funding_key_ref.bytes, funding_key->elems, 32); + memcpy(funding_key_ref.bytes, funding_key->elems, 32); FREE(funding_key); LDKSecretKey revocation_base_key_ref; CHECK(revocation_base_key->arr_len == 32); - memcpy(revocation_base_key_ref.bytes, revocation_base_key->elems, 32); + memcpy(revocation_base_key_ref.bytes, revocation_base_key->elems, 32); FREE(revocation_base_key); LDKSecretKey payment_key_ref; CHECK(payment_key->arr_len == 32); - memcpy(payment_key_ref.bytes, payment_key->elems, 32); + memcpy(payment_key_ref.bytes, payment_key->elems, 32); FREE(payment_key); LDKSecretKey delayed_payment_base_key_ref; CHECK(delayed_payment_base_key->arr_len == 32); - memcpy(delayed_payment_base_key_ref.bytes, delayed_payment_base_key->elems, 32); + memcpy(delayed_payment_base_key_ref.bytes, delayed_payment_base_key->elems, 32); FREE(delayed_payment_base_key); LDKSecretKey htlc_base_key_ref; CHECK(htlc_base_key->arr_len == 32); - memcpy(htlc_base_key_ref.bytes, htlc_base_key->elems, 32); + memcpy(htlc_base_key_ref.bytes, htlc_base_key->elems, 32); FREE(htlc_base_key); LDKThirtyTwoBytes commitment_seed_ref; CHECK(commitment_seed->arr_len == 32); - memcpy(commitment_seed_ref.data, commitment_seed->elems, 32); + memcpy(commitment_seed_ref.data, commitment_seed->elems, 32); FREE(commitment_seed); LDKThirtyTwoBytes channel_keys_id_ref; CHECK(channel_keys_id->arr_len == 32); - memcpy(channel_keys_id_ref.data, channel_keys_id->elems, 32); + memcpy(channel_keys_id_ref.data, channel_keys_id->elems, 32); FREE(channel_keys_id); LDKInMemorySigner ret_var = InMemorySigner_new(funding_key_ref, revocation_base_key_ref, payment_key_ref, delayed_payment_base_key_ref, htlc_base_key_ref, commitment_seed_ref, channel_value_satoshis, channel_keys_id_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20432,11 +20445,11 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_counterparty_pubkeys"))) this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKChannelPublicKeys ret_var = InMemorySigner_counterparty_pubkeys(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20476,11 +20489,11 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_funding_outpoint"))) TS_ this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKOutPoint ret_var = InMemorySigner_funding_outpoint(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20493,11 +20506,11 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_get_channel_parameters") this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKChannelTransactionParameters ret_var = InMemorySigner_get_channel_parameters(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20513,7 +20526,7 @@ jboolean __attribute__((export_name("TS_InMemorySigner_opt_anchors"))) TS_InMem return ret_val; } -uint32_t __attribute__((export_name("TS_InMemorySigner_sign_counterparty_payment_input"))) TS_InMemorySigner_sign_counterparty_payment_input(uint32_t this_arg, int8_tArray spend_tx, int64_t input_idx, uint32_t descriptor) { +uint32_t __attribute__((export_name("TS_InMemorySigner_sign_counterparty_payment_input"))) TS_InMemorySigner_sign_counterparty_payment_input(uint32_t this_arg, int8_tArray spend_tx, intptr_t input_idx, uint32_t descriptor) { LDKInMemorySigner this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; @@ -20521,7 +20534,7 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_sign_counterparty_paymen LDKTransaction spend_tx_ref; spend_tx_ref.datalen = spend_tx->arr_len; spend_tx_ref.data = MALLOC(spend_tx_ref.datalen, "LDKTransaction Bytes"); - memcpy(spend_tx_ref.data, spend_tx->elems, spend_tx_ref.datalen); + memcpy(spend_tx_ref.data, spend_tx->elems, spend_tx_ref.datalen); FREE(spend_tx); spend_tx_ref.data_is_owned = true; LDKStaticPaymentOutputDescriptor descriptor_conv; descriptor_conv.inner = (void*)(descriptor & (~1)); @@ -20529,10 +20542,10 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_sign_counterparty_paymen CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv); LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = InMemorySigner_sign_counterparty_payment_input(&this_arg_conv, spend_tx_ref, input_idx, &descriptor_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } -uint32_t __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input"))) TS_InMemorySigner_sign_dynamic_p2wsh_input(uint32_t this_arg, int8_tArray spend_tx, int64_t input_idx, uint32_t descriptor) { +uint32_t __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input"))) TS_InMemorySigner_sign_dynamic_p2wsh_input(uint32_t this_arg, int8_tArray spend_tx, intptr_t input_idx, uint32_t descriptor) { LDKInMemorySigner this_arg_conv; this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; @@ -20540,7 +20553,7 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input LDKTransaction spend_tx_ref; spend_tx_ref.datalen = spend_tx->arr_len; spend_tx_ref.data = MALLOC(spend_tx_ref.datalen, "LDKTransaction Bytes"); - memcpy(spend_tx_ref.data, spend_tx->elems, spend_tx_ref.datalen); + memcpy(spend_tx_ref.data, spend_tx->elems, spend_tx_ref.datalen); FREE(spend_tx); spend_tx_ref.data_is_owned = true; LDKDelayedPaymentOutputDescriptor descriptor_conv; descriptor_conv.inner = (void*)(descriptor & (~1)); @@ -20548,7 +20561,7 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv); LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ"); *ret_conv = InMemorySigner_sign_dynamic_p2wsh_input(&this_arg_conv, spend_tx_ref, input_idx, &descriptor_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMemorySigner_as_BaseSign(uint32_t this_arg) { @@ -20558,7 +20571,7 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMem CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKBaseSign* ret_ret = MALLOC(sizeof(LDKBaseSign), "LDKBaseSign"); *ret_ret = InMemorySigner_as_BaseSign(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemorySigner_as_Sign(uint32_t this_arg) { @@ -20568,7 +20581,7 @@ uint32_t __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemoryS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign"); *ret_ret = InMemorySigner_as_Sign(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemorySigner_write(uint32_t obj) { @@ -20577,7 +20590,7 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemory obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = InMemorySigner_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -20586,10 +20599,10 @@ int8_tArray __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemory uint32_t __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySigner_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ"); *ret_conv = InMemorySigner_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_KeysManager_free"))) TS_KeysManager_free(uint32_t this_obj) { @@ -20603,14 +20616,14 @@ void __attribute__((export_name("TS_KeysManager_free"))) TS_KeysManager_free(ui uint32_t __attribute__((export_name("TS_KeysManager_new"))) TS_KeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos) { unsigned char seed_arr[32]; CHECK(seed->arr_len == 32); - memcpy(seed_arr, seed->elems, 32); + memcpy(seed_arr, seed->elems, 32); FREE(seed); unsigned char (*seed_ref)[32] = &seed_arr; LDKKeysManager ret_var = KeysManager_new(seed_ref, starting_time_secs, starting_time_nanos); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20624,14 +20637,14 @@ uint32_t __attribute__((export_name("TS_KeysManager_derive_channel_keys"))) TS_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char params_arr[32]; CHECK(params->arr_len == 32); - memcpy(params_arr, params->elems, 32); + memcpy(params_arr, params->elems, 32); FREE(params); unsigned char (*params_ref)[32] = ¶ms_arr; LDKInMemorySigner ret_var = KeysManager_derive_channel_keys(&this_arg_conv, channel_value_satoshis, params_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20649,13 +20662,13 @@ 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; + uint32_t* descriptors_vals = descriptors->elems /* XXX descriptors leaks */; for (size_t b = 0; b < descriptors_constr.datalen; b++) { uint32_t descriptors_conv_27 = descriptors_vals[b]; - void* descriptors_conv_27_ptr = (void*)(((uint64_t)descriptors_conv_27) & ~1); + void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1); CHECK_ACCESS(descriptors_conv_27_ptr); LDKSpendableOutputDescriptor descriptors_conv_27_conv = *(LDKSpendableOutputDescriptor*)(descriptors_conv_27_ptr); - descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uint64_t)descriptors_conv_27) & ~1)); + descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1)); descriptors_constr.data[b] = descriptors_conv_27_conv; } LDKCVec_TxOutZ outputs_constr; @@ -20664,22 +20677,22 @@ uint32_t __attribute__((export_name("TS_KeysManager_spend_spendable_outputs"))) outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements"); else outputs_constr.data = NULL; - uint32_t* outputs_vals = outputs->elems; + uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */; for (size_t h = 0; h < outputs_constr.datalen; h++) { uint32_t outputs_conv_7 = outputs_vals[h]; - void* outputs_conv_7_ptr = (void*)(((uint64_t)outputs_conv_7) & ~1); + void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1); CHECK_ACCESS(outputs_conv_7_ptr); LDKTxOut outputs_conv_7_conv = *(LDKTxOut*)(outputs_conv_7_ptr); - outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uint64_t)outputs_conv_7) & ~1)); + outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1)); outputs_constr.data[h] = outputs_conv_7_conv; } 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"); - memcpy(change_destination_script_ref.data, change_destination_script->elems, change_destination_script_ref.datalen); + memcpy(change_destination_script_ref.data, change_destination_script->elems, change_destination_script_ref.datalen); FREE(change_destination_script); LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ"); *ret_conv = KeysManager_spend_spendable_outputs(&this_arg_conv, descriptors_constr, outputs_constr, change_destination_script_ref, feerate_sat_per_1000_weight); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_KeysManager_as_KeysInterface(uint32_t this_arg) { @@ -20689,7 +20702,7 @@ uint32_t __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_Key CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface"); *ret_ret = KeysManager_as_KeysInterface(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_ChannelManager_free"))) TS_ChannelManager_free(uint32_t this_obj) { @@ -20732,11 +20745,11 @@ uint32_t __attribute__((export_name("TS_ChainParameters_get_best_block"))) TS_C this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKBestBlock ret_var = ChainParameters_get_best_block(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20764,11 +20777,11 @@ uint32_t __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParamet CHECK_INNER_FIELD_ACCESS_OR_NULL(best_block_arg_conv); best_block_arg_conv = BestBlock_clone(&best_block_arg_conv); LDKChainParameters ret_var = ChainParameters_new(network_arg_conv, best_block_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20777,22 +20790,22 @@ uint32_t __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParamet static inline uintptr_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg) { LDKChainParameters ret_var = ChainParameters_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint32_t arg) { LDKChainParameters arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChainParameters_clone_ptr(&arg_conv); + intptr_t ret_val = ChainParameters_clone_ptr(&arg_conv); return ret_val; } @@ -20802,11 +20815,11 @@ uint32_t __attribute__((export_name("TS_ChainParameters_clone"))) TS_ChainParam orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChainParameters ret_var = ChainParameters_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20874,11 +20887,11 @@ void __attribute__((export_name("TS_CounterpartyForwardingInfo_set_cltv_expiry_ uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_new"))) TS_CounterpartyForwardingInfo_new(int32_t fee_base_msat_arg, int32_t fee_proportional_millionths_arg, int16_t cltv_expiry_delta_arg) { LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_new(fee_base_msat_arg, fee_proportional_millionths_arg, cltv_expiry_delta_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20887,22 +20900,22 @@ uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_new"))) TS_C static inline uintptr_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg) { LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint32_t arg) { LDKCounterpartyForwardingInfo arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = CounterpartyForwardingInfo_clone_ptr(&arg_conv); + intptr_t ret_val = CounterpartyForwardingInfo_clone_ptr(&arg_conv); return ret_val; } @@ -20912,11 +20925,11 @@ uint32_t __attribute__((export_name("TS_CounterpartyForwardingInfo_clone"))) TS orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -20936,7 +20949,7 @@ int8_tArray __attribute__((export_name("TS_ChannelCounterparty_get_node_id"))) 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelCounterparty_get_node_id(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -20948,7 +20961,7 @@ void __attribute__((export_name("TS_ChannelCounterparty_set_node_id"))) TS_Chan CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelCounterparty_set_node_id(&this_ptr_conv, val_ref); } @@ -20958,11 +20971,11 @@ uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_features"))) TS this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKInitFeatures ret_var = ChannelCounterparty_get_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21005,12 +21018,12 @@ uint32_t __attribute__((export_name("TS_ChannelCounterparty_get_forwarding_info this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCounterpartyForwardingInfo ret_var = ChannelCounterparty_get_forwarding_info(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21034,7 +21047,7 @@ void __attribute__((export_name("TS_ChannelCounterparty_set_forwarding_info"))) uint32_t __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelCounterparty_new(int8_tArray node_id_arg, uint32_t features_arg, int64_t unspendable_punishment_reserve_arg, uint32_t forwarding_info_arg) { LDKPublicKey node_id_arg_ref; CHECK(node_id_arg->arr_len == 33); - memcpy(node_id_arg_ref.compressed_form, node_id_arg->elems, 33); + memcpy(node_id_arg_ref.compressed_form, node_id_arg->elems, 33); FREE(node_id_arg); LDKInitFeatures features_arg_conv; features_arg_conv.inner = (void*)(features_arg & (~1)); features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); @@ -21046,11 +21059,11 @@ uint32_t __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelC CHECK_INNER_FIELD_ACCESS_OR_NULL(forwarding_info_arg_conv); forwarding_info_arg_conv = CounterpartyForwardingInfo_clone(&forwarding_info_arg_conv); LDKChannelCounterparty ret_var = ChannelCounterparty_new(node_id_arg_ref, features_arg_conv, unspendable_punishment_reserve_arg, forwarding_info_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21059,22 +21072,22 @@ uint32_t __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelC static inline uintptr_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg) { LDKChannelCounterparty ret_var = ChannelCounterparty_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint32_t arg) { LDKChannelCounterparty arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelCounterparty_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelCounterparty_clone_ptr(&arg_conv); return ret_val; } @@ -21084,11 +21097,11 @@ uint32_t __attribute__((export_name("TS_ChannelCounterparty_clone"))) TS_Channe orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelCounterparty ret_var = ChannelCounterparty_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21108,7 +21121,7 @@ int8_tArray __attribute__((export_name("TS_ChannelDetails_get_channel_id"))) TS 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelDetails_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -21120,7 +21133,7 @@ void __attribute__((export_name("TS_ChannelDetails_set_channel_id"))) TS_Channe CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelDetails_set_channel_id(&this_ptr_conv, val_ref); } @@ -21130,11 +21143,11 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_get_counterparty"))) TS_ this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelCounterparty ret_var = ChannelDetails_get_counterparty(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21160,12 +21173,12 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_get_funding_txo"))) TS_C this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKOutPoint ret_var = ChannelDetails_get_funding_txo(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21193,7 +21206,7 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_get_short_channel_id"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_short_channel_id(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -21202,10 +21215,10 @@ void __attribute__((export_name("TS_ChannelDetails_set_short_channel_id"))) TS_ 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*)(((uint64_t)val) & ~1); + 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*)(((uint64_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); ChannelDetails_set_short_channel_id(&this_ptr_conv, val_conv); } @@ -21233,7 +21246,7 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_get_unspendable_punishme CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelDetails_get_unspendable_punishment_reserve(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -21242,10 +21255,10 @@ void __attribute__((export_name("TS_ChannelDetails_set_unspendable_punishment_r 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*)(((uint64_t)val) & ~1); + 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*)(((uint64_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); ChannelDetails_set_unspendable_punishment_reserve(&this_ptr_conv, val_conv); } @@ -21324,7 +21337,7 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_get_confirmations_requir CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = ChannelDetails_get_confirmations_required(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -21333,10 +21346,10 @@ void __attribute__((export_name("TS_ChannelDetails_set_confirmations_required") 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr); - val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uint64_t)val) & ~1)); + val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)val) & ~1)); ChannelDetails_set_confirmations_required(&this_ptr_conv, val_conv); } @@ -21347,7 +21360,7 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_get_force_close_spend_de CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z"); *ret_copy = ChannelDetails_get_force_close_spend_delay(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -21356,10 +21369,10 @@ void __attribute__((export_name("TS_ChannelDetails_set_force_close_spend_delay" 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKCOption_u16Z val_conv = *(LDKCOption_u16Z*)(val_ptr); - val_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uint64_t)val) & ~1)); + val_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uintptr_t)val) & ~1)); ChannelDetails_set_force_close_spend_delay(&this_ptr_conv, val_conv); } @@ -21434,7 +21447,7 @@ void __attribute__((export_name("TS_ChannelDetails_set_is_public"))) TS_Channel 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 short_channel_id_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 inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_funding_locked_arg, jboolean is_usable_arg, jboolean is_public_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKChannelCounterparty counterparty_arg_conv; counterparty_arg_conv.inner = (void*)(counterparty_arg & (~1)); counterparty_arg_conv.is_owned = (counterparty_arg & 1) || (counterparty_arg == 0); @@ -21445,27 +21458,27 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetail funding_txo_arg_conv.is_owned = (funding_txo_arg & 1) || (funding_txo_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_arg_conv); funding_txo_arg_conv = OutPoint_clone(&funding_txo_arg_conv); - void* short_channel_id_arg_ptr = (void*)(((uint64_t)short_channel_id_arg) & ~1); + void* short_channel_id_arg_ptr = (void*)(((uintptr_t)short_channel_id_arg) & ~1); CHECK_ACCESS(short_channel_id_arg_ptr); LDKCOption_u64Z short_channel_id_arg_conv = *(LDKCOption_u64Z*)(short_channel_id_arg_ptr); - short_channel_id_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)short_channel_id_arg) & ~1)); - void* unspendable_punishment_reserve_arg_ptr = (void*)(((uint64_t)unspendable_punishment_reserve_arg) & ~1); + short_channel_id_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id_arg) & ~1)); + void* unspendable_punishment_reserve_arg_ptr = (void*)(((uintptr_t)unspendable_punishment_reserve_arg) & ~1); CHECK_ACCESS(unspendable_punishment_reserve_arg_ptr); LDKCOption_u64Z unspendable_punishment_reserve_arg_conv = *(LDKCOption_u64Z*)(unspendable_punishment_reserve_arg_ptr); - void* confirmations_required_arg_ptr = (void*)(((uint64_t)confirmations_required_arg) & ~1); + void* confirmations_required_arg_ptr = (void*)(((uintptr_t)confirmations_required_arg) & ~1); CHECK_ACCESS(confirmations_required_arg_ptr); LDKCOption_u32Z confirmations_required_arg_conv = *(LDKCOption_u32Z*)(confirmations_required_arg_ptr); - confirmations_required_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uint64_t)confirmations_required_arg) & ~1)); - void* force_close_spend_delay_arg_ptr = (void*)(((uint64_t)force_close_spend_delay_arg) & ~1); + confirmations_required_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)confirmations_required_arg) & ~1)); + void* force_close_spend_delay_arg_ptr = (void*)(((uintptr_t)force_close_spend_delay_arg) & ~1); CHECK_ACCESS(force_close_spend_delay_arg_ptr); LDKCOption_u16Z force_close_spend_delay_arg_conv = *(LDKCOption_u16Z*)(force_close_spend_delay_arg_ptr); - force_close_spend_delay_arg_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uint64_t)force_close_spend_delay_arg) & ~1)); + force_close_spend_delay_arg_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uintptr_t)force_close_spend_delay_arg) & ~1)); LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, short_channel_id_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_funding_locked_arg, is_usable_arg, is_public_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21474,22 +21487,22 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetail static inline uintptr_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg) { LDKChannelDetails ret_var = ChannelDetails_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint32_t arg) { LDKChannelDetails arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelDetails_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelDetails_clone_ptr(&arg_conv); return ret_val; } @@ -21499,11 +21512,11 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDeta orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelDetails ret_var = ChannelDetails_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21512,7 +21525,7 @@ uint32_t __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDeta void __attribute__((export_name("TS_PaymentSendFailure_free"))) TS_PaymentSendFailure_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKPaymentSendFailure this_ptr_conv = *(LDKPaymentSendFailure*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -21522,12 +21535,12 @@ void __attribute__((export_name("TS_PaymentSendFailure_free"))) TS_PaymentSendF static inline uintptr_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg) { LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint32_t arg) { LDKPaymentSendFailure* arg_conv = (LDKPaymentSendFailure*)arg; - int64_t ret_val = PaymentSendFailure_clone_ptr(arg_conv); + intptr_t ret_val = PaymentSendFailure_clone_ptr(arg_conv); return ret_val; } @@ -21535,18 +21548,18 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_clone"))) TS_Payment LDKPaymentSendFailure* orig_conv = (LDKPaymentSendFailure*)orig; LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_PaymentSendFailure_parameter_error"))) TS_PaymentSendFailure_parameter_error(uint32_t a) { - void* a_ptr = (void*)(((uint64_t)a) & ~1); + void* a_ptr = (void*)(((uintptr_t)a) & ~1); CHECK_ACCESS(a_ptr); LDKAPIError a_conv = *(LDKAPIError*)(a_ptr); - a_conv = APIError_clone((LDKAPIError*)(((uint64_t)a) & ~1)); + a_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a) & ~1)); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_parameter_error(a_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -21557,18 +21570,18 @@ 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; + uint32_t* a_vals = a->elems /* XXX a leaks */; for (size_t w = 0; w < a_constr.datalen; w++) { uint32_t a_conv_22 = a_vals[w]; - void* a_conv_22_ptr = (void*)(((uint64_t)a_conv_22) & ~1); + void* a_conv_22_ptr = (void*)(((uintptr_t)a_conv_22) & ~1); CHECK_ACCESS(a_conv_22_ptr); LDKCResult_NoneAPIErrorZ a_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(a_conv_22_ptr); - a_conv_22_conv = CResult_NoneAPIErrorZ_clone((LDKCResult_NoneAPIErrorZ*)(((uint64_t)a_conv_22) & ~1)); + a_conv_22_conv = CResult_NoneAPIErrorZ_clone((LDKCResult_NoneAPIErrorZ*)(((uintptr_t)a_conv_22) & ~1)); a_constr.data[w] = a_conv_22_conv; } LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_path_parameter_error(a_constr); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -21579,18 +21592,18 @@ 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; + uint32_t* a_vals = a->elems /* XXX a leaks */; for (size_t k = 0; k < a_constr.datalen; k++) { uint32_t a_conv_10 = a_vals[k]; - void* a_conv_10_ptr = (void*)(((uint64_t)a_conv_10) & ~1); + void* a_conv_10_ptr = (void*)(((uintptr_t)a_conv_10) & ~1); CHECK_ACCESS(a_conv_10_ptr); LDKAPIError a_conv_10_conv = *(LDKAPIError*)(a_conv_10_ptr); - a_conv_10_conv = APIError_clone((LDKAPIError*)(((uint64_t)a_conv_10) & ~1)); + a_conv_10_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a_conv_10) & ~1)); a_constr.data[k] = a_conv_10_conv; } LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_all_failed_retry_safe(a_constr); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -21601,10 +21614,10 @@ 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; + uint32_t* results_vals = results->elems /* XXX results leaks */; for (size_t w = 0; w < results_constr.datalen; w++) { uint32_t results_conv_22 = results_vals[w]; - void* results_conv_22_ptr = (void*)(((uint64_t)results_conv_22) & ~1); + void* results_conv_22_ptr = (void*)(((uintptr_t)results_conv_22) & ~1); CHECK_ACCESS(results_conv_22_ptr); LDKCResult_NoneAPIErrorZ results_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(results_conv_22_ptr); results_constr.data[w] = results_conv_22_conv; @@ -21616,27 +21629,27 @@ uint32_t __attribute__((export_name("TS_PaymentSendFailure_partial_failure"))) failed_paths_retry_conv = RouteParameters_clone(&failed_paths_retry_conv); LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); - memcpy(payment_id_ref.data, payment_id->elems, 32); + memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure"); *ret_copy = PaymentSendFailure_partial_failure(results_constr, failed_paths_retry_conv, payment_id_ref); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManager_new(uint32_t fee_est, uint32_t chain_monitor, uint32_t tx_broadcaster, uint32_t logger, uint32_t keys_manager, uint32_t config, uint32_t params) { - void* fee_est_ptr = (void*)(((uint64_t)fee_est) & ~1); + void* fee_est_ptr = (void*)(((uintptr_t)fee_est) & ~1); CHECK_ACCESS(fee_est_ptr); LDKFeeEstimator fee_est_conv = *(LDKFeeEstimator*)(fee_est_ptr); - void* chain_monitor_ptr = (void*)(((uint64_t)chain_monitor) & ~1); + void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1); CHECK_ACCESS(chain_monitor_ptr); LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr); - void* tx_broadcaster_ptr = (void*)(((uint64_t)tx_broadcaster) & ~1); + void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1); CHECK_ACCESS(tx_broadcaster_ptr); LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); - void* keys_manager_ptr = (void*)(((uint64_t)keys_manager) & ~1); + void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); LDKUserConfig config_conv; @@ -21650,11 +21663,11 @@ uint32_t __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManage CHECK_INNER_FIELD_ACCESS_OR_NULL(params_conv); params_conv = ChainParameters_clone(¶ms_conv); LDKChannelManager ret_var = ChannelManager_new(fee_est_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, keys_manager_conv, config_conv, params_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21667,11 +21680,11 @@ uint32_t __attribute__((export_name("TS_ChannelManager_get_current_default_conf this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKUserConfig ret_var = ChannelManager_get_current_default_configuration(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -21685,7 +21698,7 @@ uint32_t __attribute__((export_name("TS_ChannelManager_create_channel"))) TS_Ch CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKPublicKey their_network_key_ref; CHECK(their_network_key->arr_len == 33); - memcpy(their_network_key_ref.compressed_form, their_network_key->elems, 33); + memcpy(their_network_key_ref.compressed_form, their_network_key->elems, 33); FREE(their_network_key); LDKUserConfig override_config_conv; override_config_conv.inner = (void*)(override_config & (~1)); override_config_conv.is_owned = (override_config & 1) || (override_config == 0); @@ -21693,7 +21706,7 @@ uint32_t __attribute__((export_name("TS_ChannelManager_create_channel"))) TS_Ch override_config_conv = UserConfig_clone(&override_config_conv); LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ"); *ret_conv = ChannelManager_create_channel(&this_arg_conv, their_network_key_ref, channel_value_satoshis, push_msat, user_channel_id, override_config_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) TS_ChannelManager_list_channels(uint32_t this_arg) { @@ -21703,15 +21716,15 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_channels"))) T CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_channels(&this_arg_conv); uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint64_t ret_conv_16_ref = 0; - CHECK((((uint64_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_16_ref = 0; + CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uint64_t)ret_conv_16_var.inner; + ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; if (ret_conv_16_var.is_owned) { ret_conv_16_ref |= 1; } @@ -21729,15 +21742,15 @@ uint32_tArray __attribute__((export_name("TS_ChannelManager_list_usable_channel CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_usable_channels(&this_arg_conv); uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t q = 0; q < ret_var.datalen; q++) { LDKChannelDetails ret_conv_16_var = ret_var.data[q]; - uint64_t ret_conv_16_ref = 0; - CHECK((((uint64_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_16_ref = 0; + CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uint64_t)ret_conv_16_var.inner; + ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; if (ret_conv_16_var.is_owned) { ret_conv_16_ref |= 1; } @@ -21755,11 +21768,11 @@ uint32_t __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_Cha 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); + memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); unsigned char (*channel_id_ref)[32] = &channel_id_arr; LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_close_channel(&this_arg_conv, channel_id_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChannelManager_close_channel_with_target_feerate"))) TS_ChannelManager_close_channel_with_target_feerate(uint32_t this_arg, int8_tArray channel_id, int32_t target_feerate_sats_per_1000_weight) { @@ -21769,11 +21782,11 @@ uint32_t __attribute__((export_name("TS_ChannelManager_close_channel_with_targe 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); + memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); unsigned char (*channel_id_ref)[32] = &channel_id_arr; LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_close_channel_with_target_feerate(&this_arg_conv, channel_id_ref, target_feerate_sats_per_1000_weight); - return (uint64_t)ret_conv; + return (uintptr_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) { @@ -21783,11 +21796,11 @@ uint32_t __attribute__((export_name("TS_ChannelManager_force_close_channel"))) 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); + memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id); unsigned char (*channel_id_ref)[32] = &channel_id_arr; LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_force_close_channel(&this_arg_conv, channel_id_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_ChannelManager_force_close_all_channels"))) TS_ChannelManager_force_close_all_channels(uint32_t this_arg) { @@ -21809,13 +21822,13 @@ uint32_t __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_Chan CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); - memcpy(payment_hash_ref.data, payment_hash->elems, 32); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); LDKThirtyTwoBytes payment_secret_ref; CHECK(payment_secret->arr_len == 32); - memcpy(payment_secret_ref.data, payment_secret->elems, 32); + memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret); LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ"); *ret_conv = ChannelManager_send_payment(&this_arg_conv, &route_conv, payment_hash_ref, payment_secret_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_ChannelManager_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) { @@ -21829,10 +21842,10 @@ uint32_t __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_Cha CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); - memcpy(payment_id_ref.data, payment_id->elems, 32); + memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ"); *ret_conv = ChannelManager_retry_payment(&this_arg_conv, &route_conv, payment_id_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_ChannelManager_abandon_payment"))) TS_ChannelManager_abandon_payment(uint32_t this_arg, int8_tArray payment_id) { @@ -21842,7 +21855,7 @@ void __attribute__((export_name("TS_ChannelManager_abandon_payment"))) TS_Chann CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKThirtyTwoBytes payment_id_ref; CHECK(payment_id->arr_len == 32); - memcpy(payment_id_ref.data, payment_id->elems, 32); + memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id); ChannelManager_abandon_payment(&this_arg_conv, payment_id_ref); } @@ -21857,10 +21870,10 @@ uint32_t __attribute__((export_name("TS_ChannelManager_send_spontaneous_payment CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv); LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); - memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); + memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ"); *ret_conv = ChannelManager_send_spontaneous_payment(&this_arg_conv, &route_conv, payment_preimage_ref); - return (uint64_t)ret_conv; + return (uintptr_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 funding_transaction) { @@ -21870,16 +21883,16 @@ uint32_t __attribute__((export_name("TS_ChannelManager_funding_transaction_gene CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char temporary_channel_id_arr[32]; CHECK(temporary_channel_id->arr_len == 32); - memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); + memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id); unsigned char (*temporary_channel_id_ref)[32] = &temporary_channel_id_arr; LDKTransaction funding_transaction_ref; funding_transaction_ref.datalen = funding_transaction->arr_len; funding_transaction_ref.data = MALLOC(funding_transaction_ref.datalen, "LDKTransaction Bytes"); - memcpy(funding_transaction_ref.data, funding_transaction->elems, funding_transaction_ref.datalen); + memcpy(funding_transaction_ref.data, funding_transaction->elems, funding_transaction_ref.datalen); FREE(funding_transaction); funding_transaction_ref.data_is_owned = true; LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ"); *ret_conv = ChannelManager_funding_transaction_generated(&this_arg_conv, temporary_channel_id_ref, funding_transaction_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement"))) TS_ChannelManager_broadcast_node_announcement(uint32_t this_arg, int8_tArray rgb, int8_tArray alias, uint32_tArray addresses) { @@ -21889,20 +21902,20 @@ void __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement" CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKThreeBytes rgb_ref; CHECK(rgb->arr_len == 3); - memcpy(rgb_ref.data, rgb->elems, 3); + memcpy(rgb_ref.data, rgb->elems, 3); FREE(rgb); LDKThirtyTwoBytes alias_ref; CHECK(alias->arr_len == 32); - memcpy(alias_ref.data, alias->elems, 32); + memcpy(alias_ref.data, alias->elems, 32); FREE(alias); LDKCVec_NetAddressZ addresses_constr; addresses_constr.datalen = addresses->arr_len; if (addresses_constr.datalen > 0) addresses_constr.data = MALLOC(addresses_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements"); else addresses_constr.data = NULL; - uint32_t* addresses_vals = addresses->elems; + uint32_t* addresses_vals = addresses->elems /* XXX addresses leaks */; for (size_t m = 0; m < addresses_constr.datalen; m++) { uint32_t addresses_conv_12 = addresses_vals[m]; - void* addresses_conv_12_ptr = (void*)(((uint64_t)addresses_conv_12) & ~1); + void* addresses_conv_12_ptr = (void*)(((uintptr_t)addresses_conv_12) & ~1); CHECK_ACCESS(addresses_conv_12_ptr); LDKNetAddress addresses_conv_12_conv = *(LDKNetAddress*)(addresses_conv_12_ptr); addresses_constr.data[m] = addresses_conv_12_conv; @@ -21933,7 +21946,7 @@ jboolean __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char payment_hash_arr[32]; CHECK(payment_hash->arr_len == 32); - memcpy(payment_hash_arr, payment_hash->elems, 32); + memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash); unsigned char (*payment_hash_ref)[32] = &payment_hash_arr; jboolean ret_val = ChannelManager_fail_htlc_backwards(&this_arg_conv, payment_hash_ref); return ret_val; @@ -21946,7 +21959,7 @@ jboolean __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_Chann CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKThirtyTwoBytes payment_preimage_ref; CHECK(payment_preimage->arr_len == 32); - memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); + memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage); jboolean ret_val = ChannelManager_claim_funds(&this_arg_conv, payment_preimage_ref); return ret_val; } @@ -21956,7 +21969,7 @@ int8_tArray __attribute__((export_name("TS_ChannelManager_get_our_node_id"))) T 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); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelManager_get_our_node_id(&this_arg_conv).compressed_form, 33); return ret_arr; } @@ -21966,13 +21979,13 @@ uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment") this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* min_value_msat_ptr = (void*)(((uint64_t)min_value_msat) & ~1); + void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); CHECK_ACCESS(min_value_msat_ptr); LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr); - min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ"); *ret_conv = ChannelManager_create_inbound_payment(&this_arg_conv, min_value_msat_conv, invoice_expiry_delta_secs); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_legacy"))) TS_ChannelManager_create_inbound_payment_legacy(uint32_t this_arg, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) { @@ -21980,13 +21993,13 @@ uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_l this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* min_value_msat_ptr = (void*)(((uint64_t)min_value_msat) & ~1); + void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); CHECK_ACCESS(min_value_msat_ptr); LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr); - min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1)); LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ"); *ret_conv = ChannelManager_create_inbound_payment_legacy(&this_arg_conv, min_value_msat_conv, invoice_expiry_delta_secs); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash"))) TS_ChannelManager_create_inbound_payment_for_hash(uint32_t this_arg, int8_tArray payment_hash, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) { @@ -21996,14 +22009,14 @@ uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_f CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); - memcpy(payment_hash_ref.data, payment_hash->elems, 32); - void* min_value_msat_ptr = (void*)(((uint64_t)min_value_msat) & ~1); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); CHECK_ACCESS(min_value_msat_ptr); LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr); - min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1)); LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ"); *ret_conv = ChannelManager_create_inbound_payment_for_hash(&this_arg_conv, payment_hash_ref, min_value_msat_conv, invoice_expiry_delta_secs); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash_legacy"))) TS_ChannelManager_create_inbound_payment_for_hash_legacy(uint32_t this_arg, int8_tArray payment_hash, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) { @@ -22013,14 +22026,14 @@ uint32_t __attribute__((export_name("TS_ChannelManager_create_inbound_payment_f CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); - memcpy(payment_hash_ref.data, payment_hash->elems, 32); - void* min_value_msat_ptr = (void*)(((uint64_t)min_value_msat) & ~1); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); + void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1); CHECK_ACCESS(min_value_msat_ptr); LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr); - min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1)); + min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1)); LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ"); *ret_conv = ChannelManager_create_inbound_payment_for_hash_legacy(&this_arg_conv, payment_hash_ref, min_value_msat_conv, invoice_expiry_delta_secs); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChannelManager_get_payment_preimage"))) TS_ChannelManager_get_payment_preimage(uint32_t this_arg, int8_tArray payment_hash, int8_tArray payment_secret) { @@ -22030,13 +22043,13 @@ uint32_t __attribute__((export_name("TS_ChannelManager_get_payment_preimage"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKThirtyTwoBytes payment_hash_ref; CHECK(payment_hash->arr_len == 32); - memcpy(payment_hash_ref.data, payment_hash->elems, 32); + memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash); LDKThirtyTwoBytes payment_secret_ref; CHECK(payment_secret->arr_len == 32); - memcpy(payment_secret_ref.data, payment_secret->elems, 32); + memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret); LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ"); *ret_conv = ChannelManager_get_payment_preimage(&this_arg_conv, payment_hash_ref, payment_secret_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ChannelManager_as_MessageSendEventsProvider"))) TS_ChannelManager_as_MessageSendEventsProvider(uint32_t this_arg) { @@ -22046,7 +22059,7 @@ uint32_t __attribute__((export_name("TS_ChannelManager_as_MessageSendEventsProv CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = ChannelManager_as_MessageSendEventsProvider(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS_ChannelManager_as_EventsProvider(uint32_t this_arg) { @@ -22056,7 +22069,7 @@ uint32_t __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider"); *ret_ret = ChannelManager_as_EventsProvider(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_ChannelManager_as_Listen(uint32_t this_arg) { @@ -22066,7 +22079,7 @@ uint32_t __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_Channel CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen"); *ret_ret = ChannelManager_as_Listen(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_ChannelManager_as_Confirm(uint32_t this_arg) { @@ -22076,7 +22089,7 @@ uint32_t __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_Channe CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm"); *ret_ret = ChannelManager_as_Confirm(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_ChannelManager_await_persistable_update"))) TS_ChannelManager_await_persistable_update(uint32_t this_arg) { @@ -22093,11 +22106,11 @@ uint32_t __attribute__((export_name("TS_ChannelManager_current_best_block"))) T this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKBestBlock ret_var = ChannelManager_current_best_block(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22111,7 +22124,7 @@ uint32_t __attribute__((export_name("TS_ChannelManager_as_ChannelMessageHandler CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *ret_ret = ChannelManager_as_ChannelMessageHandler(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelManager_write(uint32_t obj) { @@ -22120,7 +22133,7 @@ int8_tArray __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelM obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelManager_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -22140,7 +22153,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_keys_manager this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); // WARNING: This object doesn't live past this scope, needs clone! - uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv)) | 1; + uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv)) | 1; return ret_ret; } @@ -22149,7 +22162,7 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager"))) 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKKeysInterface val_conv = *(LDKKeysInterface*)(val_ptr); ChannelManagerReadArgs_set_keys_manager(&this_ptr_conv, val_conv); @@ -22161,7 +22174,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_fee_estimato this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); // WARNING: This object doesn't live past this scope, needs clone! - uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv)) | 1; + uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv)) | 1; return ret_ret; } @@ -22170,7 +22183,7 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator")) 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKFeeEstimator val_conv = *(LDKFeeEstimator*)(val_ptr); ChannelManagerReadArgs_set_fee_estimator(&this_ptr_conv, val_conv); @@ -22182,7 +22195,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_chain_monito this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); // WARNING: This object doesn't live past this scope, needs clone! - uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv)) | 1; + uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv)) | 1; return ret_ret; } @@ -22191,7 +22204,7 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor")) 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKWatch val_conv = *(LDKWatch*)(val_ptr); ChannelManagerReadArgs_set_chain_monitor(&this_ptr_conv, val_conv); @@ -22203,7 +22216,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_tx_broadcast this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); // WARNING: This object doesn't live past this scope, needs clone! - uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv)) | 1; + uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv)) | 1; return ret_ret; } @@ -22212,7 +22225,7 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster") 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)(val_ptr); ChannelManagerReadArgs_set_tx_broadcaster(&this_ptr_conv, val_conv); @@ -22224,7 +22237,7 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_logger"))) T this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); // WARNING: This object doesn't live past this scope, needs clone! - uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_logger(&this_ptr_conv)) | 1; + uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_logger(&this_ptr_conv)) | 1; return ret_ret; } @@ -22233,7 +22246,7 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_Ch 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKLogger val_conv = *(LDKLogger*)(val_ptr); ChannelManagerReadArgs_set_logger(&this_ptr_conv, val_conv); @@ -22245,11 +22258,11 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_get_default_conf this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKUserConfig ret_var = ChannelManagerReadArgs_get_default_config(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22270,19 +22283,19 @@ void __attribute__((export_name("TS_ChannelManagerReadArgs_set_default_config") } uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_ChannelManagerReadArgs_new(uint32_t keys_manager, uint32_t fee_estimator, uint32_t chain_monitor, uint32_t tx_broadcaster, uint32_t logger, uint32_t default_config, uint32_tArray channel_monitors) { - void* keys_manager_ptr = (void*)(((uint64_t)keys_manager) & ~1); + void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1); CHECK_ACCESS(keys_manager_ptr); LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr); - void* fee_estimator_ptr = (void*)(((uint64_t)fee_estimator) & ~1); + void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1); CHECK_ACCESS(fee_estimator_ptr); LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr); - void* chain_monitor_ptr = (void*)(((uint64_t)chain_monitor) & ~1); + void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1); CHECK_ACCESS(chain_monitor_ptr); LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr); - void* tx_broadcaster_ptr = (void*)(((uint64_t)tx_broadcaster) & ~1); + void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1); CHECK_ACCESS(tx_broadcaster_ptr); LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr); - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); LDKUserConfig default_config_conv; @@ -22296,7 +22309,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; + uint32_t* channel_monitors_vals = channel_monitors->elems /* XXX channel_monitors leaks */; 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; @@ -22306,11 +22319,11 @@ uint32_t __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann channel_monitors_constr.data[q] = channel_monitors_conv_16_conv; } LDKChannelManagerReadArgs ret_var = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_constr); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22320,7 +22333,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKChannelManagerReadArgs arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = (arg & 1) || (arg == 0); @@ -22328,7 +22341,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); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(uint32_t this_obj) { @@ -22341,22 +22354,22 @@ void __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(ui static inline uintptr_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg) { LDKDecodeError ret_var = DecodeError_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint32_t arg) { LDKDecodeError arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = DecodeError_clone_ptr(&arg_conv); + intptr_t ret_val = DecodeError_clone_ptr(&arg_conv); return ret_val; } @@ -22366,11 +22379,11 @@ uint32_t __attribute__((export_name("TS_DecodeError_clone"))) TS_DecodeError_cl orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKDecodeError ret_var = DecodeError_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22391,11 +22404,11 @@ uint32_t __attribute__((export_name("TS_Init_get_features"))) TS_Init_get_featu this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKInitFeatures ret_var = Init_get_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22422,11 +22435,11 @@ uint32_t __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint32_t featu CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv); features_arg_conv = InitFeatures_clone(&features_arg_conv); LDKInit ret_var = Init_new(features_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22435,22 +22448,22 @@ uint32_t __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint32_t featu static inline uintptr_t Init_clone_ptr(LDKInit *NONNULL_PTR arg) { LDKInit ret_var = Init_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint32_t arg) { LDKInit arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = Init_clone_ptr(&arg_conv); + intptr_t ret_val = Init_clone_ptr(&arg_conv); return ret_val; } @@ -22460,11 +22473,11 @@ uint32_t __attribute__((export_name("TS_Init_clone"))) TS_Init_clone(uint32_t o orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKInit ret_var = Init_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22484,7 +22497,7 @@ int8_tArray __attribute__((export_name("TS_ErrorMessage_get_channel_id"))) TS_E 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ErrorMessage_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -22496,7 +22509,7 @@ void __attribute__((export_name("TS_ErrorMessage_set_channel_id"))) TS_ErrorMes CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); ErrorMessage_set_channel_id(&this_ptr_conv, val_ref); } @@ -22523,14 +22536,14 @@ void __attribute__((export_name("TS_ErrorMessage_set_data"))) TS_ErrorMessage_s uint32_t __attribute__((export_name("TS_ErrorMessage_new"))) TS_ErrorMessage_new(int8_tArray channel_id_arg, jstring data_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKStr data_arg_conv = str_ref_to_owned_c(data_arg); LDKErrorMessage ret_var = ErrorMessage_new(channel_id_arg_ref, data_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22539,22 +22552,22 @@ uint32_t __attribute__((export_name("TS_ErrorMessage_new"))) TS_ErrorMessage_ne static inline uintptr_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg) { LDKErrorMessage ret_var = ErrorMessage_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint32_t arg) { LDKErrorMessage arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ErrorMessage_clone_ptr(&arg_conv); + intptr_t ret_val = ErrorMessage_clone_ptr(&arg_conv); return ret_val; } @@ -22564,11 +22577,11 @@ uint32_t __attribute__((export_name("TS_ErrorMessage_clone"))) TS_ErrorMessage_ orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKErrorMessage ret_var = ErrorMessage_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22619,11 +22632,11 @@ void __attribute__((export_name("TS_Ping_set_byteslen"))) TS_Ping_set_byteslen( uint32_t __attribute__((export_name("TS_Ping_new"))) TS_Ping_new(int16_t ponglen_arg, int16_t byteslen_arg) { LDKPing ret_var = Ping_new(ponglen_arg, byteslen_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22632,22 +22645,22 @@ uint32_t __attribute__((export_name("TS_Ping_new"))) TS_Ping_new(int16_t pongle static inline uintptr_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg) { LDKPing ret_var = Ping_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint32_t arg) { LDKPing arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = Ping_clone_ptr(&arg_conv); + intptr_t ret_val = Ping_clone_ptr(&arg_conv); return ret_val; } @@ -22657,11 +22670,11 @@ uint32_t __attribute__((export_name("TS_Ping_clone"))) TS_Ping_clone(uint32_t o orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKPing ret_var = Ping_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22695,11 +22708,11 @@ void __attribute__((export_name("TS_Pong_set_byteslen"))) TS_Pong_set_byteslen( uint32_t __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t byteslen_arg) { LDKPong ret_var = Pong_new(byteslen_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22708,22 +22721,22 @@ uint32_t __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t bytesl static inline uintptr_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg) { LDKPong ret_var = Pong_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint32_t arg) { LDKPong arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = Pong_clone_ptr(&arg_conv); + intptr_t ret_val = Pong_clone_ptr(&arg_conv); return ret_val; } @@ -22733,11 +22746,11 @@ uint32_t __attribute__((export_name("TS_Pong_clone"))) TS_Pong_clone(uint32_t o orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKPong ret_var = Pong_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -22757,7 +22770,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_chain_hash"))) TS_Op 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *OpenChannel_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -22769,7 +22782,7 @@ void __attribute__((export_name("TS_OpenChannel_set_chain_hash"))) TS_OpenChann CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); OpenChannel_set_chain_hash(&this_ptr_conv, val_ref); } @@ -22778,7 +22791,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_temporary_channel_id 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *OpenChannel_get_temporary_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -22790,7 +22803,7 @@ void __attribute__((export_name("TS_OpenChannel_set_temporary_channel_id"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); OpenChannel_set_temporary_channel_id(&this_ptr_conv, val_ref); } @@ -22952,7 +22965,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_funding_pubkey"))) T 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, OpenChannel_get_funding_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -22964,7 +22977,7 @@ void __attribute__((export_name("TS_OpenChannel_set_funding_pubkey"))) TS_OpenC CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_funding_pubkey(&this_ptr_conv, val_ref); } @@ -22973,7 +22986,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_revocation_basepoint 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, OpenChannel_get_revocation_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -22985,7 +22998,7 @@ void __attribute__((export_name("TS_OpenChannel_set_revocation_basepoint"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_revocation_basepoint(&this_ptr_conv, val_ref); } @@ -22994,7 +23007,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_payment_point"))) TS 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, OpenChannel_get_payment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23006,7 +23019,7 @@ void __attribute__((export_name("TS_OpenChannel_set_payment_point"))) TS_OpenCh CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_payment_point(&this_ptr_conv, val_ref); } @@ -23015,7 +23028,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_delayed_payment_base 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, OpenChannel_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23027,7 +23040,7 @@ void __attribute__((export_name("TS_OpenChannel_set_delayed_payment_basepoint") CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } @@ -23036,7 +23049,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_htlc_basepoint"))) T 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, OpenChannel_get_htlc_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23048,7 +23061,7 @@ void __attribute__((export_name("TS_OpenChannel_set_htlc_basepoint"))) TS_OpenC CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_htlc_basepoint(&this_ptr_conv, val_ref); } @@ -23057,7 +23070,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_get_first_per_commitment 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, OpenChannel_get_first_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23069,7 +23082,7 @@ void __attribute__((export_name("TS_OpenChannel_set_first_per_commitment_point" CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); OpenChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref); } @@ -23096,12 +23109,12 @@ uint32_t __attribute__((export_name("TS_OpenChannel_get_channel_type"))) TS_Ope this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelTypeFeatures ret_var = OpenChannel_get_channel_type(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23124,22 +23137,22 @@ void __attribute__((export_name("TS_OpenChannel_set_channel_type"))) TS_OpenCha static inline uintptr_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg) { LDKOpenChannel ret_var = OpenChannel_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint32_t arg) { LDKOpenChannel arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = OpenChannel_clone_ptr(&arg_conv); + intptr_t ret_val = OpenChannel_clone_ptr(&arg_conv); return ret_val; } @@ -23149,11 +23162,11 @@ uint32_t __attribute__((export_name("TS_OpenChannel_clone"))) TS_OpenChannel_cl orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKOpenChannel ret_var = OpenChannel_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23173,7 +23186,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_get_temporary_channel_ 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *AcceptChannel_get_temporary_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -23185,7 +23198,7 @@ void __attribute__((export_name("TS_AcceptChannel_set_temporary_channel_id"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); AcceptChannel_set_temporary_channel_id(&this_ptr_conv, val_ref); } @@ -23313,7 +23326,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_get_funding_pubkey"))) 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, AcceptChannel_get_funding_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23325,7 +23338,7 @@ void __attribute__((export_name("TS_AcceptChannel_set_funding_pubkey"))) TS_Acc CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_funding_pubkey(&this_ptr_conv, val_ref); } @@ -23334,7 +23347,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_get_revocation_basepoi 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, AcceptChannel_get_revocation_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23346,7 +23359,7 @@ void __attribute__((export_name("TS_AcceptChannel_set_revocation_basepoint"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_revocation_basepoint(&this_ptr_conv, val_ref); } @@ -23355,7 +23368,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_get_payment_point"))) 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, AcceptChannel_get_payment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23367,7 +23380,7 @@ void __attribute__((export_name("TS_AcceptChannel_set_payment_point"))) TS_Acce CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_payment_point(&this_ptr_conv, val_ref); } @@ -23376,7 +23389,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_get_delayed_payment_ba 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, AcceptChannel_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23388,7 +23401,7 @@ void __attribute__((export_name("TS_AcceptChannel_set_delayed_payment_basepoint CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } @@ -23397,7 +23410,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_get_htlc_basepoint"))) 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, AcceptChannel_get_htlc_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23409,7 +23422,7 @@ void __attribute__((export_name("TS_AcceptChannel_set_htlc_basepoint"))) TS_Acc CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_htlc_basepoint(&this_ptr_conv, val_ref); } @@ -23418,7 +23431,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_get_first_per_commitme 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, AcceptChannel_get_first_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23430,28 +23443,28 @@ void __attribute__((export_name("TS_AcceptChannel_set_first_per_commitment_poin CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); AcceptChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref); } static inline uintptr_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg) { LDKAcceptChannel ret_var = AcceptChannel_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint32_t arg) { LDKAcceptChannel arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = AcceptChannel_clone_ptr(&arg_conv); + intptr_t ret_val = AcceptChannel_clone_ptr(&arg_conv); return ret_val; } @@ -23461,11 +23474,11 @@ uint32_t __attribute__((export_name("TS_AcceptChannel_clone"))) TS_AcceptChanne orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKAcceptChannel ret_var = AcceptChannel_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23485,7 +23498,7 @@ int8_tArray __attribute__((export_name("TS_FundingCreated_get_temporary_channel 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingCreated_get_temporary_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -23497,7 +23510,7 @@ void __attribute__((export_name("TS_FundingCreated_set_temporary_channel_id"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); FundingCreated_set_temporary_channel_id(&this_ptr_conv, val_ref); } @@ -23506,7 +23519,7 @@ int8_tArray __attribute__((export_name("TS_FundingCreated_get_funding_txid"))) 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingCreated_get_funding_txid(&this_ptr_conv), 32); return ret_arr; } @@ -23518,7 +23531,7 @@ void __attribute__((export_name("TS_FundingCreated_set_funding_txid"))) TS_Fund CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); FundingCreated_set_funding_txid(&this_ptr_conv, val_ref); } @@ -23544,7 +23557,7 @@ int8_tArray __attribute__((export_name("TS_FundingCreated_get_signature"))) TS_ 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, FundingCreated_get_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -23556,26 +23569,26 @@ void __attribute__((export_name("TS_FundingCreated_set_signature"))) TS_Funding CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); FundingCreated_set_signature(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_FundingCreated_new"))) TS_FundingCreated_new(int8_tArray temporary_channel_id_arg, int8_tArray funding_txid_arg, int16_t funding_output_index_arg, int8_tArray signature_arg) { LDKThirtyTwoBytes temporary_channel_id_arg_ref; CHECK(temporary_channel_id_arg->arr_len == 32); - memcpy(temporary_channel_id_arg_ref.data, temporary_channel_id_arg->elems, 32); + memcpy(temporary_channel_id_arg_ref.data, temporary_channel_id_arg->elems, 32); FREE(temporary_channel_id_arg); LDKThirtyTwoBytes funding_txid_arg_ref; CHECK(funding_txid_arg->arr_len == 32); - memcpy(funding_txid_arg_ref.data, funding_txid_arg->elems, 32); + memcpy(funding_txid_arg_ref.data, funding_txid_arg->elems, 32); FREE(funding_txid_arg); LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 64); - memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); + memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg); LDKFundingCreated ret_var = FundingCreated_new(temporary_channel_id_arg_ref, funding_txid_arg_ref, funding_output_index_arg, signature_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23584,22 +23597,22 @@ uint32_t __attribute__((export_name("TS_FundingCreated_new"))) TS_FundingCreate static inline uintptr_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg) { LDKFundingCreated ret_var = FundingCreated_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint32_t arg) { LDKFundingCreated arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = FundingCreated_clone_ptr(&arg_conv); + intptr_t ret_val = FundingCreated_clone_ptr(&arg_conv); return ret_val; } @@ -23609,11 +23622,11 @@ uint32_t __attribute__((export_name("TS_FundingCreated_clone"))) TS_FundingCrea orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKFundingCreated ret_var = FundingCreated_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23633,7 +23646,7 @@ int8_tArray __attribute__((export_name("TS_FundingSigned_get_channel_id"))) TS_ 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -23645,7 +23658,7 @@ void __attribute__((export_name("TS_FundingSigned_set_channel_id"))) TS_Funding CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); FundingSigned_set_channel_id(&this_ptr_conv, val_ref); } @@ -23654,7 +23667,7 @@ int8_tArray __attribute__((export_name("TS_FundingSigned_get_signature"))) TS_F 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, FundingSigned_get_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -23666,23 +23679,23 @@ void __attribute__((export_name("TS_FundingSigned_set_signature"))) TS_FundingS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); FundingSigned_set_signature(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_FundingSigned_new"))) TS_FundingSigned_new(int8_tArray channel_id_arg, int8_tArray signature_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 64); - memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); + memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg); LDKFundingSigned ret_var = FundingSigned_new(channel_id_arg_ref, signature_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23691,22 +23704,22 @@ uint32_t __attribute__((export_name("TS_FundingSigned_new"))) TS_FundingSigned_ static inline uintptr_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg) { LDKFundingSigned ret_var = FundingSigned_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint32_t arg) { LDKFundingSigned arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = FundingSigned_clone_ptr(&arg_conv); + intptr_t ret_val = FundingSigned_clone_ptr(&arg_conv); return ret_val; } @@ -23716,11 +23729,11 @@ uint32_t __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigne orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKFundingSigned ret_var = FundingSigned_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23740,7 +23753,7 @@ int8_tArray __attribute__((export_name("TS_FundingLocked_get_channel_id"))) TS_ 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *FundingLocked_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -23752,7 +23765,7 @@ void __attribute__((export_name("TS_FundingLocked_set_channel_id"))) TS_Funding CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); FundingLocked_set_channel_id(&this_ptr_conv, val_ref); } @@ -23761,7 +23774,7 @@ int8_tArray __attribute__((export_name("TS_FundingLocked_get_next_per_commitmen 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, FundingLocked_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -23773,23 +23786,23 @@ void __attribute__((export_name("TS_FundingLocked_set_next_per_commitment_point CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); FundingLocked_set_next_per_commitment_point(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_FundingLocked_new"))) TS_FundingLocked_new(int8_tArray channel_id_arg, int8_tArray next_per_commitment_point_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKPublicKey next_per_commitment_point_arg_ref; CHECK(next_per_commitment_point_arg->arr_len == 33); - memcpy(next_per_commitment_point_arg_ref.compressed_form, next_per_commitment_point_arg->elems, 33); + memcpy(next_per_commitment_point_arg_ref.compressed_form, next_per_commitment_point_arg->elems, 33); FREE(next_per_commitment_point_arg); LDKFundingLocked ret_var = FundingLocked_new(channel_id_arg_ref, next_per_commitment_point_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23798,22 +23811,22 @@ uint32_t __attribute__((export_name("TS_FundingLocked_new"))) TS_FundingLocked_ static inline uintptr_t FundingLocked_clone_ptr(LDKFundingLocked *NONNULL_PTR arg) { LDKFundingLocked ret_var = FundingLocked_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_FundingLocked_clone_ptr"))) TS_FundingLocked_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_FundingLocked_clone_ptr"))) TS_FundingLocked_clone_ptr(uint32_t arg) { LDKFundingLocked arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = FundingLocked_clone_ptr(&arg_conv); + intptr_t ret_val = FundingLocked_clone_ptr(&arg_conv); return ret_val; } @@ -23823,11 +23836,11 @@ uint32_t __attribute__((export_name("TS_FundingLocked_clone"))) TS_FundingLocke orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKFundingLocked ret_var = FundingLocked_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23847,7 +23860,7 @@ int8_tArray __attribute__((export_name("TS_Shutdown_get_channel_id"))) TS_Shutd 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *Shutdown_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -23859,7 +23872,7 @@ void __attribute__((export_name("TS_Shutdown_set_channel_id"))) TS_Shutdown_set CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); Shutdown_set_channel_id(&this_ptr_conv, val_ref); } @@ -23869,7 +23882,7 @@ int8_tArray __attribute__((export_name("TS_Shutdown_get_scriptpubkey"))) TS_Shu this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKu8slice ret_var = Shutdown_get_scriptpubkey(&this_ptr_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -23882,24 +23895,24 @@ void __attribute__((export_name("TS_Shutdown_set_scriptpubkey"))) TS_Shutdown_s LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(val_ref.data, val->elems, val_ref.datalen); + memcpy(val_ref.data, val->elems, val_ref.datalen); FREE(val); Shutdown_set_scriptpubkey(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_Shutdown_new"))) TS_Shutdown_new(int8_tArray channel_id_arg, int8_tArray scriptpubkey_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKCVec_u8Z scriptpubkey_arg_ref; scriptpubkey_arg_ref.datalen = scriptpubkey_arg->arr_len; scriptpubkey_arg_ref.data = MALLOC(scriptpubkey_arg_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(scriptpubkey_arg_ref.data, scriptpubkey_arg->elems, scriptpubkey_arg_ref.datalen); + memcpy(scriptpubkey_arg_ref.data, scriptpubkey_arg->elems, scriptpubkey_arg_ref.datalen); FREE(scriptpubkey_arg); LDKShutdown ret_var = Shutdown_new(channel_id_arg_ref, scriptpubkey_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23908,22 +23921,22 @@ uint32_t __attribute__((export_name("TS_Shutdown_new"))) TS_Shutdown_new(int8_t static inline uintptr_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg) { LDKShutdown ret_var = Shutdown_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint32_t arg) { LDKShutdown arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = Shutdown_clone_ptr(&arg_conv); + intptr_t ret_val = Shutdown_clone_ptr(&arg_conv); return ret_val; } @@ -23933,11 +23946,11 @@ uint32_t __attribute__((export_name("TS_Shutdown_clone"))) TS_Shutdown_clone(ui orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKShutdown ret_var = Shutdown_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -23988,11 +24001,11 @@ void __attribute__((export_name("TS_ClosingSignedFeeRange_set_max_fee_satoshis" uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_new"))) TS_ClosingSignedFeeRange_new(int64_t min_fee_satoshis_arg, int64_t max_fee_satoshis_arg) { LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_new(min_fee_satoshis_arg, max_fee_satoshis_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24001,22 +24014,22 @@ uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_new"))) TS_Closin static inline uintptr_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg) { LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint32_t arg) { LDKClosingSignedFeeRange arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ClosingSignedFeeRange_clone_ptr(&arg_conv); + intptr_t ret_val = ClosingSignedFeeRange_clone_ptr(&arg_conv); return ret_val; } @@ -24026,11 +24039,11 @@ uint32_t __attribute__((export_name("TS_ClosingSignedFeeRange_clone"))) TS_Clos orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24050,7 +24063,7 @@ int8_tArray __attribute__((export_name("TS_ClosingSigned_get_channel_id"))) TS_ 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ClosingSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24062,7 +24075,7 @@ void __attribute__((export_name("TS_ClosingSigned_set_channel_id"))) TS_Closing CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); ClosingSigned_set_channel_id(&this_ptr_conv, val_ref); } @@ -24088,7 +24101,7 @@ int8_tArray __attribute__((export_name("TS_ClosingSigned_get_signature"))) TS_C 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, ClosingSigned_get_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -24100,7 +24113,7 @@ void __attribute__((export_name("TS_ClosingSigned_set_signature"))) TS_ClosingS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ClosingSigned_set_signature(&this_ptr_conv, val_ref); } @@ -24110,12 +24123,12 @@ uint32_t __attribute__((export_name("TS_ClosingSigned_get_fee_range"))) TS_Clos this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKClosingSignedFeeRange ret_var = ClosingSigned_get_fee_range(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24139,21 +24152,21 @@ void __attribute__((export_name("TS_ClosingSigned_set_fee_range"))) TS_ClosingS uint32_t __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_new(int8_tArray channel_id_arg, int64_t fee_satoshis_arg, int8_tArray signature_arg, uint32_t fee_range_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 64); - memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); + memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg); LDKClosingSignedFeeRange fee_range_arg_conv; fee_range_arg_conv.inner = (void*)(fee_range_arg & (~1)); fee_range_arg_conv.is_owned = (fee_range_arg & 1) || (fee_range_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(fee_range_arg_conv); fee_range_arg_conv = ClosingSignedFeeRange_clone(&fee_range_arg_conv); LDKClosingSigned ret_var = ClosingSigned_new(channel_id_arg_ref, fee_satoshis_arg, signature_arg_ref, fee_range_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24162,22 +24175,22 @@ uint32_t __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_ static inline uintptr_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg) { LDKClosingSigned ret_var = ClosingSigned_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint32_t arg) { LDKClosingSigned arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ClosingSigned_clone_ptr(&arg_conv); + intptr_t ret_val = ClosingSigned_clone_ptr(&arg_conv); return ret_val; } @@ -24187,11 +24200,11 @@ uint32_t __attribute__((export_name("TS_ClosingSigned_clone"))) TS_ClosingSigne orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKClosingSigned ret_var = ClosingSigned_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24211,7 +24224,7 @@ int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_channel_id"))) TS_ 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateAddHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24223,7 +24236,7 @@ void __attribute__((export_name("TS_UpdateAddHTLC_set_channel_id"))) TS_UpdateA CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateAddHTLC_set_channel_id(&this_ptr_conv, val_ref); } @@ -24266,7 +24279,7 @@ int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_get_payment_hash"))) T 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateAddHTLC_get_payment_hash(&this_ptr_conv), 32); return ret_arr; } @@ -24278,7 +24291,7 @@ void __attribute__((export_name("TS_UpdateAddHTLC_set_payment_hash"))) TS_Updat CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateAddHTLC_set_payment_hash(&this_ptr_conv, val_ref); } @@ -24301,22 +24314,22 @@ void __attribute__((export_name("TS_UpdateAddHTLC_set_cltv_expiry"))) TS_Update static inline uintptr_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg) { LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint32_t arg) { LDKUpdateAddHTLC arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UpdateAddHTLC_clone_ptr(&arg_conv); + intptr_t ret_val = UpdateAddHTLC_clone_ptr(&arg_conv); return ret_val; } @@ -24326,11 +24339,11 @@ uint32_t __attribute__((export_name("TS_UpdateAddHTLC_clone"))) TS_UpdateAddHTL orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24350,7 +24363,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_channel_id"))) 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFulfillHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24362,7 +24375,7 @@ void __attribute__((export_name("TS_UpdateFulfillHTLC_set_channel_id"))) TS_Upd CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFulfillHTLC_set_channel_id(&this_ptr_conv, val_ref); } @@ -24388,7 +24401,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_get_payment_preima 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFulfillHTLC_get_payment_preimage(&this_ptr_conv), 32); return ret_arr; } @@ -24400,23 +24413,23 @@ void __attribute__((export_name("TS_UpdateFulfillHTLC_set_payment_preimage"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFulfillHTLC_set_payment_preimage(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_new"))) TS_UpdateFulfillHTLC_new(int8_tArray channel_id_arg, int64_t htlc_id_arg, int8_tArray payment_preimage_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKThirtyTwoBytes payment_preimage_arg_ref; CHECK(payment_preimage_arg->arr_len == 32); - memcpy(payment_preimage_arg_ref.data, payment_preimage_arg->elems, 32); + memcpy(payment_preimage_arg_ref.data, payment_preimage_arg->elems, 32); FREE(payment_preimage_arg); LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_new(channel_id_arg_ref, htlc_id_arg, payment_preimage_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24425,22 +24438,22 @@ uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_new"))) TS_UpdateFulf static inline uintptr_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg) { LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint32_t arg) { LDKUpdateFulfillHTLC arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UpdateFulfillHTLC_clone_ptr(&arg_conv); + intptr_t ret_val = UpdateFulfillHTLC_clone_ptr(&arg_conv); return ret_val; } @@ -24450,11 +24463,11 @@ uint32_t __attribute__((export_name("TS_UpdateFulfillHTLC_clone"))) TS_UpdateFu orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24474,7 +24487,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_get_channel_id"))) TS 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFailHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24486,7 +24499,7 @@ void __attribute__((export_name("TS_UpdateFailHTLC_set_channel_id"))) TS_Update CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFailHTLC_set_channel_id(&this_ptr_conv, val_ref); } @@ -24509,22 +24522,22 @@ void __attribute__((export_name("TS_UpdateFailHTLC_set_htlc_id"))) TS_UpdateFai static inline uintptr_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg) { LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint32_t arg) { LDKUpdateFailHTLC arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UpdateFailHTLC_clone_ptr(&arg_conv); + intptr_t ret_val = UpdateFailHTLC_clone_ptr(&arg_conv); return ret_val; } @@ -24534,11 +24547,11 @@ uint32_t __attribute__((export_name("TS_UpdateFailHTLC_clone"))) TS_UpdateFailH orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24558,7 +24571,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_channel_ 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFailMalformedHTLC_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24570,7 +24583,7 @@ void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_channel_id"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFailMalformedHTLC_set_channel_id(&this_ptr_conv, val_ref); } @@ -24610,22 +24623,22 @@ void __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_failure_code")) static inline uintptr_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg) { LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint32_t arg) { LDKUpdateFailMalformedHTLC arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UpdateFailMalformedHTLC_clone_ptr(&arg_conv); + intptr_t ret_val = UpdateFailMalformedHTLC_clone_ptr(&arg_conv); return ret_val; } @@ -24635,11 +24648,11 @@ uint32_t __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone"))) TS_Up orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24659,7 +24672,7 @@ int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_channel_id"))) 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *CommitmentSigned_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24671,7 +24684,7 @@ void __attribute__((export_name("TS_CommitmentSigned_set_channel_id"))) TS_Comm CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); CommitmentSigned_set_channel_id(&this_ptr_conv, val_ref); } @@ -24680,7 +24693,7 @@ int8_tArray __attribute__((export_name("TS_CommitmentSigned_get_signature"))) T 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, CommitmentSigned_get_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -24692,7 +24705,7 @@ void __attribute__((export_name("TS_CommitmentSigned_set_signature"))) TS_Commi CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); CommitmentSigned_set_signature(&this_ptr_conv, val_ref); } @@ -24707,12 +24720,12 @@ 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; + int8_tArray* val_vals = (void*) val->elems /* XXX val leaks */; for (size_t m = 0; m < val_constr.datalen; m++) { int8_tArray val_conv_12 = val_vals[m]; LDKSignature val_conv_12_ref; CHECK(val_conv_12->arr_len == 64); - memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); + memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); FREE(val_conv_12); val_constr.data[m] = val_conv_12_ref; } CommitmentSigned_set_htlc_signatures(&this_ptr_conv, val_constr); @@ -24721,30 +24734,30 @@ void __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentSigned_new(int8_tArray channel_id_arg, int8_tArray signature_arg, ptrArray htlc_signatures_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 64); - memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); + memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg); LDKCVec_SignatureZ htlc_signatures_arg_constr; htlc_signatures_arg_constr.datalen = htlc_signatures_arg->arr_len; if (htlc_signatures_arg_constr.datalen > 0) 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; + int8_tArray* htlc_signatures_arg_vals = (void*) htlc_signatures_arg->elems /* XXX htlc_signatures_arg leaks */; 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; CHECK(htlc_signatures_arg_conv_12->arr_len == 64); - memcpy(htlc_signatures_arg_conv_12_ref.compact_form, htlc_signatures_arg_conv_12->elems, 64); + 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; } LDKCommitmentSigned ret_var = CommitmentSigned_new(channel_id_arg_ref, signature_arg_ref, htlc_signatures_arg_constr); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24753,22 +24766,22 @@ uint32_t __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS static inline uintptr_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg) { LDKCommitmentSigned ret_var = CommitmentSigned_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint32_t arg) { LDKCommitmentSigned arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = CommitmentSigned_clone_ptr(&arg_conv); + intptr_t ret_val = CommitmentSigned_clone_ptr(&arg_conv); return ret_val; } @@ -24778,11 +24791,11 @@ uint32_t __attribute__((export_name("TS_CommitmentSigned_clone"))) TS_Commitmen orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKCommitmentSigned ret_var = CommitmentSigned_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24802,7 +24815,7 @@ int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_channel_id"))) TS_R 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *RevokeAndACK_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24814,7 +24827,7 @@ void __attribute__((export_name("TS_RevokeAndACK_set_channel_id"))) TS_RevokeAn CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); RevokeAndACK_set_channel_id(&this_ptr_conv, val_ref); } @@ -24823,7 +24836,7 @@ int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_per_commitment_secr 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *RevokeAndACK_get_per_commitment_secret(&this_ptr_conv), 32); return ret_arr; } @@ -24835,7 +24848,7 @@ void __attribute__((export_name("TS_RevokeAndACK_set_per_commitment_secret"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); RevokeAndACK_set_per_commitment_secret(&this_ptr_conv, val_ref); } @@ -24844,7 +24857,7 @@ int8_tArray __attribute__((export_name("TS_RevokeAndACK_get_next_per_commitment 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, RevokeAndACK_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -24856,26 +24869,26 @@ void __attribute__((export_name("TS_RevokeAndACK_set_next_per_commitment_point" CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); RevokeAndACK_set_next_per_commitment_point(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_RevokeAndACK_new"))) TS_RevokeAndACK_new(int8_tArray channel_id_arg, int8_tArray per_commitment_secret_arg, int8_tArray next_per_commitment_point_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKThirtyTwoBytes per_commitment_secret_arg_ref; CHECK(per_commitment_secret_arg->arr_len == 32); - memcpy(per_commitment_secret_arg_ref.data, per_commitment_secret_arg->elems, 32); + memcpy(per_commitment_secret_arg_ref.data, per_commitment_secret_arg->elems, 32); FREE(per_commitment_secret_arg); LDKPublicKey next_per_commitment_point_arg_ref; CHECK(next_per_commitment_point_arg->arr_len == 33); - memcpy(next_per_commitment_point_arg_ref.compressed_form, next_per_commitment_point_arg->elems, 33); + memcpy(next_per_commitment_point_arg_ref.compressed_form, next_per_commitment_point_arg->elems, 33); FREE(next_per_commitment_point_arg); LDKRevokeAndACK ret_var = RevokeAndACK_new(channel_id_arg_ref, per_commitment_secret_arg_ref, next_per_commitment_point_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24884,22 +24897,22 @@ uint32_t __attribute__((export_name("TS_RevokeAndACK_new"))) TS_RevokeAndACK_ne static inline uintptr_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg) { LDKRevokeAndACK ret_var = RevokeAndACK_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint32_t arg) { LDKRevokeAndACK arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = RevokeAndACK_clone_ptr(&arg_conv); + intptr_t ret_val = RevokeAndACK_clone_ptr(&arg_conv); return ret_val; } @@ -24909,11 +24922,11 @@ uint32_t __attribute__((export_name("TS_RevokeAndACK_clone"))) TS_RevokeAndACK_ orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRevokeAndACK ret_var = RevokeAndACK_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24933,7 +24946,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFee_get_channel_id"))) TS_Upda 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UpdateFee_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -24945,7 +24958,7 @@ void __attribute__((export_name("TS_UpdateFee_set_channel_id"))) TS_UpdateFee_s CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UpdateFee_set_channel_id(&this_ptr_conv, val_ref); } @@ -24969,13 +24982,13 @@ void __attribute__((export_name("TS_UpdateFee_set_feerate_per_kw"))) TS_UpdateF uint32_t __attribute__((export_name("TS_UpdateFee_new"))) TS_UpdateFee_new(int8_tArray channel_id_arg, int32_t feerate_per_kw_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKUpdateFee ret_var = UpdateFee_new(channel_id_arg_ref, feerate_per_kw_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -24984,22 +24997,22 @@ uint32_t __attribute__((export_name("TS_UpdateFee_new"))) TS_UpdateFee_new(int8 static inline uintptr_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg) { LDKUpdateFee ret_var = UpdateFee_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint32_t arg) { LDKUpdateFee arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UpdateFee_clone_ptr(&arg_conv); + intptr_t ret_val = UpdateFee_clone_ptr(&arg_conv); return ret_val; } @@ -25009,11 +25022,11 @@ uint32_t __attribute__((export_name("TS_UpdateFee_clone"))) TS_UpdateFee_clone( orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUpdateFee ret_var = UpdateFee_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25033,7 +25046,7 @@ int8_tArray __attribute__((export_name("TS_DataLossProtect_get_your_last_per_co 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *DataLossProtect_get_your_last_per_commitment_secret(&this_ptr_conv), 32); return ret_arr; } @@ -25045,7 +25058,7 @@ void __attribute__((export_name("TS_DataLossProtect_set_your_last_per_commitmen CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); DataLossProtect_set_your_last_per_commitment_secret(&this_ptr_conv, val_ref); } @@ -25054,7 +25067,7 @@ int8_tArray __attribute__((export_name("TS_DataLossProtect_get_my_current_per_c 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, DataLossProtect_get_my_current_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -25066,23 +25079,23 @@ void __attribute__((export_name("TS_DataLossProtect_set_my_current_per_commitme CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); DataLossProtect_set_my_current_per_commitment_point(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_DataLossProtect_new"))) TS_DataLossProtect_new(int8_tArray your_last_per_commitment_secret_arg, int8_tArray my_current_per_commitment_point_arg) { LDKThirtyTwoBytes your_last_per_commitment_secret_arg_ref; CHECK(your_last_per_commitment_secret_arg->arr_len == 32); - memcpy(your_last_per_commitment_secret_arg_ref.data, your_last_per_commitment_secret_arg->elems, 32); + memcpy(your_last_per_commitment_secret_arg_ref.data, your_last_per_commitment_secret_arg->elems, 32); FREE(your_last_per_commitment_secret_arg); LDKPublicKey my_current_per_commitment_point_arg_ref; CHECK(my_current_per_commitment_point_arg->arr_len == 33); - memcpy(my_current_per_commitment_point_arg_ref.compressed_form, my_current_per_commitment_point_arg->elems, 33); + memcpy(my_current_per_commitment_point_arg_ref.compressed_form, my_current_per_commitment_point_arg->elems, 33); FREE(my_current_per_commitment_point_arg); LDKDataLossProtect ret_var = DataLossProtect_new(your_last_per_commitment_secret_arg_ref, my_current_per_commitment_point_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25091,22 +25104,22 @@ uint32_t __attribute__((export_name("TS_DataLossProtect_new"))) TS_DataLossProt static inline uintptr_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg) { LDKDataLossProtect ret_var = DataLossProtect_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint32_t arg) { LDKDataLossProtect arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = DataLossProtect_clone_ptr(&arg_conv); + intptr_t ret_val = DataLossProtect_clone_ptr(&arg_conv); return ret_val; } @@ -25116,11 +25129,11 @@ uint32_t __attribute__((export_name("TS_DataLossProtect_clone"))) TS_DataLossPr orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKDataLossProtect ret_var = DataLossProtect_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25140,7 +25153,7 @@ int8_tArray __attribute__((export_name("TS_ChannelReestablish_get_channel_id")) 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ChannelReestablish_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -25152,7 +25165,7 @@ void __attribute__((export_name("TS_ChannelReestablish_set_channel_id"))) TS_Ch CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); ChannelReestablish_set_channel_id(&this_ptr_conv, val_ref); } @@ -25192,22 +25205,22 @@ void __attribute__((export_name("TS_ChannelReestablish_set_next_remote_commitme static inline uintptr_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg) { LDKChannelReestablish ret_var = ChannelReestablish_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint32_t arg) { LDKChannelReestablish arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelReestablish_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelReestablish_clone_ptr(&arg_conv); return ret_val; } @@ -25217,11 +25230,11 @@ uint32_t __attribute__((export_name("TS_ChannelReestablish_clone"))) TS_Channel orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelReestablish ret_var = ChannelReestablish_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25241,7 +25254,7 @@ int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_channel_i 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *AnnouncementSignatures_get_channel_id(&this_ptr_conv), 32); return ret_arr; } @@ -25253,7 +25266,7 @@ void __attribute__((export_name("TS_AnnouncementSignatures_set_channel_id"))) T CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); AnnouncementSignatures_set_channel_id(&this_ptr_conv, val_ref); } @@ -25279,7 +25292,7 @@ int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_node_sign 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, AnnouncementSignatures_get_node_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -25291,7 +25304,7 @@ void __attribute__((export_name("TS_AnnouncementSignatures_set_node_signature") CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); AnnouncementSignatures_set_node_signature(&this_ptr_conv, val_ref); } @@ -25300,7 +25313,7 @@ int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_get_bitcoin_s 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, AnnouncementSignatures_get_bitcoin_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -25312,26 +25325,26 @@ void __attribute__((export_name("TS_AnnouncementSignatures_set_bitcoin_signatur CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); AnnouncementSignatures_set_bitcoin_signature(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_AnnouncementSignatures_new"))) TS_AnnouncementSignatures_new(int8_tArray channel_id_arg, int64_t short_channel_id_arg, int8_tArray node_signature_arg, int8_tArray bitcoin_signature_arg) { LDKThirtyTwoBytes channel_id_arg_ref; CHECK(channel_id_arg->arr_len == 32); - memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); + memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg); LDKSignature node_signature_arg_ref; CHECK(node_signature_arg->arr_len == 64); - memcpy(node_signature_arg_ref.compact_form, node_signature_arg->elems, 64); + memcpy(node_signature_arg_ref.compact_form, node_signature_arg->elems, 64); FREE(node_signature_arg); LDKSignature bitcoin_signature_arg_ref; CHECK(bitcoin_signature_arg->arr_len == 64); - memcpy(bitcoin_signature_arg_ref.compact_form, bitcoin_signature_arg->elems, 64); + memcpy(bitcoin_signature_arg_ref.compact_form, bitcoin_signature_arg->elems, 64); FREE(bitcoin_signature_arg); LDKAnnouncementSignatures ret_var = AnnouncementSignatures_new(channel_id_arg_ref, short_channel_id_arg, node_signature_arg_ref, bitcoin_signature_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25340,22 +25353,22 @@ uint32_t __attribute__((export_name("TS_AnnouncementSignatures_new"))) TS_Annou static inline uintptr_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg) { LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint32_t arg) { LDKAnnouncementSignatures arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = AnnouncementSignatures_clone_ptr(&arg_conv); + intptr_t ret_val = AnnouncementSignatures_clone_ptr(&arg_conv); return ret_val; } @@ -25365,11 +25378,11 @@ uint32_t __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_Ann orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25378,7 +25391,7 @@ uint32_t __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_Ann void __attribute__((export_name("TS_NetAddress_free"))) TS_NetAddress_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKNetAddress this_ptr_conv = *(LDKNetAddress*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -25388,12 +25401,12 @@ void __attribute__((export_name("TS_NetAddress_free"))) TS_NetAddress_free(uint static inline uintptr_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg) { LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint32_t arg) { LDKNetAddress* arg_conv = (LDKNetAddress*)arg; - int64_t ret_val = NetAddress_clone_ptr(arg_conv); + intptr_t ret_val = NetAddress_clone_ptr(arg_conv); return ret_val; } @@ -25401,54 +25414,54 @@ uint32_t __attribute__((export_name("TS_NetAddress_clone"))) TS_NetAddress_clon LDKNetAddress* orig_conv = (LDKNetAddress*)orig; LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_NetAddress_ipv4"))) TS_NetAddress_ipv4(int8_tArray addr, int16_t port) { LDKFourBytes addr_ref; CHECK(addr->arr_len == 4); - memcpy(addr_ref.data, addr->elems, 4); + memcpy(addr_ref.data, addr->elems, 4); FREE(addr); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_ipv4(addr_ref, port); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_NetAddress_ipv6"))) TS_NetAddress_ipv6(int8_tArray addr, int16_t port) { LDKSixteenBytes addr_ref; CHECK(addr->arr_len == 16); - memcpy(addr_ref.data, addr->elems, 16); + memcpy(addr_ref.data, addr->elems, 16); FREE(addr); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_ipv6(addr_ref, port); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_NetAddress_onion_v2"))) TS_NetAddress_onion_v2(int8_tArray a) { LDKTwelveBytes a_ref; CHECK(a->arr_len == 12); - memcpy(a_ref.data, a->elems, 12); + memcpy(a_ref.data, a->elems, 12); FREE(a); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_onion_v2(a_ref); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_NetAddress_onion_v3"))) TS_NetAddress_onion_v3(int8_tArray ed25519_pubkey, int16_t checksum, int8_t version, int16_t port) { LDKThirtyTwoBytes ed25519_pubkey_ref; CHECK(ed25519_pubkey->arr_len == 32); - memcpy(ed25519_pubkey_ref.data, ed25519_pubkey->elems, 32); + memcpy(ed25519_pubkey_ref.data, ed25519_pubkey->elems, 32); FREE(ed25519_pubkey); LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress"); *ret_copy = NetAddress_onion_v3(ed25519_pubkey_ref, checksum, version, port); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_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); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -25457,10 +25470,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ"); *ret_conv = NetAddress_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_UnsignedNodeAnnouncement_free"))) TS_UnsignedNodeAnnouncement_free(uint32_t this_obj) { @@ -25477,11 +25490,11 @@ uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_features") this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKNodeFeatures ret_var = UnsignedNodeAnnouncement_get_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25523,7 +25536,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_node_id 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, UnsignedNodeAnnouncement_get_node_id(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -25535,7 +25548,7 @@ void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_node_id"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedNodeAnnouncement_set_node_id(&this_ptr_conv, val_ref); } @@ -25544,7 +25557,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_rgb"))) 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(3); + int8_tArray ret_arr = init_int8_tArray(3, __LINE__); memcpy(ret_arr->elems, *UnsignedNodeAnnouncement_get_rgb(&this_ptr_conv), 3); return ret_arr; } @@ -25556,7 +25569,7 @@ void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_rgb"))) TS_Uns CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThreeBytes val_ref; CHECK(val->arr_len == 3); - memcpy(val_ref.data, val->elems, 3); + memcpy(val_ref.data, val->elems, 3); FREE(val); UnsignedNodeAnnouncement_set_rgb(&this_ptr_conv, val_ref); } @@ -25565,7 +25578,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_alias") 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedNodeAnnouncement_get_alias(&this_ptr_conv), 32); return ret_arr; } @@ -25577,7 +25590,7 @@ void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_alias"))) TS_U CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedNodeAnnouncement_set_alias(&this_ptr_conv, val_ref); } @@ -25592,13 +25605,13 @@ 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; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t m = 0; m < val_constr.datalen; m++) { uint32_t val_conv_12 = val_vals[m]; - void* val_conv_12_ptr = (void*)(((uint64_t)val_conv_12) & ~1); + void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); CHECK_ACCESS(val_conv_12_ptr); LDKNetAddress val_conv_12_conv = *(LDKNetAddress*)(val_conv_12_ptr); - val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uint64_t)val_conv_12) & ~1)); + val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); val_constr.data[m] = val_conv_12_conv; } UnsignedNodeAnnouncement_set_addresses(&this_ptr_conv, val_constr); @@ -25606,22 +25619,22 @@ void __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses"))) static inline uintptr_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg) { LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint32_t arg) { LDKUnsignedNodeAnnouncement arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UnsignedNodeAnnouncement_clone_ptr(&arg_conv); + intptr_t ret_val = UnsignedNodeAnnouncement_clone_ptr(&arg_conv); return ret_val; } @@ -25631,11 +25644,11 @@ uint32_t __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone"))) TS_U orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25655,7 +25668,7 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncement_get_signature"))) T 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, NodeAnnouncement_get_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -25667,7 +25680,7 @@ void __attribute__((export_name("TS_NodeAnnouncement_set_signature"))) TS_NodeA CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); NodeAnnouncement_set_signature(&this_ptr_conv, val_ref); } @@ -25677,11 +25690,11 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncement_get_contents"))) TS_No this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKUnsignedNodeAnnouncement ret_var = NodeAnnouncement_get_contents(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25704,18 +25717,18 @@ void __attribute__((export_name("TS_NodeAnnouncement_set_contents"))) TS_NodeAn uint32_t __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnouncement_new(int8_tArray signature_arg, uint32_t contents_arg) { LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 64); - memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); + memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg); LDKUnsignedNodeAnnouncement contents_arg_conv; contents_arg_conv.inner = (void*)(contents_arg & (~1)); contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(contents_arg_conv); contents_arg_conv = UnsignedNodeAnnouncement_clone(&contents_arg_conv); LDKNodeAnnouncement ret_var = NodeAnnouncement_new(signature_arg_ref, contents_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25724,22 +25737,22 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnounc static inline uintptr_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg) { LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint32_t arg) { LDKNodeAnnouncement arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = NodeAnnouncement_clone_ptr(&arg_conv); + intptr_t ret_val = NodeAnnouncement_clone_ptr(&arg_conv); return ret_val; } @@ -25749,11 +25762,11 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncement_clone"))) TS_NodeAnnou orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25774,11 +25787,11 @@ uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_feature this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelFeatures ret_var = UnsignedChannelAnnouncement_get_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25803,7 +25816,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_chai 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedChannelAnnouncement_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -25815,7 +25828,7 @@ void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_chain_hash" CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedChannelAnnouncement_set_chain_hash(&this_ptr_conv, val_ref); } @@ -25841,7 +25854,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, UnsignedChannelAnnouncement_get_node_id_1(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -25853,7 +25866,7 @@ void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_1") CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_node_id_1(&this_ptr_conv, val_ref); } @@ -25862,7 +25875,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_node 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, UnsignedChannelAnnouncement_get_node_id_2(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -25874,7 +25887,7 @@ void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_node_id_2") CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_node_id_2(&this_ptr_conv, val_ref); } @@ -25883,7 +25896,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitc 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, UnsignedChannelAnnouncement_get_bitcoin_key_1(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -25895,7 +25908,7 @@ void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_bitcoin_key_1(&this_ptr_conv, val_ref); } @@ -25904,7 +25917,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_bitc 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, UnsignedChannelAnnouncement_get_bitcoin_key_2(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -25916,28 +25929,28 @@ void __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); UnsignedChannelAnnouncement_set_bitcoin_key_2(&this_ptr_conv, val_ref); } static inline uintptr_t UnsignedChannelAnnouncement_clone_ptr(LDKUnsignedChannelAnnouncement *NONNULL_PTR arg) { LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint32_t arg) { LDKUnsignedChannelAnnouncement arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UnsignedChannelAnnouncement_clone_ptr(&arg_conv); + intptr_t ret_val = UnsignedChannelAnnouncement_clone_ptr(&arg_conv); return ret_val; } @@ -25947,11 +25960,11 @@ uint32_t __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone"))) T orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -25971,7 +25984,7 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signatu 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, ChannelAnnouncement_get_node_signature_1(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -25983,7 +25996,7 @@ void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_1")) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_node_signature_1(&this_ptr_conv, val_ref); } @@ -25992,7 +26005,7 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_node_signatu 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, ChannelAnnouncement_get_node_signature_2(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -26004,7 +26017,7 @@ void __attribute__((export_name("TS_ChannelAnnouncement_set_node_signature_2")) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_node_signature_2(&this_ptr_conv, val_ref); } @@ -26013,7 +26026,7 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_sign 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, ChannelAnnouncement_get_bitcoin_signature_1(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -26025,7 +26038,7 @@ void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_1 CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_bitcoin_signature_1(&this_ptr_conv, val_ref); } @@ -26034,7 +26047,7 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_get_bitcoin_sign 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, ChannelAnnouncement_get_bitcoin_signature_2(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -26046,7 +26059,7 @@ void __attribute__((export_name("TS_ChannelAnnouncement_set_bitcoin_signature_2 CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelAnnouncement_set_bitcoin_signature_2(&this_ptr_conv, val_ref); } @@ -26056,11 +26069,11 @@ uint32_t __attribute__((export_name("TS_ChannelAnnouncement_get_contents"))) TS this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKUnsignedChannelAnnouncement ret_var = ChannelAnnouncement_get_contents(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26083,27 +26096,27 @@ void __attribute__((export_name("TS_ChannelAnnouncement_set_contents"))) TS_Cha uint32_t __attribute__((export_name("TS_ChannelAnnouncement_new"))) TS_ChannelAnnouncement_new(int8_tArray node_signature_1_arg, int8_tArray node_signature_2_arg, int8_tArray bitcoin_signature_1_arg, int8_tArray bitcoin_signature_2_arg, uint32_t contents_arg) { LDKSignature node_signature_1_arg_ref; CHECK(node_signature_1_arg->arr_len == 64); - memcpy(node_signature_1_arg_ref.compact_form, node_signature_1_arg->elems, 64); + memcpy(node_signature_1_arg_ref.compact_form, node_signature_1_arg->elems, 64); FREE(node_signature_1_arg); LDKSignature node_signature_2_arg_ref; CHECK(node_signature_2_arg->arr_len == 64); - memcpy(node_signature_2_arg_ref.compact_form, node_signature_2_arg->elems, 64); + memcpy(node_signature_2_arg_ref.compact_form, node_signature_2_arg->elems, 64); FREE(node_signature_2_arg); LDKSignature bitcoin_signature_1_arg_ref; CHECK(bitcoin_signature_1_arg->arr_len == 64); - memcpy(bitcoin_signature_1_arg_ref.compact_form, bitcoin_signature_1_arg->elems, 64); + memcpy(bitcoin_signature_1_arg_ref.compact_form, bitcoin_signature_1_arg->elems, 64); FREE(bitcoin_signature_1_arg); LDKSignature bitcoin_signature_2_arg_ref; CHECK(bitcoin_signature_2_arg->arr_len == 64); - memcpy(bitcoin_signature_2_arg_ref.compact_form, bitcoin_signature_2_arg->elems, 64); + memcpy(bitcoin_signature_2_arg_ref.compact_form, bitcoin_signature_2_arg->elems, 64); FREE(bitcoin_signature_2_arg); LDKUnsignedChannelAnnouncement contents_arg_conv; contents_arg_conv.inner = (void*)(contents_arg & (~1)); contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(contents_arg_conv); contents_arg_conv = UnsignedChannelAnnouncement_clone(&contents_arg_conv); LDKChannelAnnouncement ret_var = ChannelAnnouncement_new(node_signature_1_arg_ref, node_signature_2_arg_ref, bitcoin_signature_1_arg_ref, bitcoin_signature_2_arg_ref, contents_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26112,22 +26125,22 @@ uint32_t __attribute__((export_name("TS_ChannelAnnouncement_new"))) TS_ChannelA static inline uintptr_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg) { LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint32_t arg) { LDKChannelAnnouncement arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelAnnouncement_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelAnnouncement_clone_ptr(&arg_conv); return ret_val; } @@ -26137,11 +26150,11 @@ uint32_t __attribute__((export_name("TS_ChannelAnnouncement_clone"))) TS_Channe orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26161,7 +26174,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_get_chain_hash 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *UnsignedChannelUpdate_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -26173,7 +26186,7 @@ void __attribute__((export_name("TS_UnsignedChannelUpdate_set_chain_hash"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); UnsignedChannelUpdate_set_chain_hash(&this_ptr_conv, val_ref); } @@ -26298,22 +26311,22 @@ void __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_ static inline uintptr_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) { LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint32_t arg) { LDKUnsignedChannelUpdate arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = UnsignedChannelUpdate_clone_ptr(&arg_conv); + intptr_t ret_val = UnsignedChannelUpdate_clone_ptr(&arg_conv); return ret_val; } @@ -26323,11 +26336,11 @@ uint32_t __attribute__((export_name("TS_UnsignedChannelUpdate_clone"))) TS_Unsi orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26347,7 +26360,7 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdate_get_signature"))) TS_C 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, ChannelUpdate_get_signature(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -26359,7 +26372,7 @@ void __attribute__((export_name("TS_ChannelUpdate_set_signature"))) TS_ChannelU CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); ChannelUpdate_set_signature(&this_ptr_conv, val_ref); } @@ -26369,11 +26382,11 @@ uint32_t __attribute__((export_name("TS_ChannelUpdate_get_contents"))) TS_Chann this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKUnsignedChannelUpdate ret_var = ChannelUpdate_get_contents(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26396,18 +26409,18 @@ void __attribute__((export_name("TS_ChannelUpdate_set_contents"))) TS_ChannelUp uint32_t __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_new(int8_tArray signature_arg, uint32_t contents_arg) { LDKSignature signature_arg_ref; CHECK(signature_arg->arr_len == 64); - memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); + memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg); LDKUnsignedChannelUpdate contents_arg_conv; contents_arg_conv.inner = (void*)(contents_arg & (~1)); contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(contents_arg_conv); contents_arg_conv = UnsignedChannelUpdate_clone(&contents_arg_conv); LDKChannelUpdate ret_var = ChannelUpdate_new(signature_arg_ref, contents_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26416,22 +26429,22 @@ uint32_t __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_ static inline uintptr_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg) { LDKChannelUpdate ret_var = ChannelUpdate_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint32_t arg) { LDKChannelUpdate arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelUpdate_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelUpdate_clone_ptr(&arg_conv); return ret_val; } @@ -26441,11 +26454,11 @@ uint32_t __attribute__((export_name("TS_ChannelUpdate_clone"))) TS_ChannelUpdat orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelUpdate ret_var = ChannelUpdate_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26465,7 +26478,7 @@ int8_tArray __attribute__((export_name("TS_QueryChannelRange_get_chain_hash"))) 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *QueryChannelRange_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -26477,7 +26490,7 @@ void __attribute__((export_name("TS_QueryChannelRange_set_chain_hash"))) TS_Que CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); QueryChannelRange_set_chain_hash(&this_ptr_conv, val_ref); } @@ -26518,13 +26531,13 @@ void __attribute__((export_name("TS_QueryChannelRange_set_number_of_blocks"))) uint32_t __attribute__((export_name("TS_QueryChannelRange_new"))) TS_QueryChannelRange_new(int8_tArray chain_hash_arg, int32_t first_blocknum_arg, int32_t number_of_blocks_arg) { LDKThirtyTwoBytes chain_hash_arg_ref; CHECK(chain_hash_arg->arr_len == 32); - memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); + memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); LDKQueryChannelRange ret_var = QueryChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26533,22 +26546,22 @@ uint32_t __attribute__((export_name("TS_QueryChannelRange_new"))) TS_QueryChann static inline uintptr_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg) { LDKQueryChannelRange ret_var = QueryChannelRange_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint32_t arg) { LDKQueryChannelRange arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = QueryChannelRange_clone_ptr(&arg_conv); + intptr_t ret_val = QueryChannelRange_clone_ptr(&arg_conv); return ret_val; } @@ -26558,11 +26571,11 @@ uint32_t __attribute__((export_name("TS_QueryChannelRange_clone"))) TS_QueryCha orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKQueryChannelRange ret_var = QueryChannelRange_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26582,7 +26595,7 @@ int8_tArray __attribute__((export_name("TS_ReplyChannelRange_get_chain_hash"))) 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ReplyChannelRange_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -26594,7 +26607,7 @@ void __attribute__((export_name("TS_ReplyChannelRange_set_chain_hash"))) TS_Rep CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); ReplyChannelRange_set_chain_hash(&this_ptr_conv, val_ref); } @@ -26660,7 +26673,7 @@ 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; + int64_t* val_vals = val->elems /* XXX val leaks */; 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; @@ -26671,24 +26684,24 @@ void __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids"))) uint32_t __attribute__((export_name("TS_ReplyChannelRange_new"))) TS_ReplyChannelRange_new(int8_tArray chain_hash_arg, int32_t first_blocknum_arg, int32_t number_of_blocks_arg, jboolean sync_complete_arg, int64_tArray short_channel_ids_arg) { LDKThirtyTwoBytes chain_hash_arg_ref; CHECK(chain_hash_arg->arr_len == 32); - memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); + memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); LDKCVec_u64Z short_channel_ids_arg_constr; short_channel_ids_arg_constr.datalen = short_channel_ids_arg->arr_len; if (short_channel_ids_arg_constr.datalen > 0) 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; + int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems /* XXX short_channel_ids_arg leaks */; 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; } LDKReplyChannelRange ret_var = ReplyChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, short_channel_ids_arg_constr); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26697,22 +26710,22 @@ uint32_t __attribute__((export_name("TS_ReplyChannelRange_new"))) TS_ReplyChann static inline uintptr_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg) { LDKReplyChannelRange ret_var = ReplyChannelRange_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint32_t arg) { LDKReplyChannelRange arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ReplyChannelRange_clone_ptr(&arg_conv); + intptr_t ret_val = ReplyChannelRange_clone_ptr(&arg_conv); return ret_val; } @@ -26722,11 +26735,11 @@ uint32_t __attribute__((export_name("TS_ReplyChannelRange_clone"))) TS_ReplyCha orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKReplyChannelRange ret_var = ReplyChannelRange_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26746,7 +26759,7 @@ int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_get_chain_hash" 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *QueryShortChannelIds_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -26758,7 +26771,7 @@ void __attribute__((export_name("TS_QueryShortChannelIds_set_chain_hash"))) TS_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); QueryShortChannelIds_set_chain_hash(&this_ptr_conv, val_ref); } @@ -26773,7 +26786,7 @@ 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; + int64_t* val_vals = val->elems /* XXX val leaks */; 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; @@ -26784,24 +26797,24 @@ void __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids" uint32_t __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QueryShortChannelIds_new(int8_tArray chain_hash_arg, int64_tArray short_channel_ids_arg) { LDKThirtyTwoBytes chain_hash_arg_ref; CHECK(chain_hash_arg->arr_len == 32); - memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); + memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); LDKCVec_u64Z short_channel_ids_arg_constr; short_channel_ids_arg_constr.datalen = short_channel_ids_arg->arr_len; if (short_channel_ids_arg_constr.datalen > 0) 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; + int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems /* XXX short_channel_ids_arg leaks */; 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; } LDKQueryShortChannelIds ret_var = QueryShortChannelIds_new(chain_hash_arg_ref, short_channel_ids_arg_constr); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26810,22 +26823,22 @@ uint32_t __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QuerySh static inline uintptr_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg) { LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint32_t arg) { LDKQueryShortChannelIds arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = QueryShortChannelIds_clone_ptr(&arg_conv); + intptr_t ret_val = QueryShortChannelIds_clone_ptr(&arg_conv); return ret_val; } @@ -26835,11 +26848,11 @@ uint32_t __attribute__((export_name("TS_QueryShortChannelIds_clone"))) TS_Query orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26859,7 +26872,7 @@ int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_chain_ha 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *ReplyShortChannelIdsEnd_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -26871,7 +26884,7 @@ void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_chain_hash"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); ReplyShortChannelIdsEnd_set_chain_hash(&this_ptr_conv, val_ref); } @@ -26895,13 +26908,13 @@ void __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_full_informatio uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_new"))) TS_ReplyShortChannelIdsEnd_new(int8_tArray chain_hash_arg, jboolean full_information_arg) { LDKThirtyTwoBytes chain_hash_arg_ref; CHECK(chain_hash_arg->arr_len == 32); - memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); + memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_new(chain_hash_arg_ref, full_information_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26910,22 +26923,22 @@ uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_new"))) TS_Repl static inline uintptr_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg) { LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint32_t arg) { LDKReplyShortChannelIdsEnd arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv); + intptr_t ret_val = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv); return ret_val; } @@ -26935,11 +26948,11 @@ uint32_t __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone"))) TS_Re orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -26959,7 +26972,7 @@ int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_get_chain_hash 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *GossipTimestampFilter_get_chain_hash(&this_ptr_conv), 32); return ret_arr; } @@ -26971,7 +26984,7 @@ void __attribute__((export_name("TS_GossipTimestampFilter_set_chain_hash"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); GossipTimestampFilter_set_chain_hash(&this_ptr_conv, val_ref); } @@ -27012,13 +27025,13 @@ void __attribute__((export_name("TS_GossipTimestampFilter_set_timestamp_range") uint32_t __attribute__((export_name("TS_GossipTimestampFilter_new"))) TS_GossipTimestampFilter_new(int8_tArray chain_hash_arg, int32_t first_timestamp_arg, int32_t timestamp_range_arg) { LDKThirtyTwoBytes chain_hash_arg_ref; CHECK(chain_hash_arg->arr_len == 32); - memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); + memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg); LDKGossipTimestampFilter ret_var = GossipTimestampFilter_new(chain_hash_arg_ref, first_timestamp_arg, timestamp_range_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27027,22 +27040,22 @@ uint32_t __attribute__((export_name("TS_GossipTimestampFilter_new"))) TS_Gossip static inline uintptr_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg) { LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint32_t arg) { LDKGossipTimestampFilter arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = GossipTimestampFilter_clone_ptr(&arg_conv); + intptr_t ret_val = GossipTimestampFilter_clone_ptr(&arg_conv); return ret_val; } @@ -27052,11 +27065,11 @@ uint32_t __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_Goss orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27065,7 +27078,7 @@ uint32_t __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_Goss void __attribute__((export_name("TS_ErrorAction_free"))) TS_ErrorAction_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKErrorAction this_ptr_conv = *(LDKErrorAction*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -27075,12 +27088,12 @@ void __attribute__((export_name("TS_ErrorAction_free"))) TS_ErrorAction_free(ui static inline uintptr_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg) { LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint32_t arg) { LDKErrorAction* arg_conv = (LDKErrorAction*)arg; - int64_t ret_val = ErrorAction_clone_ptr(arg_conv); + intptr_t ret_val = ErrorAction_clone_ptr(arg_conv); return ret_val; } @@ -27088,7 +27101,7 @@ uint32_t __attribute__((export_name("TS_ErrorAction_clone"))) TS_ErrorAction_cl LDKErrorAction* orig_conv = (LDKErrorAction*)orig; LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -27100,14 +27113,14 @@ uint32_t __attribute__((export_name("TS_ErrorAction_disconnect_peer"))) TS_Erro msg_conv = ErrorMessage_clone(&msg_conv); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_disconnect_peer(msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ErrorAction_ignore_error"))) TS_ErrorAction_ignore_error() { LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_ignore_error(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -27115,14 +27128,14 @@ uint32_t __attribute__((export_name("TS_ErrorAction_ignore_and_log"))) TS_Error LDKLevel a_conv = LDKLevel_from_js(a); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_ignore_and_log(a_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_ErrorAction_ignore_duplicate_gossip"))) TS_ErrorAction_ignore_duplicate_gossip() { LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_ignore_duplicate_gossip(); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -27134,7 +27147,7 @@ uint32_t __attribute__((export_name("TS_ErrorAction_send_error_message"))) TS_E msg_conv = ErrorMessage_clone(&msg_conv); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = ErrorAction_send_error_message(msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -27173,7 +27186,7 @@ uint32_t __attribute__((export_name("TS_LightningError_get_action"))) TS_Lightn CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction"); *ret_copy = LightningError_get_action(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -27182,25 +27195,25 @@ void __attribute__((export_name("TS_LightningError_set_action"))) TS_LightningE 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKErrorAction val_conv = *(LDKErrorAction*)(val_ptr); - val_conv = ErrorAction_clone((LDKErrorAction*)(((uint64_t)val) & ~1)); + val_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)val) & ~1)); LightningError_set_action(&this_ptr_conv, val_conv); } uint32_t __attribute__((export_name("TS_LightningError_new"))) TS_LightningError_new(jstring err_arg, uint32_t action_arg) { LDKStr err_arg_conv = str_ref_to_owned_c(err_arg); - void* action_arg_ptr = (void*)(((uint64_t)action_arg) & ~1); + void* action_arg_ptr = (void*)(((uintptr_t)action_arg) & ~1); CHECK_ACCESS(action_arg_ptr); LDKErrorAction action_arg_conv = *(LDKErrorAction*)(action_arg_ptr); - action_arg_conv = ErrorAction_clone((LDKErrorAction*)(((uint64_t)action_arg) & ~1)); + action_arg_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action_arg) & ~1)); LDKLightningError ret_var = LightningError_new(err_arg_conv, action_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27209,22 +27222,22 @@ uint32_t __attribute__((export_name("TS_LightningError_new"))) TS_LightningErro static inline uintptr_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg) { LDKLightningError ret_var = LightningError_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint32_t arg) { LDKLightningError arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = LightningError_clone_ptr(&arg_conv); + intptr_t ret_val = LightningError_clone_ptr(&arg_conv); return ret_val; } @@ -27234,11 +27247,11 @@ uint32_t __attribute__((export_name("TS_LightningError_clone"))) TS_LightningEr orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKLightningError ret_var = LightningError_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27260,15 +27273,15 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_add_ht CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t p = 0; p < ret_var.datalen; p++) { LDKUpdateAddHTLC ret_conv_15_var = ret_var.data[p]; - uint64_t ret_conv_15_ref = 0; - CHECK((((uint64_t)ret_conv_15_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_15_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_15_ref = 0; + CHECK((((uintptr_t)ret_conv_15_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_15_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_15_var); - ret_conv_15_ref = (uint64_t)ret_conv_15_var.inner; + ret_conv_15_ref = (uintptr_t)ret_conv_15_var.inner; if (ret_conv_15_var.is_owned) { ret_conv_15_ref |= 1; } @@ -27290,7 +27303,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; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t p = 0; p < val_constr.datalen; p++) { uint32_t val_conv_15 = val_vals[p]; LDKUpdateAddHTLC val_conv_15_conv; @@ -27310,15 +27323,15 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfil CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t t = 0; t < ret_var.datalen; t++) { LDKUpdateFulfillHTLC ret_conv_19_var = ret_var.data[t]; - uint64_t ret_conv_19_ref = 0; - CHECK((((uint64_t)ret_conv_19_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_19_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_19_ref = 0; + CHECK((((uintptr_t)ret_conv_19_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_19_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_19_var); - ret_conv_19_ref = (uint64_t)ret_conv_19_var.inner; + ret_conv_19_ref = (uintptr_t)ret_conv_19_var.inner; if (ret_conv_19_var.is_owned) { ret_conv_19_ref |= 1; } @@ -27340,7 +27353,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; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t t = 0; t < val_constr.datalen; t++) { uint32_t val_conv_19 = val_vals[t]; LDKUpdateFulfillHTLC val_conv_19_conv; @@ -27360,15 +27373,15 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_h CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t q = 0; q < ret_var.datalen; q++) { LDKUpdateFailHTLC ret_conv_16_var = ret_var.data[q]; - uint64_t ret_conv_16_ref = 0; - CHECK((((uint64_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_16_ref = 0; + CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var); - ret_conv_16_ref = (uint64_t)ret_conv_16_var.inner; + ret_conv_16_ref = (uintptr_t)ret_conv_16_var.inner; if (ret_conv_16_var.is_owned) { ret_conv_16_ref |= 1; } @@ -27390,7 +27403,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; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t q = 0; q < val_constr.datalen; q++) { uint32_t val_conv_16 = val_vals[q]; LDKUpdateFailHTLC val_conv_16_conv; @@ -27410,15 +27423,15 @@ uint32_tArray __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_m CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); 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); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t z = 0; z < ret_var.datalen; z++) { LDKUpdateFailMalformedHTLC ret_conv_25_var = ret_var.data[z]; - uint64_t ret_conv_25_ref = 0; - CHECK((((uint64_t)ret_conv_25_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_25_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_25_ref = 0; + CHECK((((uintptr_t)ret_conv_25_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_25_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_25_var); - ret_conv_25_ref = (uint64_t)ret_conv_25_var.inner; + ret_conv_25_ref = (uintptr_t)ret_conv_25_var.inner; if (ret_conv_25_var.is_owned) { ret_conv_25_ref |= 1; } @@ -27440,7 +27453,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; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t z = 0; z < val_constr.datalen; z++) { uint32_t val_conv_25 = val_vals[z]; LDKUpdateFailMalformedHTLC val_conv_25_conv; @@ -27459,12 +27472,12 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_get_update_fee"))) TS_ this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKUpdateFee ret_var = CommitmentUpdate_get_update_fee(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27491,11 +27504,11 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_get_commitment_signed" this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCommitmentSigned ret_var = CommitmentUpdate_get_commitment_signed(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27522,7 +27535,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; + uint32_t* update_add_htlcs_arg_vals = update_add_htlcs_arg->elems /* XXX update_add_htlcs_arg leaks */; 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; @@ -27538,7 +27551,7 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU 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; + uint32_t* update_fulfill_htlcs_arg_vals = update_fulfill_htlcs_arg->elems /* XXX update_fulfill_htlcs_arg leaks */; 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; @@ -27554,7 +27567,7 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU 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; + uint32_t* update_fail_htlcs_arg_vals = update_fail_htlcs_arg->elems /* XXX update_fail_htlcs_arg leaks */; 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; @@ -27570,7 +27583,7 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU 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; + uint32_t* update_fail_malformed_htlcs_arg_vals = update_fail_malformed_htlcs_arg->elems /* XXX update_fail_malformed_htlcs_arg leaks */; 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; @@ -27591,11 +27604,11 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_signed_arg_conv); commitment_signed_arg_conv = CommitmentSigned_clone(&commitment_signed_arg_conv); LDKCommitmentUpdate ret_var = CommitmentUpdate_new(update_add_htlcs_arg_constr, update_fulfill_htlcs_arg_constr, update_fail_htlcs_arg_constr, update_fail_malformed_htlcs_arg_constr, update_fee_arg_conv, commitment_signed_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27604,22 +27617,22 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU static inline uintptr_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg) { LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint32_t arg) { LDKCommitmentUpdate arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = CommitmentUpdate_clone_ptr(&arg_conv); + intptr_t ret_val = CommitmentUpdate_clone_ptr(&arg_conv); return ret_val; } @@ -27629,11 +27642,11 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_Commitmen orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -27642,7 +27655,7 @@ uint32_t __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_Commitmen void __attribute__((export_name("TS_ChannelMessageHandler_free"))) TS_ChannelMessageHandler_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKChannelMessageHandler this_ptr_conv = *(LDKChannelMessageHandler*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -27651,7 +27664,7 @@ void __attribute__((export_name("TS_ChannelMessageHandler_free"))) TS_ChannelMe void __attribute__((export_name("TS_RoutingMessageHandler_free"))) TS_RoutingMessageHandler_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKRoutingMessageHandler this_ptr_conv = *(LDKRoutingMessageHandler*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -27664,7 +27677,7 @@ int8_tArray __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptCha obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = AcceptChannel_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27673,10 +27686,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ"); *ret_conv = AcceptChannel_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_AnnouncementSignatures_write(uint32_t obj) { @@ -27685,7 +27698,7 @@ int8_tArray __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_ obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = AnnouncementSignatures_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27694,10 +27707,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ"); *ret_conv = AnnouncementSignatures_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_ChannelReestablish_write(uint32_t obj) { @@ -27706,7 +27719,7 @@ int8_tArray __attribute__((export_name("TS_ChannelReestablish_write"))) TS_Chan obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelReestablish_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27715,10 +27728,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ"); *ret_conv = ChannelReestablish_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSigned_write(uint32_t obj) { @@ -27727,7 +27740,7 @@ int8_tArray __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSi obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ClosingSigned_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27736,10 +27749,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ"); *ret_conv = ClosingSigned_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_ClosingSignedFeeRange_write(uint32_t obj) { @@ -27748,7 +27761,7 @@ int8_tArray __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_C obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ClosingSignedFeeRange_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27757,10 +27770,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ"); *ret_conv = ClosingSignedFeeRange_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_CommitmentSigned_write(uint32_t obj) { @@ -27769,7 +27782,7 @@ int8_tArray __attribute__((export_name("TS_CommitmentSigned_write"))) TS_Commit obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = CommitmentSigned_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27778,10 +27791,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ"); *ret_conv = CommitmentSigned_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingCreated_write(uint32_t obj) { @@ -27790,7 +27803,7 @@ int8_tArray __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingC obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = FundingCreated_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27799,10 +27812,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ"); *ret_conv = FundingCreated_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSigned_write(uint32_t obj) { @@ -27811,7 +27824,7 @@ int8_tArray __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSi obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = FundingSigned_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27820,10 +27833,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ"); *ret_conv = FundingSigned_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_FundingLocked_write"))) TS_FundingLocked_write(uint32_t obj) { @@ -27832,7 +27845,7 @@ int8_tArray __attribute__((export_name("TS_FundingLocked_write"))) TS_FundingLo obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = FundingLocked_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27841,10 +27854,10 @@ int8_tArray __attribute__((export_name("TS_FundingLocked_write"))) TS_FundingLo uint32_t __attribute__((export_name("TS_FundingLocked_read"))) TS_FundingLocked_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ"); *ret_conv = FundingLocked_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_t obj) { @@ -27853,7 +27866,7 @@ int8_tArray __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_ obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = Init_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27862,10 +27875,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ"); *ret_conv = Init_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel_write(uint32_t obj) { @@ -27874,7 +27887,7 @@ int8_tArray __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = OpenChannel_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27883,10 +27896,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ"); *ret_conv = OpenChannel_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndACK_write(uint32_t obj) { @@ -27895,7 +27908,7 @@ int8_tArray __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndA obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = RevokeAndACK_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27904,10 +27917,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ"); *ret_conv = RevokeAndACK_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write(uint32_t obj) { @@ -27916,7 +27929,7 @@ int8_tArray __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = Shutdown_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27925,10 +27938,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ"); *ret_conv = Shutdown_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFailHTLC_write(uint32_t obj) { @@ -27937,7 +27950,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFa obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UpdateFailHTLC_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27946,10 +27959,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ"); *ret_conv = UpdateFailHTLC_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS_UpdateFailMalformedHTLC_write(uint32_t obj) { @@ -27958,7 +27971,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UpdateFailMalformedHTLC_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27967,10 +27980,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ"); *ret_conv = UpdateFailMalformedHTLC_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_write(uint32_t obj) { @@ -27979,7 +27992,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_wri obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UpdateFee_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -27988,10 +28001,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ"); *ret_conv = UpdateFee_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_UpdateFulfillHTLC_write(uint32_t obj) { @@ -28000,7 +28013,7 @@ int8_tArray __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_Updat obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UpdateFulfillHTLC_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28009,10 +28022,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ"); *ret_conv = UpdateFulfillHTLC_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAddHTLC_write(uint32_t obj) { @@ -28021,7 +28034,7 @@ int8_tArray __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAdd obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UpdateAddHTLC_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28030,10 +28043,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ"); *ret_conv = UpdateAddHTLC_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_t obj) { @@ -28042,7 +28055,7 @@ int8_tArray __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_ obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = Ping_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28051,10 +28064,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ"); *ret_conv = Ping_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_t obj) { @@ -28063,7 +28076,7 @@ int8_tArray __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_ obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = Pong_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28072,10 +28085,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ"); *ret_conv = Pong_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write"))) TS_UnsignedChannelAnnouncement_write(uint32_t obj) { @@ -28084,7 +28097,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelAnnouncement_write")) obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UnsignedChannelAnnouncement_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28093,10 +28106,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ"); *ret_conv = UnsignedChannelAnnouncement_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_ChannelAnnouncement_write(uint32_t obj) { @@ -28105,7 +28118,7 @@ int8_tArray __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_Cha obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelAnnouncement_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28114,10 +28127,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ"); *ret_conv = ChannelAnnouncement_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_UnsignedChannelUpdate_write(uint32_t obj) { @@ -28126,7 +28139,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_U obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UnsignedChannelUpdate_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28135,10 +28148,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ"); *ret_conv = UnsignedChannelUpdate_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUpdate_write(uint32_t obj) { @@ -28147,7 +28160,7 @@ int8_tArray __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUp obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelUpdate_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28156,10 +28169,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ"); *ret_conv = ChannelUpdate_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessage_write(uint32_t obj) { @@ -28168,7 +28181,7 @@ int8_tArray __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessa obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ErrorMessage_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28177,10 +28190,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ"); *ret_conv = ErrorMessage_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) TS_UnsignedNodeAnnouncement_write(uint32_t obj) { @@ -28189,7 +28202,7 @@ int8_tArray __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) T obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = UnsignedNodeAnnouncement_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28198,10 +28211,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ"); *ret_conv = UnsignedNodeAnnouncement_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAnnouncement_write(uint32_t obj) { @@ -28210,7 +28223,7 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAn obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = NodeAnnouncement_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28219,19 +28232,19 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ"); *ret_conv = NodeAnnouncement_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ"); *ret_conv = QueryShortChannelIds_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_QueryShortChannelIds_write(uint32_t obj) { @@ -28240,7 +28253,7 @@ int8_tArray __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_Qu obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = QueryShortChannelIds_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28252,7 +28265,7 @@ int8_tArray __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ReplyShortChannelIdsEnd_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28261,10 +28274,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ"); *ret_conv = ReplyShortChannelIdsEnd_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int32_t __attribute__((export_name("TS_QueryChannelRange_end_blocknum"))) TS_QueryChannelRange_end_blocknum(uint32_t this_arg) { @@ -28282,7 +28295,7 @@ int8_tArray __attribute__((export_name("TS_QueryChannelRange_write"))) TS_Query obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = QueryChannelRange_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28291,19 +28304,19 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ"); *ret_conv = QueryChannelRange_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ"); *ret_conv = ReplyChannelRange_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_ReplyChannelRange_write(uint32_t obj) { @@ -28312,7 +28325,7 @@ int8_tArray __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_Reply obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ReplyChannelRange_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28324,7 +28337,7 @@ int8_tArray __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_G obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = GossipTimestampFilter_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -28333,15 +28346,15 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ"); *ret_conv = GossipTimestampFilter_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_CustomMessageHandler_free"))) TS_CustomMessageHandler_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKCustomMessageHandler this_ptr_conv = *(LDKCustomMessageHandler*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -28358,11 +28371,11 @@ void __attribute__((export_name("TS_IgnoringMessageHandler_free"))) TS_Ignoring uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_new"))) TS_IgnoringMessageHandler_new() { LDKIgnoringMessageHandler ret_var = IgnoringMessageHandler_new(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -28376,7 +28389,7 @@ uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_MessageSendEv CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = IgnoringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessageHandler"))) TS_IgnoringMessageHandler_as_RoutingMessageHandler(uint32_t this_arg) { @@ -28386,7 +28399,7 @@ uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessag CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *ret_ret = IgnoringMessageHandler_as_RoutingMessageHandler(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageReader"))) TS_IgnoringMessageHandler_as_CustomMessageReader(uint32_t this_arg) { @@ -28396,7 +28409,7 @@ uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessage CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCustomMessageReader* ret_ret = MALLOC(sizeof(LDKCustomMessageReader), "LDKCustomMessageReader"); *ret_ret = IgnoringMessageHandler_as_CustomMessageReader(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageHandler"))) TS_IgnoringMessageHandler_as_CustomMessageHandler(uint32_t this_arg) { @@ -28406,7 +28419,7 @@ uint32_t __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessage CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCustomMessageHandler* ret_ret = MALLOC(sizeof(LDKCustomMessageHandler), "LDKCustomMessageHandler"); *ret_ret = IgnoringMessageHandler_as_CustomMessageHandler(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_ErroringMessageHandler_free(uint32_t this_obj) { @@ -28419,11 +28432,11 @@ void __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_Erroring uint32_t __attribute__((export_name("TS_ErroringMessageHandler_new"))) TS_ErroringMessageHandler_new() { LDKErroringMessageHandler ret_var = ErroringMessageHandler_new(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -28437,7 +28450,7 @@ uint32_t __attribute__((export_name("TS_ErroringMessageHandler_as_MessageSendEv CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = ErroringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessageHandler"))) TS_ErroringMessageHandler_as_ChannelMessageHandler(uint32_t this_arg) { @@ -28447,7 +28460,7 @@ uint32_t __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessag CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler"); *ret_ret = ErroringMessageHandler_as_ChannelMessageHandler(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_MessageHandler_free"))) TS_MessageHandler_free(uint32_t this_obj) { @@ -28464,7 +28477,7 @@ uint32_t __attribute__((export_name("TS_MessageHandler_get_chan_handler"))) TS_ this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); // WARNING: This object doesn't live past this scope, needs clone! - uint64_t ret_ret = ((uint64_t)MessageHandler_get_chan_handler(&this_ptr_conv)) | 1; + uintptr_t ret_ret = ((uintptr_t)MessageHandler_get_chan_handler(&this_ptr_conv)) | 1; return ret_ret; } @@ -28473,7 +28486,7 @@ void __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_Mess 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)(val_ptr); MessageHandler_set_chan_handler(&this_ptr_conv, val_conv); @@ -28485,7 +28498,7 @@ uint32_t __attribute__((export_name("TS_MessageHandler_get_route_handler"))) TS this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); // WARNING: This object doesn't live past this scope, needs clone! - uint64_t ret_ret = ((uint64_t)MessageHandler_get_route_handler(&this_ptr_conv)) | 1; + uintptr_t ret_ret = ((uintptr_t)MessageHandler_get_route_handler(&this_ptr_conv)) | 1; return ret_ret; } @@ -28494,25 +28507,25 @@ void __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_Mes 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)(val_ptr); MessageHandler_set_route_handler(&this_ptr_conv, val_conv); } uint32_t __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandler_new(uint32_t chan_handler_arg, uint32_t route_handler_arg) { - void* chan_handler_arg_ptr = (void*)(((uint64_t)chan_handler_arg) & ~1); + void* chan_handler_arg_ptr = (void*)(((uintptr_t)chan_handler_arg) & ~1); CHECK_ACCESS(chan_handler_arg_ptr); LDKChannelMessageHandler chan_handler_arg_conv = *(LDKChannelMessageHandler*)(chan_handler_arg_ptr); - void* route_handler_arg_ptr = (void*)(((uint64_t)route_handler_arg) & ~1); + void* route_handler_arg_ptr = (void*)(((uintptr_t)route_handler_arg) & ~1); CHECK_ACCESS(route_handler_arg_ptr); LDKRoutingMessageHandler route_handler_arg_conv = *(LDKRoutingMessageHandler*)(route_handler_arg_ptr); LDKMessageHandler ret_var = MessageHandler_new(chan_handler_arg_conv, route_handler_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -28522,28 +28535,28 @@ uint32_t __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandle static inline uintptr_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg) { LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *ret_ret = SocketDescriptor_clone(arg); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } -int64_t __attribute__((export_name("TS_SocketDescriptor_clone_ptr"))) TS_SocketDescriptor_clone_ptr(uint32_t arg) { - void* arg_ptr = (void*)(((uint64_t)arg) & ~1); +intptr_t __attribute__((export_name("TS_SocketDescriptor_clone_ptr"))) TS_SocketDescriptor_clone_ptr(uint32_t arg) { + void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); } LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg_ptr; - int64_t ret_val = SocketDescriptor_clone_ptr(arg_conv); + intptr_t ret_val = SocketDescriptor_clone_ptr(arg_conv); return ret_val; } uint32_t __attribute__((export_name("TS_SocketDescriptor_clone"))) TS_SocketDescriptor_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uint64_t)orig) & ~1); + void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } LDKSocketDescriptor* orig_conv = (LDKSocketDescriptor*)orig_ptr; LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor"); *ret_ret = SocketDescriptor_clone(orig_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_SocketDescriptor_free"))) TS_SocketDescriptor_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKSocketDescriptor this_ptr_conv = *(LDKSocketDescriptor*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -28577,11 +28590,11 @@ void __attribute__((export_name("TS_PeerHandleError_set_no_connection_possible" uint32_t __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleError_new(jboolean no_connection_possible_arg) { LDKPeerHandleError ret_var = PeerHandleError_new(no_connection_possible_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -28590,22 +28603,22 @@ uint32_t __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleEr static inline uintptr_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg) { LDKPeerHandleError ret_var = PeerHandleError_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint32_t arg) { LDKPeerHandleError arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = PeerHandleError_clone_ptr(&arg_conv); + intptr_t ret_val = PeerHandleError_clone_ptr(&arg_conv); return ret_val; } @@ -28615,11 +28628,11 @@ uint32_t __attribute__((export_name("TS_PeerHandleError_clone"))) TS_PeerHandle orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKPeerHandleError ret_var = PeerHandleError_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -28642,23 +28655,23 @@ uint32_t __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new( // Warning: we need a move here but no clone is available for LDKMessageHandler LDKSecretKey our_node_secret_ref; CHECK(our_node_secret->arr_len == 32); - memcpy(our_node_secret_ref.bytes, our_node_secret->elems, 32); + memcpy(our_node_secret_ref.bytes, our_node_secret->elems, 32); FREE(our_node_secret); unsigned char ephemeral_random_data_arr[32]; CHECK(ephemeral_random_data->arr_len == 32); - memcpy(ephemeral_random_data_arr, ephemeral_random_data->elems, 32); + memcpy(ephemeral_random_data_arr, ephemeral_random_data->elems, 32); FREE(ephemeral_random_data); unsigned char (*ephemeral_random_data_ref)[32] = &ephemeral_random_data_arr; - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); - void* custom_message_handler_ptr = (void*)(((uint64_t)custom_message_handler) & ~1); + void* custom_message_handler_ptr = (void*)(((uintptr_t)custom_message_handler) & ~1); CHECK_ACCESS(custom_message_handler_ptr); LDKCustomMessageHandler custom_message_handler_conv = *(LDKCustomMessageHandler*)(custom_message_handler_ptr); LDKPeerManager ret_var = PeerManager_new(message_handler_conv, our_node_secret_ref, ephemeral_random_data_ref, logger_conv, custom_message_handler_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -28672,10 +28685,10 @@ ptrArray __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_Pe CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKCVec_PublicKeyZ ret_var = PeerManager_get_peer_node_ids(&this_arg_conv); ptrArray ret_arr = NULL; - ret_arr = init_ptrArray(ret_var.datalen); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4); for (size_t m = 0; m < ret_var.datalen; m++) { - int8_tArray ret_conv_12_arr = init_int8_tArray(33); + int8_tArray ret_conv_12_arr = init_int8_tArray(33, __LINE__); memcpy(ret_conv_12_arr->elems, ret_var.data[m].compressed_form, 33); ret_arr_ptr[m] = ret_conv_12_arr; } @@ -28691,13 +28704,13 @@ uint32_t __attribute__((export_name("TS_PeerManager_new_outbound_connection"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKPublicKey their_node_id_ref; CHECK(their_node_id->arr_len == 33); - memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); - void* descriptor_ptr = (void*)(((uint64_t)descriptor) & ~1); + memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id); + void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); CHECK_ACCESS(descriptor_ptr); LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr); LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ"); *ret_conv = PeerManager_new_outbound_connection(&this_arg_conv, their_node_id_ref, descriptor_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) TS_PeerManager_new_inbound_connection(uint32_t this_arg, uint32_t descriptor) { @@ -28705,12 +28718,12 @@ uint32_t __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uint64_t)descriptor) & ~1); + void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); CHECK_ACCESS(descriptor_ptr); LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr); LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = PeerManager_new_inbound_connection(&this_arg_conv, descriptor_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_PeerManager_write_buffer_space_avail"))) TS_PeerManager_write_buffer_space_avail(uint32_t this_arg, uint32_t descriptor) { @@ -28718,12 +28731,12 @@ uint32_t __attribute__((export_name("TS_PeerManager_write_buffer_space_avail")) this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uint64_t)descriptor) & ~1); + void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); } LDKSocketDescriptor* descriptor_conv = (LDKSocketDescriptor*)descriptor_ptr; LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ"); *ret_conv = PeerManager_write_buffer_space_avail(&this_arg_conv, descriptor_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManager_read_event(uint32_t this_arg, uint32_t peer_descriptor, int8_tArray data) { @@ -28731,15 +28744,15 @@ uint32_t __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManag this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* peer_descriptor_ptr = (void*)(((uint64_t)peer_descriptor) & ~1); + void* peer_descriptor_ptr = (void*)(((uintptr_t)peer_descriptor) & ~1); if (!(peer_descriptor & 1)) { CHECK_ACCESS(peer_descriptor_ptr); } LDKSocketDescriptor* peer_descriptor_conv = (LDKSocketDescriptor*)peer_descriptor_ptr; LDKu8slice data_ref; data_ref.datalen = data->arr_len; - data_ref.data = data->elems; + data_ref.data = data->elems /* XXX data leaks */; LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ"); *ret_conv = PeerManager_read_event(&this_arg_conv, peer_descriptor_conv, data_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_PeerManager_process_events"))) TS_PeerManager_process_events(uint32_t this_arg) { @@ -28755,7 +28768,7 @@ void __attribute__((export_name("TS_PeerManager_socket_disconnected"))) TS_Peer this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* descriptor_ptr = (void*)(((uint64_t)descriptor) & ~1); + void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1); if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); } LDKSocketDescriptor* descriptor_conv = (LDKSocketDescriptor*)descriptor_ptr; PeerManager_socket_disconnected(&this_arg_conv, descriptor_conv); @@ -28768,7 +28781,7 @@ void __attribute__((export_name("TS_PeerManager_disconnect_by_node_id"))) TS_Pe CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); PeerManager_disconnect_by_node_id(&this_arg_conv, node_id_ref, no_connection_possible); } @@ -28801,9 +28814,9 @@ int64_t __attribute__((export_name("TS_htlc_timeout_tx_weight"))) TS_htlc_timeo int8_tArray __attribute__((export_name("TS_build_commitment_secret"))) TS_build_commitment_secret(int8_tArray commitment_seed, int64_t idx) { unsigned char commitment_seed_arr[32]; CHECK(commitment_seed->arr_len == 32); - memcpy(commitment_seed_arr, commitment_seed->elems, 32); + memcpy(commitment_seed_arr, commitment_seed->elems, 32); FREE(commitment_seed); unsigned char (*commitment_seed_ref)[32] = &commitment_seed_arr; - int8_tArray ret_arr = init_int8_tArray(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, build_commitment_secret(commitment_seed_ref, idx).data, 32); return ret_arr; } @@ -28812,18 +28825,18 @@ int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_bui LDKCVec_u8Z to_holder_script_ref; to_holder_script_ref.datalen = to_holder_script->arr_len; to_holder_script_ref.data = MALLOC(to_holder_script_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(to_holder_script_ref.data, to_holder_script->elems, to_holder_script_ref.datalen); + memcpy(to_holder_script_ref.data, to_holder_script->elems, to_holder_script_ref.datalen); FREE(to_holder_script); LDKCVec_u8Z to_counterparty_script_ref; to_counterparty_script_ref.datalen = to_counterparty_script->arr_len; to_counterparty_script_ref.data = MALLOC(to_counterparty_script_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(to_counterparty_script_ref.data, to_counterparty_script->elems, to_counterparty_script_ref.datalen); + memcpy(to_counterparty_script_ref.data, to_counterparty_script->elems, to_counterparty_script_ref.datalen); FREE(to_counterparty_script); LDKOutPoint funding_outpoint_conv; funding_outpoint_conv.inner = (void*)(funding_outpoint & (~1)); funding_outpoint_conv.is_owned = (funding_outpoint & 1) || (funding_outpoint == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_conv); funding_outpoint_conv = OutPoint_clone(&funding_outpoint_conv); LDKTransaction ret_var = build_closing_transaction(to_holder_value_sat, to_counterparty_value_sat, to_holder_script_ref, to_counterparty_script_ref, funding_outpoint_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); Transaction_free(ret_var); return ret_arr; @@ -28832,52 +28845,52 @@ int8_tArray __attribute__((export_name("TS_build_closing_transaction"))) TS_bui uint32_t __attribute__((export_name("TS_derive_private_key"))) TS_derive_private_key(int8_tArray per_commitment_point, int8_tArray base_secret) { LDKPublicKey per_commitment_point_ref; CHECK(per_commitment_point->arr_len == 33); - memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); + memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); FREE(per_commitment_point); unsigned char base_secret_arr[32]; CHECK(base_secret->arr_len == 32); - memcpy(base_secret_arr, base_secret->elems, 32); + memcpy(base_secret_arr, base_secret->elems, 32); FREE(base_secret); unsigned char (*base_secret_ref)[32] = &base_secret_arr; LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = derive_private_key(per_commitment_point_ref, base_secret_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_derive_public_key"))) TS_derive_public_key(int8_tArray per_commitment_point, int8_tArray base_point) { LDKPublicKey per_commitment_point_ref; CHECK(per_commitment_point->arr_len == 33); - memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); + memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); FREE(per_commitment_point); LDKPublicKey base_point_ref; CHECK(base_point->arr_len == 33); - memcpy(base_point_ref.compressed_form, base_point->elems, 33); + memcpy(base_point_ref.compressed_form, base_point->elems, 33); FREE(base_point); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = derive_public_key(per_commitment_point_ref, base_point_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_derive_private_revocation_key"))) TS_derive_private_revocation_key(int8_tArray per_commitment_secret, int8_tArray countersignatory_revocation_base_secret) { unsigned char per_commitment_secret_arr[32]; CHECK(per_commitment_secret->arr_len == 32); - memcpy(per_commitment_secret_arr, per_commitment_secret->elems, 32); + memcpy(per_commitment_secret_arr, per_commitment_secret->elems, 32); FREE(per_commitment_secret); unsigned char (*per_commitment_secret_ref)[32] = &per_commitment_secret_arr; unsigned char countersignatory_revocation_base_secret_arr[32]; CHECK(countersignatory_revocation_base_secret->arr_len == 32); - memcpy(countersignatory_revocation_base_secret_arr, countersignatory_revocation_base_secret->elems, 32); + memcpy(countersignatory_revocation_base_secret_arr, countersignatory_revocation_base_secret->elems, 32); FREE(countersignatory_revocation_base_secret); unsigned char (*countersignatory_revocation_base_secret_ref)[32] = &countersignatory_revocation_base_secret_arr; LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ"); *ret_conv = derive_private_revocation_key(per_commitment_secret_ref, countersignatory_revocation_base_secret_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_derive_public_revocation_key"))) TS_derive_public_revocation_key(int8_tArray per_commitment_point, int8_tArray countersignatory_revocation_base_point) { LDKPublicKey per_commitment_point_ref; CHECK(per_commitment_point->arr_len == 33); - memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); + memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); FREE(per_commitment_point); LDKPublicKey countersignatory_revocation_base_point_ref; CHECK(countersignatory_revocation_base_point->arr_len == 33); - memcpy(countersignatory_revocation_base_point_ref.compressed_form, countersignatory_revocation_base_point->elems, 33); + memcpy(countersignatory_revocation_base_point_ref.compressed_form, countersignatory_revocation_base_point->elems, 33); FREE(countersignatory_revocation_base_point); LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ"); *ret_conv = derive_public_revocation_key(per_commitment_point_ref, countersignatory_revocation_base_point_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_TxCreationKeys_free"))) TS_TxCreationKeys_free(uint32_t this_obj) { @@ -28893,7 +28906,7 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_per_commitment_po 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, TxCreationKeys_get_per_commitment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -28905,7 +28918,7 @@ void __attribute__((export_name("TS_TxCreationKeys_set_per_commitment_point"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_per_commitment_point(&this_ptr_conv, val_ref); } @@ -28914,7 +28927,7 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_revocation_key")) 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, TxCreationKeys_get_revocation_key(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -28926,7 +28939,7 @@ void __attribute__((export_name("TS_TxCreationKeys_set_revocation_key"))) TS_Tx CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_revocation_key(&this_ptr_conv, val_ref); } @@ -28935,7 +28948,7 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_htlc_ 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, TxCreationKeys_get_broadcaster_htlc_key(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -28947,7 +28960,7 @@ void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_htlc_key"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_broadcaster_htlc_key(&this_ptr_conv, val_ref); } @@ -28956,7 +28969,7 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_countersignatory_ 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, TxCreationKeys_get_countersignatory_htlc_key(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -28968,7 +28981,7 @@ void __attribute__((export_name("TS_TxCreationKeys_set_countersignatory_htlc_ke CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_countersignatory_htlc_key(&this_ptr_conv, val_ref); } @@ -28977,7 +28990,7 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_get_broadcaster_delay 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, TxCreationKeys_get_broadcaster_delayed_payment_key(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -28989,32 +29002,32 @@ void __attribute__((export_name("TS_TxCreationKeys_set_broadcaster_delayed_paym CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); TxCreationKeys_set_broadcaster_delayed_payment_key(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_TxCreationKeys_new"))) TS_TxCreationKeys_new(int8_tArray per_commitment_point_arg, int8_tArray revocation_key_arg, int8_tArray broadcaster_htlc_key_arg, int8_tArray countersignatory_htlc_key_arg, int8_tArray broadcaster_delayed_payment_key_arg) { LDKPublicKey per_commitment_point_arg_ref; CHECK(per_commitment_point_arg->arr_len == 33); - memcpy(per_commitment_point_arg_ref.compressed_form, per_commitment_point_arg->elems, 33); + memcpy(per_commitment_point_arg_ref.compressed_form, per_commitment_point_arg->elems, 33); FREE(per_commitment_point_arg); LDKPublicKey revocation_key_arg_ref; CHECK(revocation_key_arg->arr_len == 33); - memcpy(revocation_key_arg_ref.compressed_form, revocation_key_arg->elems, 33); + memcpy(revocation_key_arg_ref.compressed_form, revocation_key_arg->elems, 33); FREE(revocation_key_arg); LDKPublicKey broadcaster_htlc_key_arg_ref; CHECK(broadcaster_htlc_key_arg->arr_len == 33); - memcpy(broadcaster_htlc_key_arg_ref.compressed_form, broadcaster_htlc_key_arg->elems, 33); + memcpy(broadcaster_htlc_key_arg_ref.compressed_form, broadcaster_htlc_key_arg->elems, 33); FREE(broadcaster_htlc_key_arg); LDKPublicKey countersignatory_htlc_key_arg_ref; CHECK(countersignatory_htlc_key_arg->arr_len == 33); - memcpy(countersignatory_htlc_key_arg_ref.compressed_form, countersignatory_htlc_key_arg->elems, 33); + memcpy(countersignatory_htlc_key_arg_ref.compressed_form, countersignatory_htlc_key_arg->elems, 33); FREE(countersignatory_htlc_key_arg); LDKPublicKey broadcaster_delayed_payment_key_arg_ref; CHECK(broadcaster_delayed_payment_key_arg->arr_len == 33); - memcpy(broadcaster_delayed_payment_key_arg_ref.compressed_form, broadcaster_delayed_payment_key_arg->elems, 33); + memcpy(broadcaster_delayed_payment_key_arg_ref.compressed_form, broadcaster_delayed_payment_key_arg->elems, 33); FREE(broadcaster_delayed_payment_key_arg); LDKTxCreationKeys ret_var = TxCreationKeys_new(per_commitment_point_arg_ref, revocation_key_arg_ref, broadcaster_htlc_key_arg_ref, countersignatory_htlc_key_arg_ref, broadcaster_delayed_payment_key_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29023,22 +29036,22 @@ uint32_t __attribute__((export_name("TS_TxCreationKeys_new"))) TS_TxCreationKey static inline uintptr_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg) { LDKTxCreationKeys ret_var = TxCreationKeys_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint32_t arg) { LDKTxCreationKeys arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = TxCreationKeys_clone_ptr(&arg_conv); + intptr_t ret_val = TxCreationKeys_clone_ptr(&arg_conv); return ret_val; } @@ -29048,11 +29061,11 @@ uint32_t __attribute__((export_name("TS_TxCreationKeys_clone"))) TS_TxCreationK orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKTxCreationKeys ret_var = TxCreationKeys_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29065,7 +29078,7 @@ int8_tArray __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreati obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = TxCreationKeys_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29074,10 +29087,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ"); *ret_conv = TxCreationKeys_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_ChannelPublicKeys_free"))) TS_ChannelPublicKeys_free(uint32_t this_obj) { @@ -29093,7 +29106,7 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_funding_pubkey 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelPublicKeys_get_funding_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -29105,7 +29118,7 @@ void __attribute__((export_name("TS_ChannelPublicKeys_set_funding_pubkey"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_funding_pubkey(&this_ptr_conv, val_ref); } @@ -29114,7 +29127,7 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_revocation_bas 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelPublicKeys_get_revocation_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -29126,7 +29139,7 @@ void __attribute__((export_name("TS_ChannelPublicKeys_set_revocation_basepoint" CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_revocation_basepoint(&this_ptr_conv, val_ref); } @@ -29135,7 +29148,7 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_payment_point" 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelPublicKeys_get_payment_point(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -29147,7 +29160,7 @@ void __attribute__((export_name("TS_ChannelPublicKeys_set_payment_point"))) TS_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_payment_point(&this_ptr_conv, val_ref); } @@ -29156,7 +29169,7 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_delayed_paymen 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelPublicKeys_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -29168,7 +29181,7 @@ void __attribute__((export_name("TS_ChannelPublicKeys_set_delayed_payment_basep CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_delayed_payment_basepoint(&this_ptr_conv, val_ref); } @@ -29177,7 +29190,7 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_get_htlc_basepoint 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ChannelPublicKeys_get_htlc_basepoint(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -29189,32 +29202,32 @@ void __attribute__((export_name("TS_ChannelPublicKeys_set_htlc_basepoint"))) TS CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); ChannelPublicKeys_set_htlc_basepoint(&this_ptr_conv, val_ref); } uint32_t __attribute__((export_name("TS_ChannelPublicKeys_new"))) TS_ChannelPublicKeys_new(int8_tArray funding_pubkey_arg, int8_tArray revocation_basepoint_arg, int8_tArray payment_point_arg, int8_tArray delayed_payment_basepoint_arg, int8_tArray htlc_basepoint_arg) { LDKPublicKey funding_pubkey_arg_ref; CHECK(funding_pubkey_arg->arr_len == 33); - memcpy(funding_pubkey_arg_ref.compressed_form, funding_pubkey_arg->elems, 33); + memcpy(funding_pubkey_arg_ref.compressed_form, funding_pubkey_arg->elems, 33); FREE(funding_pubkey_arg); LDKPublicKey revocation_basepoint_arg_ref; CHECK(revocation_basepoint_arg->arr_len == 33); - memcpy(revocation_basepoint_arg_ref.compressed_form, revocation_basepoint_arg->elems, 33); + memcpy(revocation_basepoint_arg_ref.compressed_form, revocation_basepoint_arg->elems, 33); FREE(revocation_basepoint_arg); LDKPublicKey payment_point_arg_ref; CHECK(payment_point_arg->arr_len == 33); - memcpy(payment_point_arg_ref.compressed_form, payment_point_arg->elems, 33); + memcpy(payment_point_arg_ref.compressed_form, payment_point_arg->elems, 33); FREE(payment_point_arg); LDKPublicKey delayed_payment_basepoint_arg_ref; CHECK(delayed_payment_basepoint_arg->arr_len == 33); - memcpy(delayed_payment_basepoint_arg_ref.compressed_form, delayed_payment_basepoint_arg->elems, 33); + memcpy(delayed_payment_basepoint_arg_ref.compressed_form, delayed_payment_basepoint_arg->elems, 33); FREE(delayed_payment_basepoint_arg); LDKPublicKey htlc_basepoint_arg_ref; CHECK(htlc_basepoint_arg->arr_len == 33); - memcpy(htlc_basepoint_arg_ref.compressed_form, htlc_basepoint_arg->elems, 33); + memcpy(htlc_basepoint_arg_ref.compressed_form, htlc_basepoint_arg->elems, 33); FREE(htlc_basepoint_arg); LDKChannelPublicKeys ret_var = ChannelPublicKeys_new(funding_pubkey_arg_ref, revocation_basepoint_arg_ref, payment_point_arg_ref, delayed_payment_basepoint_arg_ref, htlc_basepoint_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29223,22 +29236,22 @@ uint32_t __attribute__((export_name("TS_ChannelPublicKeys_new"))) TS_ChannelPub static inline uintptr_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg) { LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint32_t arg) { LDKChannelPublicKeys arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelPublicKeys_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelPublicKeys_clone_ptr(&arg_conv); return ret_val; } @@ -29248,11 +29261,11 @@ uint32_t __attribute__((export_name("TS_ChannelPublicKeys_clone"))) TS_ChannelP orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29265,7 +29278,7 @@ int8_tArray __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_Chann obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelPublicKeys_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29274,37 +29287,37 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ"); *ret_conv = ChannelPublicKeys_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_TxCreationKeys_derive_new"))) TS_TxCreationKeys_derive_new(int8_tArray per_commitment_point, int8_tArray broadcaster_delayed_payment_base, int8_tArray broadcaster_htlc_base, int8_tArray countersignatory_revocation_base, int8_tArray countersignatory_htlc_base) { LDKPublicKey per_commitment_point_ref; CHECK(per_commitment_point->arr_len == 33); - memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); + memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); FREE(per_commitment_point); LDKPublicKey broadcaster_delayed_payment_base_ref; CHECK(broadcaster_delayed_payment_base->arr_len == 33); - memcpy(broadcaster_delayed_payment_base_ref.compressed_form, broadcaster_delayed_payment_base->elems, 33); + memcpy(broadcaster_delayed_payment_base_ref.compressed_form, broadcaster_delayed_payment_base->elems, 33); FREE(broadcaster_delayed_payment_base); LDKPublicKey broadcaster_htlc_base_ref; CHECK(broadcaster_htlc_base->arr_len == 33); - memcpy(broadcaster_htlc_base_ref.compressed_form, broadcaster_htlc_base->elems, 33); + memcpy(broadcaster_htlc_base_ref.compressed_form, broadcaster_htlc_base->elems, 33); FREE(broadcaster_htlc_base); LDKPublicKey countersignatory_revocation_base_ref; CHECK(countersignatory_revocation_base->arr_len == 33); - memcpy(countersignatory_revocation_base_ref.compressed_form, countersignatory_revocation_base->elems, 33); + memcpy(countersignatory_revocation_base_ref.compressed_form, countersignatory_revocation_base->elems, 33); FREE(countersignatory_revocation_base); LDKPublicKey countersignatory_htlc_base_ref; CHECK(countersignatory_htlc_base->arr_len == 33); - memcpy(countersignatory_htlc_base_ref.compressed_form, countersignatory_htlc_base->elems, 33); + memcpy(countersignatory_htlc_base_ref.compressed_form, countersignatory_htlc_base->elems, 33); FREE(countersignatory_htlc_base); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = TxCreationKeys_derive_new(per_commitment_point_ref, broadcaster_delayed_payment_base_ref, broadcaster_htlc_base_ref, countersignatory_revocation_base_ref, countersignatory_htlc_base_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_TxCreationKeys_from_channel_static_keys"))) TS_TxCreationKeys_from_channel_static_keys(int8_tArray per_commitment_point, uint32_t broadcaster_keys, uint32_t countersignatory_keys) { LDKPublicKey per_commitment_point_ref; CHECK(per_commitment_point->arr_len == 33); - memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); + memcpy(per_commitment_point_ref.compressed_form, per_commitment_point->elems, 33); FREE(per_commitment_point); LDKChannelPublicKeys broadcaster_keys_conv; broadcaster_keys_conv.inner = (void*)(broadcaster_keys & (~1)); broadcaster_keys_conv.is_owned = false; @@ -29315,18 +29328,18 @@ uint32_t __attribute__((export_name("TS_TxCreationKeys_from_channel_static_keys CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv); LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ"); *ret_conv = TxCreationKeys_from_channel_static_keys(per_commitment_point_ref, &broadcaster_keys_conv, &countersignatory_keys_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_get_revokeable_redeemscript"))) TS_get_revokeable_redeemscript(int8_tArray revocation_key, int16_t contest_delay, int8_tArray broadcaster_delayed_payment_key) { LDKPublicKey revocation_key_ref; CHECK(revocation_key->arr_len == 33); - memcpy(revocation_key_ref.compressed_form, revocation_key->elems, 33); + memcpy(revocation_key_ref.compressed_form, revocation_key->elems, 33); FREE(revocation_key); LDKPublicKey broadcaster_delayed_payment_key_ref; CHECK(broadcaster_delayed_payment_key->arr_len == 33); - memcpy(broadcaster_delayed_payment_key_ref.compressed_form, broadcaster_delayed_payment_key->elems, 33); + memcpy(broadcaster_delayed_payment_key_ref.compressed_form, broadcaster_delayed_payment_key->elems, 33); FREE(broadcaster_delayed_payment_key); LDKCVec_u8Z ret_var = get_revokeable_redeemscript(revocation_key_ref, contest_delay, broadcaster_delayed_payment_key_ref); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29396,7 +29409,7 @@ int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_get_payment_h 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *HTLCOutputInCommitment_get_payment_hash(&this_ptr_conv), 32); return ret_arr; } @@ -29408,7 +29421,7 @@ void __attribute__((export_name("TS_HTLCOutputInCommitment_set_payment_hash"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); HTLCOutputInCommitment_set_payment_hash(&this_ptr_conv, val_ref); } @@ -29419,7 +29432,7 @@ uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_get_transaction_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z"); *ret_copy = HTLCOutputInCommitment_get_transaction_output_index(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -29428,27 +29441,27 @@ void __attribute__((export_name("TS_HTLCOutputInCommitment_set_transaction_outp 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*)(((uint64_t)val) & ~1); + void* val_ptr = (void*)(((uintptr_t)val) & ~1); CHECK_ACCESS(val_ptr); LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr); - val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uint64_t)val) & ~1)); + val_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)val) & ~1)); HTLCOutputInCommitment_set_transaction_output_index(&this_ptr_conv, val_conv); } uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_new"))) TS_HTLCOutputInCommitment_new(jboolean offered_arg, int64_t amount_msat_arg, int32_t cltv_expiry_arg, int8_tArray payment_hash_arg, uint32_t transaction_output_index_arg) { LDKThirtyTwoBytes payment_hash_arg_ref; CHECK(payment_hash_arg->arr_len == 32); - memcpy(payment_hash_arg_ref.data, payment_hash_arg->elems, 32); - void* transaction_output_index_arg_ptr = (void*)(((uint64_t)transaction_output_index_arg) & ~1); + memcpy(payment_hash_arg_ref.data, payment_hash_arg->elems, 32); FREE(payment_hash_arg); + void* transaction_output_index_arg_ptr = (void*)(((uintptr_t)transaction_output_index_arg) & ~1); CHECK_ACCESS(transaction_output_index_arg_ptr); LDKCOption_u32Z transaction_output_index_arg_conv = *(LDKCOption_u32Z*)(transaction_output_index_arg_ptr); - transaction_output_index_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uint64_t)transaction_output_index_arg) & ~1)); + transaction_output_index_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)transaction_output_index_arg) & ~1)); LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, payment_hash_arg_ref, transaction_output_index_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29457,22 +29470,22 @@ uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_new"))) TS_HTLCO static inline uintptr_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg) { LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint32_t arg) { LDKHTLCOutputInCommitment arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = HTLCOutputInCommitment_clone_ptr(&arg_conv); + intptr_t ret_val = HTLCOutputInCommitment_clone_ptr(&arg_conv); return ret_val; } @@ -29482,11 +29495,11 @@ uint32_t __attribute__((export_name("TS_HTLCOutputInCommitment_clone"))) TS_HTL orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29499,7 +29512,7 @@ int8_tArray __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_ obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = HTLCOutputInCommitment_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29508,10 +29521,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ"); *ret_conv = HTLCOutputInCommitment_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htlc_redeemscript(uint32_t htlc, jboolean opt_anchors, uint32_t keys) { @@ -29524,7 +29537,7 @@ int8_tArray __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htl keys_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv); LDKCVec_u8Z ret_var = get_htlc_redeemscript(&htlc_conv, opt_anchors, &keys_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29533,12 +29546,12 @@ int8_tArray __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htl int8_tArray __attribute__((export_name("TS_make_funding_redeemscript"))) TS_make_funding_redeemscript(int8_tArray broadcaster, int8_tArray countersignatory) { LDKPublicKey broadcaster_ref; CHECK(broadcaster->arr_len == 33); - memcpy(broadcaster_ref.compressed_form, broadcaster->elems, 33); + memcpy(broadcaster_ref.compressed_form, broadcaster->elems, 33); FREE(broadcaster); LDKPublicKey countersignatory_ref; CHECK(countersignatory->arr_len == 33); - memcpy(countersignatory_ref.compressed_form, countersignatory->elems, 33); + memcpy(countersignatory_ref.compressed_form, countersignatory->elems, 33); FREE(countersignatory); LDKCVec_u8Z ret_var = make_funding_redeemscript(broadcaster_ref, countersignatory_ref); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29547,7 +29560,7 @@ int8_tArray __attribute__((export_name("TS_make_funding_redeemscript"))) TS_mak int8_tArray __attribute__((export_name("TS_build_htlc_transaction"))) TS_build_htlc_transaction(int8_tArray commitment_txid, int32_t feerate_per_kw, int16_t contest_delay, uint32_t htlc, jboolean opt_anchors, int8_tArray broadcaster_delayed_payment_key, int8_tArray revocation_key) { unsigned char commitment_txid_arr[32]; CHECK(commitment_txid->arr_len == 32); - memcpy(commitment_txid_arr, commitment_txid->elems, 32); + memcpy(commitment_txid_arr, commitment_txid->elems, 32); FREE(commitment_txid); unsigned char (*commitment_txid_ref)[32] = &commitment_txid_arr; LDKHTLCOutputInCommitment htlc_conv; htlc_conv.inner = (void*)(htlc & (~1)); @@ -29555,12 +29568,12 @@ int8_tArray __attribute__((export_name("TS_build_htlc_transaction"))) TS_build_ CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv); LDKPublicKey broadcaster_delayed_payment_key_ref; CHECK(broadcaster_delayed_payment_key->arr_len == 33); - memcpy(broadcaster_delayed_payment_key_ref.compressed_form, broadcaster_delayed_payment_key->elems, 33); + memcpy(broadcaster_delayed_payment_key_ref.compressed_form, broadcaster_delayed_payment_key->elems, 33); FREE(broadcaster_delayed_payment_key); LDKPublicKey revocation_key_ref; CHECK(revocation_key->arr_len == 33); - memcpy(revocation_key_ref.compressed_form, revocation_key->elems, 33); + memcpy(revocation_key_ref.compressed_form, revocation_key->elems, 33); FREE(revocation_key); LDKTransaction ret_var = build_htlc_transaction(commitment_txid_ref, feerate_per_kw, contest_delay, &htlc_conv, opt_anchors, broadcaster_delayed_payment_key_ref, revocation_key_ref); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); Transaction_free(ret_var); return ret_arr; @@ -29569,9 +29582,9 @@ int8_tArray __attribute__((export_name("TS_build_htlc_transaction"))) TS_build_ int8_tArray __attribute__((export_name("TS_get_anchor_redeemscript"))) TS_get_anchor_redeemscript(int8_tArray funding_pubkey) { LDKPublicKey funding_pubkey_ref; CHECK(funding_pubkey->arr_len == 33); - memcpy(funding_pubkey_ref.compressed_form, funding_pubkey->elems, 33); + memcpy(funding_pubkey_ref.compressed_form, funding_pubkey->elems, 33); FREE(funding_pubkey); LDKCVec_u8Z ret_var = get_anchor_redeemscript(funding_pubkey_ref); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29591,11 +29604,11 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_holder this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelPublicKeys ret_var = ChannelTransactionParameters_get_holder_pubkeys(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29655,12 +29668,12 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_counte this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCounterpartyChannelTransactionParameters ret_var = ChannelTransactionParameters_get_counterparty_parameters(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29687,12 +29700,12 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_get_fundin this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKOutPoint ret_var = ChannelTransactionParameters_get_funding_outpoint(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29749,11 +29762,11 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS funding_outpoint_arg_conv = OutPoint_clone(&funding_outpoint_arg_conv); LDKCOption_NoneZ opt_anchors_arg_conv = LDKCOption_NoneZ_from_js(opt_anchors_arg); LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_new(holder_pubkeys_arg_conv, holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg_conv, funding_outpoint_arg_conv, opt_anchors_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29762,22 +29775,22 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS static inline uintptr_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg) { LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint32_t arg) { LDKChannelTransactionParameters arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelTransactionParameters_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelTransactionParameters_clone_ptr(&arg_conv); return ret_val; } @@ -29787,11 +29800,11 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_clone"))) orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29812,11 +29825,11 @@ uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameter this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelPublicKeys ret_var = CounterpartyChannelTransactionParameters_get_pubkeys(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29860,11 +29873,11 @@ uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameter CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_arg_conv); pubkeys_arg_conv = ChannelPublicKeys_clone(&pubkeys_arg_conv); LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_new(pubkeys_arg_conv, selected_contest_delay_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29873,22 +29886,22 @@ uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameter static inline uintptr_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg) { LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint32_t arg) { LDKCounterpartyChannelTransactionParameters arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv); + intptr_t ret_val = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv); return ret_val; } @@ -29898,11 +29911,11 @@ uint32_t __attribute__((export_name("TS_CounterpartyChannelTransactionParameter orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29924,11 +29937,11 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_as_holder_ this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_holder_broadcastable(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29941,11 +29954,11 @@ uint32_t __attribute__((export_name("TS_ChannelTransactionParameters_as_counter this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_counterparty_broadcastable(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -29958,7 +29971,7 @@ int8_tArray __attribute__((export_name("TS_CounterpartyChannelTransactionParame obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = CounterpartyChannelTransactionParameters_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29967,10 +29980,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ"); *ret_conv = CounterpartyChannelTransactionParameters_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write"))) TS_ChannelTransactionParameters_write(uint32_t obj) { @@ -29979,7 +29992,7 @@ int8_tArray __attribute__((export_name("TS_ChannelTransactionParameters_write") obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelTransactionParameters_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -29988,10 +30001,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ"); *ret_conv = ChannelTransactionParameters_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_DirectedChannelTransactionParameters_free"))) TS_DirectedChannelTransactionParameters_free(uint32_t this_obj) { @@ -30008,11 +30021,11 @@ uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_br this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_broadcaster_pubkeys(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30025,11 +30038,11 @@ uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_co this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_countersignatory_pubkeys(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30060,11 +30073,11 @@ uint32_t __attribute__((export_name("TS_DirectedChannelTransactionParameters_fu this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKOutPoint ret_var = DirectedChannelTransactionParameters_funding_outpoint(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30093,7 +30106,7 @@ int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_get_coun 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(64); + int8_tArray ret_arr = init_int8_tArray(64, __LINE__); memcpy(ret_arr->elems, HolderCommitmentTransaction_get_counterparty_sig(&this_ptr_conv).compact_form, 64); return ret_arr; } @@ -30105,7 +30118,7 @@ void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKSignature val_ref; CHECK(val->arr_len == 64); - memcpy(val_ref.compact_form, val->elems, 64); + memcpy(val_ref.compact_form, val->elems, 64); FREE(val); HolderCommitmentTransaction_set_counterparty_sig(&this_ptr_conv, val_ref); } @@ -30120,12 +30133,12 @@ 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; + int8_tArray* val_vals = (void*) val->elems /* XXX val leaks */; for (size_t m = 0; m < val_constr.datalen; m++) { int8_tArray val_conv_12 = val_vals[m]; LDKSignature val_conv_12_ref; CHECK(val_conv_12->arr_len == 64); - memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); + memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); FREE(val_conv_12); val_constr.data[m] = val_conv_12_ref; } HolderCommitmentTransaction_set_counterparty_htlc_sigs(&this_ptr_conv, val_constr); @@ -30133,22 +30146,22 @@ void __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart static inline uintptr_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg) { LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint32_t arg) { LDKHolderCommitmentTransaction arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = HolderCommitmentTransaction_clone_ptr(&arg_conv); + intptr_t ret_val = HolderCommitmentTransaction_clone_ptr(&arg_conv); return ret_val; } @@ -30158,11 +30171,11 @@ uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_clone"))) T orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30175,7 +30188,7 @@ int8_tArray __attribute__((export_name("TS_HolderCommitmentTransaction_write")) obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = HolderCommitmentTransaction_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -30184,10 +30197,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ"); *ret_conv = HolderCommitmentTransaction_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_HolderCommitmentTransaction_new(uint32_t commitment_tx, int8_tArray counterparty_sig, ptrArray counterparty_htlc_sigs, int8_tArray holder_funding_key, int8_tArray counterparty_funding_key) { @@ -30198,33 +30211,33 @@ uint32_t __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_ commitment_tx_conv = CommitmentTransaction_clone(&commitment_tx_conv); LDKSignature counterparty_sig_ref; CHECK(counterparty_sig->arr_len == 64); - memcpy(counterparty_sig_ref.compact_form, counterparty_sig->elems, 64); + memcpy(counterparty_sig_ref.compact_form, counterparty_sig->elems, 64); FREE(counterparty_sig); LDKCVec_SignatureZ counterparty_htlc_sigs_constr; counterparty_htlc_sigs_constr.datalen = counterparty_htlc_sigs->arr_len; if (counterparty_htlc_sigs_constr.datalen > 0) 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; + int8_tArray* counterparty_htlc_sigs_vals = (void*) counterparty_htlc_sigs->elems /* XXX counterparty_htlc_sigs leaks */; 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; CHECK(counterparty_htlc_sigs_conv_12->arr_len == 64); - memcpy(counterparty_htlc_sigs_conv_12_ref.compact_form, counterparty_htlc_sigs_conv_12->elems, 64); + 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; } LDKPublicKey holder_funding_key_ref; CHECK(holder_funding_key->arr_len == 33); - memcpy(holder_funding_key_ref.compressed_form, holder_funding_key->elems, 33); + memcpy(holder_funding_key_ref.compressed_form, holder_funding_key->elems, 33); FREE(holder_funding_key); LDKPublicKey counterparty_funding_key_ref; CHECK(counterparty_funding_key->arr_len == 33); - memcpy(counterparty_funding_key_ref.compressed_form, counterparty_funding_key->elems, 33); + memcpy(counterparty_funding_key_ref.compressed_form, counterparty_funding_key->elems, 33); FREE(counterparty_funding_key); LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_new(commitment_tx_conv, counterparty_sig_ref, counterparty_htlc_sigs_constr, holder_funding_key_ref, counterparty_funding_key_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30245,7 +30258,7 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_trans this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKTransaction ret_var = BuiltCommitmentTransaction_get_transaction(&this_ptr_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); Transaction_free(ret_var); return ret_arr; @@ -30259,7 +30272,7 @@ void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_transaction" LDKTransaction val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKTransaction Bytes"); - memcpy(val_ref.data, val->elems, val_ref.datalen); + memcpy(val_ref.data, val->elems, val_ref.datalen); FREE(val); val_ref.data_is_owned = true; BuiltCommitmentTransaction_set_transaction(&this_ptr_conv, val_ref); } @@ -30269,7 +30282,7 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_txid" 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *BuiltCommitmentTransaction_get_txid(&this_ptr_conv), 32); return ret_arr; } @@ -30281,7 +30294,7 @@ void __attribute__((export_name("TS_BuiltCommitmentTransaction_set_txid"))) TS_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); BuiltCommitmentTransaction_set_txid(&this_ptr_conv, val_ref); } @@ -30289,17 +30302,17 @@ uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_B LDKTransaction transaction_arg_ref; transaction_arg_ref.datalen = transaction_arg->arr_len; transaction_arg_ref.data = MALLOC(transaction_arg_ref.datalen, "LDKTransaction Bytes"); - memcpy(transaction_arg_ref.data, transaction_arg->elems, transaction_arg_ref.datalen); + memcpy(transaction_arg_ref.data, transaction_arg->elems, transaction_arg_ref.datalen); FREE(transaction_arg); transaction_arg_ref.data_is_owned = true; LDKThirtyTwoBytes txid_arg_ref; CHECK(txid_arg->arr_len == 32); - memcpy(txid_arg_ref.data, txid_arg->elems, 32); + memcpy(txid_arg_ref.data, txid_arg->elems, 32); FREE(txid_arg); LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_new(transaction_arg_ref, txid_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30308,22 +30321,22 @@ uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_B static inline uintptr_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg) { LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint32_t arg) { LDKBuiltCommitmentTransaction arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = BuiltCommitmentTransaction_clone_ptr(&arg_conv); + intptr_t ret_val = BuiltCommitmentTransaction_clone_ptr(&arg_conv); return ret_val; } @@ -30333,11 +30346,11 @@ uint32_t __attribute__((export_name("TS_BuiltCommitmentTransaction_clone"))) TS orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30350,7 +30363,7 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_write"))) obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = BuiltCommitmentTransaction_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -30359,10 +30372,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ"); *ret_conv = BuiltCommitmentTransaction_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sighash_all"))) TS_BuiltCommitmentTransaction_get_sighash_all(uint32_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) { @@ -30372,8 +30385,8 @@ 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; - int8_tArray ret_arr = init_int8_tArray(32); + funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + 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); return ret_arr; } @@ -30385,12 +30398,12 @@ int8_tArray __attribute__((export_name("TS_BuiltCommitmentTransaction_sign"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char funding_key_arr[32]; CHECK(funding_key->arr_len == 32); - memcpy(funding_key_arr, funding_key->elems, 32); + memcpy(funding_key_arr, funding_key->elems, 32); FREE(funding_key); 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; - int8_tArray ret_arr = init_int8_tArray(64); + funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + 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); return ret_arr; } @@ -30405,22 +30418,22 @@ void __attribute__((export_name("TS_ClosingTransaction_free"))) TS_ClosingTrans static inline uintptr_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg) { LDKClosingTransaction ret_var = ClosingTransaction_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint32_t arg) { LDKClosingTransaction arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ClosingTransaction_clone_ptr(&arg_conv); + intptr_t ret_val = ClosingTransaction_clone_ptr(&arg_conv); return ret_val; } @@ -30430,11 +30443,11 @@ uint32_t __attribute__((export_name("TS_ClosingTransaction_clone"))) TS_Closing orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKClosingTransaction ret_var = ClosingTransaction_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30454,22 +30467,22 @@ uint32_t __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTr LDKCVec_u8Z to_holder_script_ref; to_holder_script_ref.datalen = to_holder_script->arr_len; to_holder_script_ref.data = MALLOC(to_holder_script_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(to_holder_script_ref.data, to_holder_script->elems, to_holder_script_ref.datalen); + memcpy(to_holder_script_ref.data, to_holder_script->elems, to_holder_script_ref.datalen); FREE(to_holder_script); LDKCVec_u8Z to_counterparty_script_ref; to_counterparty_script_ref.datalen = to_counterparty_script->arr_len; to_counterparty_script_ref.data = MALLOC(to_counterparty_script_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(to_counterparty_script_ref.data, to_counterparty_script->elems, to_counterparty_script_ref.datalen); + memcpy(to_counterparty_script_ref.data, to_counterparty_script->elems, to_counterparty_script_ref.datalen); FREE(to_counterparty_script); LDKOutPoint funding_outpoint_conv; funding_outpoint_conv.inner = (void*)(funding_outpoint & (~1)); funding_outpoint_conv.is_owned = (funding_outpoint & 1) || (funding_outpoint == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_conv); funding_outpoint_conv = OutPoint_clone(&funding_outpoint_conv); LDKClosingTransaction ret_var = ClosingTransaction_new(to_holder_value_sat, to_counterparty_value_sat, to_holder_script_ref, to_counterparty_script_ref, funding_outpoint_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30482,11 +30495,11 @@ uint32_t __attribute__((export_name("TS_ClosingTransaction_trust"))) TS_Closing this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKTrustedClosingTransaction ret_var = ClosingTransaction_trust(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30505,7 +30518,7 @@ uint32_t __attribute__((export_name("TS_ClosingTransaction_verify"))) TS_Closin funding_outpoint_conv = OutPoint_clone(&funding_outpoint_conv); LDKCResult_TrustedClosingTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedClosingTransactionNoneZ), "LDKCResult_TrustedClosingTransactionNoneZ"); *ret_conv = ClosingTransaction_verify(&this_arg_conv, funding_outpoint_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int64_t __attribute__((export_name("TS_ClosingTransaction_to_holder_value_sat"))) TS_ClosingTransaction_to_holder_value_sat(uint32_t this_arg) { @@ -30532,7 +30545,7 @@ int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_holder_script" this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKu8slice ret_var = ClosingTransaction_to_holder_script(&this_arg_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -30543,7 +30556,7 @@ int8_tArray __attribute__((export_name("TS_ClosingTransaction_to_counterparty_s this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKu8slice ret_var = ClosingTransaction_to_counterparty_script(&this_arg_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -30562,7 +30575,7 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_built_tran this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKTransaction ret_var = TrustedClosingTransaction_built_transaction(&this_arg_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); Transaction_free(ret_var); return ret_arr; @@ -30575,8 +30588,8 @@ 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; - int8_tArray ret_arr = init_int8_tArray(32); + funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + 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); return ret_arr; } @@ -30588,12 +30601,12 @@ int8_tArray __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) T CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char funding_key_arr[32]; CHECK(funding_key->arr_len == 32); - memcpy(funding_key_arr, funding_key->elems, 32); + memcpy(funding_key_arr, funding_key->elems, 32); FREE(funding_key); 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; - int8_tArray ret_arr = init_int8_tArray(64); + funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */; + 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); return ret_arr; } @@ -30608,22 +30621,22 @@ void __attribute__((export_name("TS_CommitmentTransaction_free"))) TS_Commitmen static inline uintptr_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg) { LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint32_t arg) { LDKCommitmentTransaction arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = CommitmentTransaction_clone_ptr(&arg_conv); + intptr_t ret_val = CommitmentTransaction_clone_ptr(&arg_conv); return ret_val; } @@ -30633,11 +30646,11 @@ uint32_t __attribute__((export_name("TS_CommitmentTransaction_clone"))) TS_Comm orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30650,7 +30663,7 @@ int8_tArray __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_C obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = CommitmentTransaction_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -30659,10 +30672,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ"); *ret_conv = CommitmentTransaction_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int64_t __attribute__((export_name("TS_CommitmentTransaction_commitment_number"))) TS_CommitmentTransaction_commitment_number(uint32_t this_arg) { @@ -30707,11 +30720,11 @@ uint32_t __attribute__((export_name("TS_CommitmentTransaction_trust"))) TS_Comm this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKTrustedCommitmentTransaction ret_var = CommitmentTransaction_trust(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30737,7 +30750,7 @@ uint32_t __attribute__((export_name("TS_CommitmentTransaction_verify"))) TS_Com CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv); LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ"); *ret_conv = CommitmentTransaction_verify(&this_arg_conv, &channel_parameters_conv, &broadcaster_keys_conv, &countersignatory_keys_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_TrustedCommitmentTransaction_free"))) TS_TrustedCommitmentTransaction_free(uint32_t this_obj) { @@ -30753,7 +30766,7 @@ int8_tArray __attribute__((export_name("TS_TrustedCommitmentTransaction_txid")) 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(32); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, TrustedCommitmentTransaction_txid(&this_arg_conv).data, 32); return ret_arr; } @@ -30764,11 +30777,11 @@ uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_built_tran this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKBuiltCommitmentTransaction ret_var = TrustedCommitmentTransaction_built_transaction(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30781,11 +30794,11 @@ uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_keys"))) T this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKTxCreationKeys ret_var = TrustedCommitmentTransaction_keys(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30808,7 +30821,7 @@ uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_s CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); unsigned char htlc_base_key_arr[32]; CHECK(htlc_base_key->arr_len == 32); - memcpy(htlc_base_key_arr, htlc_base_key->elems, 32); + memcpy(htlc_base_key_arr, htlc_base_key->elems, 32); FREE(htlc_base_key); unsigned char (*htlc_base_key_ref)[32] = &htlc_base_key_arr; LDKDirectedChannelTransactionParameters channel_parameters_conv; channel_parameters_conv.inner = (void*)(channel_parameters & (~1)); @@ -30816,16 +30829,16 @@ uint32_t __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_s CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv); LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ"); *ret_conv = TrustedCommitmentTransaction_get_htlc_sigs(&this_arg_conv, htlc_base_key_ref, &channel_parameters_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int64_t __attribute__((export_name("TS_get_commitment_transaction_number_obscure_factor"))) TS_get_commitment_transaction_number_obscure_factor(int8_tArray broadcaster_payment_basepoint, int8_tArray countersignatory_payment_basepoint, jboolean outbound_from_broadcaster) { LDKPublicKey broadcaster_payment_basepoint_ref; CHECK(broadcaster_payment_basepoint->arr_len == 33); - memcpy(broadcaster_payment_basepoint_ref.compressed_form, broadcaster_payment_basepoint->elems, 33); + memcpy(broadcaster_payment_basepoint_ref.compressed_form, broadcaster_payment_basepoint->elems, 33); FREE(broadcaster_payment_basepoint); LDKPublicKey countersignatory_payment_basepoint_ref; CHECK(countersignatory_payment_basepoint->arr_len == 33); - memcpy(countersignatory_payment_basepoint_ref.compressed_form, countersignatory_payment_basepoint->elems, 33); + memcpy(countersignatory_payment_basepoint_ref.compressed_form, countersignatory_payment_basepoint->elems, 33); FREE(countersignatory_payment_basepoint); int64_t ret_val = get_commitment_transaction_number_obscure_factor(broadcaster_payment_basepoint_ref, countersignatory_payment_basepoint_ref, outbound_from_broadcaster); return ret_val; } @@ -30897,22 +30910,22 @@ jboolean __attribute__((export_name("TS_ChannelTypeFeatures_eq"))) TS_ChannelTy static inline uintptr_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg) { LDKInitFeatures ret_var = InitFeatures_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint32_t arg) { LDKInitFeatures arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = InitFeatures_clone_ptr(&arg_conv); + intptr_t ret_val = InitFeatures_clone_ptr(&arg_conv); return ret_val; } @@ -30922,11 +30935,11 @@ uint32_t __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_ orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKInitFeatures ret_var = InitFeatures_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30935,22 +30948,22 @@ uint32_t __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_ static inline uintptr_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg) { LDKNodeFeatures ret_var = NodeFeatures_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint32_t arg) { LDKNodeFeatures arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = NodeFeatures_clone_ptr(&arg_conv); + intptr_t ret_val = NodeFeatures_clone_ptr(&arg_conv); return ret_val; } @@ -30960,11 +30973,11 @@ uint32_t __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_ orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKNodeFeatures ret_var = NodeFeatures_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -30973,22 +30986,22 @@ uint32_t __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_ static inline uintptr_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg) { LDKChannelFeatures ret_var = ChannelFeatures_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint32_t arg) { LDKChannelFeatures arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelFeatures_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelFeatures_clone_ptr(&arg_conv); return ret_val; } @@ -30998,11 +31011,11 @@ uint32_t __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFea orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelFeatures ret_var = ChannelFeatures_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31011,22 +31024,22 @@ uint32_t __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFea static inline uintptr_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg) { LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint32_t arg) { LDKInvoiceFeatures arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = InvoiceFeatures_clone_ptr(&arg_conv); + intptr_t ret_val = InvoiceFeatures_clone_ptr(&arg_conv); return ret_val; } @@ -31036,11 +31049,11 @@ uint32_t __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFea orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31049,22 +31062,22 @@ uint32_t __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFea static inline uintptr_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg) { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint32_t arg) { LDKChannelTypeFeatures arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelTypeFeatures_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelTypeFeatures_clone_ptr(&arg_conv); return ret_val; } @@ -31074,11 +31087,11 @@ uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_clone"))) TS_Channe orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31127,11 +31140,11 @@ void __attribute__((export_name("TS_ChannelTypeFeatures_free"))) TS_ChannelType uint32_t __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_empty() { LDKInitFeatures ret_var = InitFeatures_empty(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31140,11 +31153,11 @@ uint32_t __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_ uint32_t __attribute__((export_name("TS_InitFeatures_known"))) TS_InitFeatures_known() { LDKInitFeatures ret_var = InitFeatures_known(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31162,11 +31175,11 @@ jboolean __attribute__((export_name("TS_InitFeatures_requires_unknown_bits"))) uint32_t __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_empty() { LDKNodeFeatures ret_var = NodeFeatures_empty(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31175,11 +31188,11 @@ uint32_t __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_ uint32_t __attribute__((export_name("TS_NodeFeatures_known"))) TS_NodeFeatures_known() { LDKNodeFeatures ret_var = NodeFeatures_known(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31197,11 +31210,11 @@ jboolean __attribute__((export_name("TS_NodeFeatures_requires_unknown_bits"))) uint32_t __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFeatures_empty() { LDKChannelFeatures ret_var = ChannelFeatures_empty(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31210,11 +31223,11 @@ uint32_t __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFea uint32_t __attribute__((export_name("TS_ChannelFeatures_known"))) TS_ChannelFeatures_known() { LDKChannelFeatures ret_var = ChannelFeatures_known(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31232,11 +31245,11 @@ jboolean __attribute__((export_name("TS_ChannelFeatures_requires_unknown_bits") uint32_t __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFeatures_empty() { LDKInvoiceFeatures ret_var = InvoiceFeatures_empty(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31245,11 +31258,11 @@ uint32_t __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFea uint32_t __attribute__((export_name("TS_InvoiceFeatures_known"))) TS_InvoiceFeatures_known() { LDKInvoiceFeatures ret_var = InvoiceFeatures_known(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31267,11 +31280,11 @@ jboolean __attribute__((export_name("TS_InvoiceFeatures_requires_unknown_bits") uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_ChannelTypeFeatures_empty() { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_empty(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31280,11 +31293,11 @@ uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_Channe uint32_t __attribute__((export_name("TS_ChannelTypeFeatures_known"))) TS_ChannelTypeFeatures_known() { LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_known(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31306,7 +31319,7 @@ int8_tArray __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatur obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = InitFeatures_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31315,10 +31328,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ"); *ret_conv = InitFeatures_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_ChannelFeatures_write(uint32_t obj) { @@ -31327,7 +31340,7 @@ int8_tArray __attribute__((export_name("TS_ChannelFeatures_write"))) TS_Channel obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelFeatures_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31336,10 +31349,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ"); *ret_conv = ChannelFeatures_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatures_write(uint32_t obj) { @@ -31348,7 +31361,7 @@ int8_tArray __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatur obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = NodeFeatures_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31357,10 +31370,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ"); *ret_conv = NodeFeatures_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_InvoiceFeatures_write(uint32_t obj) { @@ -31369,7 +31382,7 @@ int8_tArray __attribute__((export_name("TS_InvoiceFeatures_write"))) TS_Invoice obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = InvoiceFeatures_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31378,10 +31391,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ"); *ret_conv = InvoiceFeatures_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_ChannelTypeFeatures_write(uint32_t obj) { @@ -31390,7 +31403,7 @@ int8_tArray __attribute__((export_name("TS_ChannelTypeFeatures_write"))) TS_Cha obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelTypeFeatures_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31399,10 +31412,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ"); *ret_conv = ChannelTypeFeatures_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_free(uint32_t this_obj) { @@ -31415,22 +31428,22 @@ void __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_f static inline uintptr_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg) { LDKShutdownScript ret_var = ShutdownScript_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint32_t arg) { LDKShutdownScript arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ShutdownScript_clone_ptr(&arg_conv); + intptr_t ret_val = ShutdownScript_clone_ptr(&arg_conv); return ret_val; } @@ -31440,11 +31453,11 @@ uint32_t __attribute__((export_name("TS_ShutdownScript_clone"))) TS_ShutdownScr orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKShutdownScript ret_var = ShutdownScript_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31465,7 +31478,7 @@ int8_tArray __attribute__((export_name("TS_InvalidShutdownScript_get_script"))) this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKu8slice ret_var = InvalidShutdownScript_get_script(&this_ptr_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -31478,7 +31491,7 @@ void __attribute__((export_name("TS_InvalidShutdownScript_set_script"))) TS_Inv LDKCVec_u8Z val_ref; val_ref.datalen = val->arr_len; val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(val_ref.data, val->elems, val_ref.datalen); + memcpy(val_ref.data, val->elems, val_ref.datalen); FREE(val); InvalidShutdownScript_set_script(&this_ptr_conv, val_ref); } @@ -31486,13 +31499,13 @@ uint32_t __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_Invali LDKCVec_u8Z script_arg_ref; script_arg_ref.datalen = script_arg->arr_len; script_arg_ref.data = MALLOC(script_arg_ref.datalen, "LDKCVec_u8Z Bytes"); - memcpy(script_arg_ref.data, script_arg->elems, script_arg_ref.datalen); + memcpy(script_arg_ref.data, script_arg->elems, script_arg_ref.datalen); FREE(script_arg); LDKInvalidShutdownScript ret_var = InvalidShutdownScript_new(script_arg_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31501,22 +31514,22 @@ uint32_t __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_Invali static inline uintptr_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg) { LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint32_t arg) { LDKInvalidShutdownScript arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = InvalidShutdownScript_clone_ptr(&arg_conv); + intptr_t ret_val = InvalidShutdownScript_clone_ptr(&arg_conv); return ret_val; } @@ -31526,11 +31539,11 @@ uint32_t __attribute__((export_name("TS_InvalidShutdownScript_clone"))) TS_Inva orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31543,7 +31556,7 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_write"))) TS_Shutdown obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ShutdownScript_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31552,23 +31565,23 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ"); *ret_conv = ShutdownScript_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wpkh"))) TS_ShutdownScript_new_p2wpkh(int8_tArray pubkey_hash) { unsigned char pubkey_hash_arr[20]; CHECK(pubkey_hash->arr_len == 20); - memcpy(pubkey_hash_arr, pubkey_hash->elems, 20); + memcpy(pubkey_hash_arr, pubkey_hash->elems, 20); FREE(pubkey_hash); unsigned char (*pubkey_hash_ref)[20] = &pubkey_hash_arr; LDKShutdownScript ret_var = ShutdownScript_new_p2wpkh(pubkey_hash_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31578,14 +31591,14 @@ uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wpkh"))) TS_Shutdo uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wsh"))) TS_ShutdownScript_new_p2wsh(int8_tArray script_hash) { unsigned char script_hash_arr[32]; CHECK(script_hash->arr_len == 32); - memcpy(script_hash_arr, script_hash->elems, 32); + memcpy(script_hash_arr, script_hash->elems, 32); FREE(script_hash); unsigned char (*script_hash_ref)[32] = &script_hash_arr; LDKShutdownScript ret_var = ShutdownScript_new_p2wsh(script_hash_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31595,10 +31608,10 @@ uint32_t __attribute__((export_name("TS_ShutdownScript_new_p2wsh"))) TS_Shutdow uint32_t __attribute__((export_name("TS_ShutdownScript_new_witness_program"))) TS_ShutdownScript_new_witness_program(int8_t version, int8_tArray program) { LDKu8slice program_ref; program_ref.datalen = program->arr_len; - program_ref.data = program->elems; + program_ref.data = program->elems /* XXX program leaks */; LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ"); *ret_conv = ShutdownScript_new_witness_program(version, program_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_ShutdownScript_into_inner(uint32_t this_arg) { @@ -31608,7 +31621,7 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_Shu CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); this_arg_conv = ShutdownScript_clone(&this_arg_conv); LDKCVec_u8Z ret_var = ShutdownScript_into_inner(this_arg_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31619,7 +31632,7 @@ int8_tArray __attribute__((export_name("TS_ShutdownScript_as_legacy_pubkey"))) 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); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, ShutdownScript_as_legacy_pubkey(&this_arg_conv).compressed_form, 33); return ret_arr; } @@ -31639,7 +31652,7 @@ jboolean __attribute__((export_name("TS_ShutdownScript_is_compatible"))) TS_Shu void __attribute__((export_name("TS_CustomMessageReader_free"))) TS_CustomMessageReader_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKCustomMessageReader this_ptr_conv = *(LDKCustomMessageReader*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -31649,28 +31662,28 @@ void __attribute__((export_name("TS_CustomMessageReader_free"))) TS_CustomMessa static inline uintptr_t Type_clone_ptr(LDKType *NONNULL_PTR arg) { LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = Type_clone(arg); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } -int64_t __attribute__((export_name("TS_Type_clone_ptr"))) TS_Type_clone_ptr(uint32_t arg) { - void* arg_ptr = (void*)(((uint64_t)arg) & ~1); +intptr_t __attribute__((export_name("TS_Type_clone_ptr"))) TS_Type_clone_ptr(uint32_t arg) { + void* arg_ptr = (void*)(((uintptr_t)arg) & ~1); if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); } LDKType* arg_conv = (LDKType*)arg_ptr; - int64_t ret_val = Type_clone_ptr(arg_conv); + intptr_t ret_val = Type_clone_ptr(arg_conv); return ret_val; } uint32_t __attribute__((export_name("TS_Type_clone"))) TS_Type_clone(uint32_t orig) { - void* orig_ptr = (void*)(((uint64_t)orig) & ~1); + void* orig_ptr = (void*)(((uintptr_t)orig) & ~1); if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); } LDKType* orig_conv = (LDKType*)orig_ptr; LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType"); *ret_ret = Type_clone(orig_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_Type_free"))) TS_Type_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKType this_ptr_conv = *(LDKType*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -31687,22 +31700,22 @@ void __attribute__((export_name("TS_NodeId_free"))) TS_NodeId_free(uint32_t thi static inline uintptr_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg) { LDKNodeId ret_var = NodeId_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint32_t arg) { LDKNodeId arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = NodeId_clone_ptr(&arg_conv); + intptr_t ret_val = NodeId_clone_ptr(&arg_conv); return ret_val; } @@ -31712,11 +31725,11 @@ uint32_t __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint32 orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKNodeId ret_var = NodeId_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31726,13 +31739,13 @@ uint32_t __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint32 uint32_t __attribute__((export_name("TS_NodeId_from_pubkey"))) TS_NodeId_from_pubkey(int8_tArray pubkey) { LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 33); - memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); + memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey); LDKNodeId ret_var = NodeId_from_pubkey(pubkey_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31745,7 +31758,7 @@ int8_tArray __attribute__((export_name("TS_NodeId_as_slice"))) TS_NodeId_as_sli this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKu8slice ret_var = NodeId_as_slice(&this_arg_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__); memcpy(ret_arr->elems, ret_var.data, ret_var.datalen); return ret_arr; } @@ -31765,7 +31778,7 @@ int8_tArray __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uin obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = NodeId_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31774,10 +31787,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ"); *ret_conv = NodeId_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free(uint32_t this_obj) { @@ -31790,22 +31803,22 @@ void __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free( static inline uintptr_t NetworkGraph_clone_ptr(LDKNetworkGraph *NONNULL_PTR arg) { LDKNetworkGraph ret_var = NetworkGraph_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_NetworkGraph_clone_ptr"))) TS_NetworkGraph_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NetworkGraph_clone_ptr"))) TS_NetworkGraph_clone_ptr(uint32_t arg) { LDKNetworkGraph arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = NetworkGraph_clone_ptr(&arg_conv); + intptr_t ret_val = NetworkGraph_clone_ptr(&arg_conv); return ret_val; } @@ -31815,11 +31828,11 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_clone"))) TS_NetworkGraph_ orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKNetworkGraph ret_var = NetworkGraph_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31836,7 +31849,7 @@ void __attribute__((export_name("TS_ReadOnlyNetworkGraph_free"))) TS_ReadOnlyNe void __attribute__((export_name("TS_NetworkUpdate_free"))) TS_NetworkUpdate_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKNetworkUpdate this_ptr_conv = *(LDKNetworkUpdate*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -31846,12 +31859,12 @@ void __attribute__((export_name("TS_NetworkUpdate_free"))) TS_NetworkUpdate_fre static inline uintptr_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg) { LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_clone(arg); -uint64_t ret_ref = (uint64_t)ret_copy; +uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } -int64_t __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint32_t arg) { LDKNetworkUpdate* arg_conv = (LDKNetworkUpdate*)arg; - int64_t ret_val = NetworkUpdate_clone_ptr(arg_conv); + intptr_t ret_val = NetworkUpdate_clone_ptr(arg_conv); return ret_val; } @@ -31859,7 +31872,7 @@ uint32_t __attribute__((export_name("TS_NetworkUpdate_clone"))) TS_NetworkUpdat LDKNetworkUpdate* orig_conv = (LDKNetworkUpdate*)orig; LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_clone(orig_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -31871,31 +31884,31 @@ uint32_t __attribute__((export_name("TS_NetworkUpdate_channel_update_message")) msg_conv = ChannelUpdate_clone(&msg_conv); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_channel_update_message(msg_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_NetworkUpdate_channel_closed"))) TS_NetworkUpdate_channel_closed(int64_t short_channel_id, jboolean is_permanent) { LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_channel_closed(short_channel_id, is_permanent); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } uint32_t __attribute__((export_name("TS_NetworkUpdate_node_failure"))) TS_NetworkUpdate_node_failure(int8_tArray node_id, jboolean is_permanent) { LDKPublicKey node_id_ref; CHECK(node_id->arr_len == 33); - memcpy(node_id_ref.compressed_form, node_id->elems, 33); + memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id); LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate"); *ret_copy = NetworkUpdate_node_failure(node_id_ref, is_permanent); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } int8_tArray __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUpdate_write(uint32_t obj) { LDKNetworkUpdate* obj_conv = (LDKNetworkUpdate*)obj; LDKCVec_u8Z ret_var = NetworkUpdate_write(obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -31904,10 +31917,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ"); *ret_conv = NetworkUpdate_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_NetGraphMsgHandler_as_EventHandler"))) TS_NetGraphMsgHandler_as_EventHandler(uint32_t this_arg) { @@ -31917,7 +31930,7 @@ uint32_t __attribute__((export_name("TS_NetGraphMsgHandler_as_EventHandler"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler"); *ret_ret = NetGraphMsgHandler_as_EventHandler(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_NetGraphMsgHandler_free"))) TS_NetGraphMsgHandler_free(uint32_t this_obj) { @@ -31933,22 +31946,22 @@ uint32_t __attribute__((export_name("TS_NetGraphMsgHandler_new"))) TS_NetGraphM network_graph_conv.inner = (void*)(network_graph & (~1)); network_graph_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv); - void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1); + void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); CHECK_ACCESS(chain_access_ptr); LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr); // Warning: we may need a move here but no clone is available for LDKCOption_AccessZ if (chain_access_conv.tag == LDKCOption_AccessZ_Some) { // Manually implement clone for Java trait instances } - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); LDKNetGraphMsgHandler ret_var = NetGraphMsgHandler_new(&network_graph_conv, chain_access_conv, logger_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -31960,7 +31973,7 @@ void __attribute__((export_name("TS_NetGraphMsgHandler_add_chain_access"))) TS_ this_arg_conv.inner = (void*)(this_arg & (~1)); this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); - void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1); + void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); CHECK_ACCESS(chain_access_ptr); LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr); // Warning: we may need a move here but no clone is available for LDKCOption_AccessZ @@ -31977,7 +31990,7 @@ uint32_t __attribute__((export_name("TS_NetGraphMsgHandler_as_RoutingMessageHan CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler"); *ret_ret = NetGraphMsgHandler_as_RoutingMessageHandler(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } uint32_t __attribute__((export_name("TS_NetGraphMsgHandler_as_MessageSendEventsProvider"))) TS_NetGraphMsgHandler_as_MessageSendEventsProvider(uint32_t this_arg) { @@ -31987,7 +32000,7 @@ uint32_t __attribute__((export_name("TS_NetGraphMsgHandler_as_MessageSendEvents CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider"); *ret_ret = NetGraphMsgHandler_as_MessageSendEventsProvider(&this_arg_conv); - return (uint64_t)ret_ret; + return (uintptr_t)ret_ret; } void __attribute__((export_name("TS_DirectionalChannelInfo_free"))) TS_DirectionalChannelInfo_free(uint32_t this_obj) { @@ -32073,7 +32086,7 @@ uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_get_htlc_maximum CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = DirectionalChannelInfo_get_htlc_maximum_msat(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -32082,10 +32095,10 @@ void __attribute__((export_name("TS_DirectionalChannelInfo_set_htlc_maximum_msa 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*)(((uint64_t)val) & ~1); + 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*)(((uint64_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); DirectionalChannelInfo_set_htlc_maximum_msat(&this_ptr_conv, val_conv); } @@ -32095,11 +32108,11 @@ uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_get_fees"))) TS_ this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKRoutingFees ret_var = DirectionalChannelInfo_get_fees(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32125,12 +32138,12 @@ uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_get_last_update_ this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelUpdate ret_var = DirectionalChannelInfo_get_last_update_message(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32152,10 +32165,10 @@ void __attribute__((export_name("TS_DirectionalChannelInfo_set_last_update_mess } uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_new"))) TS_DirectionalChannelInfo_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*)(((uint64_t)htlc_maximum_msat_arg) & ~1); + 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*)(((uint64_t)htlc_maximum_msat_arg) & ~1)); + htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat_arg) & ~1)); LDKRoutingFees fees_arg_conv; fees_arg_conv.inner = (void*)(fees_arg & (~1)); fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0); @@ -32167,11 +32180,11 @@ uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_new"))) TS_Direc CHECK_INNER_FIELD_ACCESS_OR_NULL(last_update_message_arg_conv); last_update_message_arg_conv = ChannelUpdate_clone(&last_update_message_arg_conv); LDKDirectionalChannelInfo ret_var = DirectionalChannelInfo_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); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32180,22 +32193,22 @@ uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_new"))) TS_Direc static inline uintptr_t DirectionalChannelInfo_clone_ptr(LDKDirectionalChannelInfo *NONNULL_PTR arg) { LDKDirectionalChannelInfo ret_var = DirectionalChannelInfo_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_DirectionalChannelInfo_clone_ptr"))) TS_DirectionalChannelInfo_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_DirectionalChannelInfo_clone_ptr"))) TS_DirectionalChannelInfo_clone_ptr(uint32_t arg) { LDKDirectionalChannelInfo arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = DirectionalChannelInfo_clone_ptr(&arg_conv); + intptr_t ret_val = DirectionalChannelInfo_clone_ptr(&arg_conv); return ret_val; } @@ -32205,11 +32218,11 @@ uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_clone"))) TS_Dir orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKDirectionalChannelInfo ret_var = DirectionalChannelInfo_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32222,7 +32235,7 @@ int8_tArray __attribute__((export_name("TS_DirectionalChannelInfo_write"))) TS_ obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = DirectionalChannelInfo_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -32231,10 +32244,10 @@ int8_tArray __attribute__((export_name("TS_DirectionalChannelInfo_write"))) TS_ uint32_t __attribute__((export_name("TS_DirectionalChannelInfo_read"))) TS_DirectionalChannelInfo_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ"); *ret_conv = DirectionalChannelInfo_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_ChannelInfo_free"))) TS_ChannelInfo_free(uint32_t this_obj) { @@ -32251,11 +32264,11 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_get_features"))) TS_Channel this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelFeatures ret_var = ChannelInfo_get_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32281,11 +32294,11 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_get_node_one"))) TS_Channel this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKNodeId ret_var = ChannelInfo_get_node_one(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32311,12 +32324,12 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_get_one_to_two"))) TS_Chann this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKDirectionalChannelInfo ret_var = ChannelInfo_get_one_to_two(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32343,11 +32356,11 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_get_node_two"))) TS_Channel this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKNodeId ret_var = ChannelInfo_get_node_two(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32373,12 +32386,12 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_get_two_to_one"))) TS_Chann this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKDirectionalChannelInfo ret_var = ChannelInfo_get_two_to_one(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32406,7 +32419,7 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_get_capacity_sats"))) TS_Ch CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = ChannelInfo_get_capacity_sats(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -32415,10 +32428,10 @@ void __attribute__((export_name("TS_ChannelInfo_set_capacity_sats"))) TS_Channe 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*)(((uint64_t)val) & ~1); + 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*)(((uint64_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); ChannelInfo_set_capacity_sats(&this_ptr_conv, val_conv); } @@ -32428,12 +32441,12 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_get_announcement_message")) this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelAnnouncement ret_var = ChannelInfo_get_announcement_message(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32456,22 +32469,22 @@ void __attribute__((export_name("TS_ChannelInfo_set_announcement_message"))) TS static inline uintptr_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg) { LDKChannelInfo ret_var = ChannelInfo_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint32_t arg) { LDKChannelInfo arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = ChannelInfo_clone_ptr(&arg_conv); + intptr_t ret_val = ChannelInfo_clone_ptr(&arg_conv); return ret_val; } @@ -32481,11 +32494,11 @@ uint32_t __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_cl orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKChannelInfo ret_var = ChannelInfo_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32498,7 +32511,7 @@ int8_tArray __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ChannelInfo_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -32507,10 +32520,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ"); *ret_conv = ChannelInfo_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_RoutingFees_free"))) TS_RoutingFees_free(uint32_t this_obj) { @@ -32557,11 +32570,11 @@ void __attribute__((export_name("TS_RoutingFees_set_proportional_millionths"))) uint32_t __attribute__((export_name("TS_RoutingFees_new"))) TS_RoutingFees_new(int32_t base_msat_arg, int32_t proportional_millionths_arg) { LDKRoutingFees ret_var = RoutingFees_new(base_msat_arg, proportional_millionths_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32583,22 +32596,22 @@ jboolean __attribute__((export_name("TS_RoutingFees_eq"))) TS_RoutingFees_eq(ui static inline uintptr_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg) { LDKRoutingFees ret_var = RoutingFees_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint32_t arg) { LDKRoutingFees arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = RoutingFees_clone_ptr(&arg_conv); + intptr_t ret_val = RoutingFees_clone_ptr(&arg_conv); return ret_val; } @@ -32608,11 +32621,11 @@ uint32_t __attribute__((export_name("TS_RoutingFees_clone"))) TS_RoutingFees_cl orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRoutingFees ret_var = RoutingFees_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32634,7 +32647,7 @@ int8_tArray __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = RoutingFees_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -32643,10 +32656,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ"); *ret_conv = RoutingFees_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_NodeAnnouncementInfo_free"))) TS_NodeAnnouncementInfo_free(uint32_t this_obj) { @@ -32663,11 +32676,11 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_features"))) T this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKNodeFeatures ret_var = NodeAnnouncementInfo_get_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32709,7 +32722,7 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_rgb"))) TS_ 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(3); + int8_tArray ret_arr = init_int8_tArray(3, __LINE__); memcpy(ret_arr->elems, *NodeAnnouncementInfo_get_rgb(&this_ptr_conv), 3); return ret_arr; } @@ -32721,7 +32734,7 @@ void __attribute__((export_name("TS_NodeAnnouncementInfo_set_rgb"))) TS_NodeAnn CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThreeBytes val_ref; CHECK(val->arr_len == 3); - memcpy(val_ref.data, val->elems, 3); + memcpy(val_ref.data, val->elems, 3); FREE(val); NodeAnnouncementInfo_set_rgb(&this_ptr_conv, val_ref); } @@ -32730,7 +32743,7 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) T 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); + int8_tArray ret_arr = init_int8_tArray(32, __LINE__); memcpy(ret_arr->elems, *NodeAnnouncementInfo_get_alias(&this_ptr_conv), 32); return ret_arr; } @@ -32742,7 +32755,7 @@ void __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeA CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKThirtyTwoBytes val_ref; CHECK(val->arr_len == 32); - memcpy(val_ref.data, val->elems, 32); + memcpy(val_ref.data, val->elems, 32); FREE(val); NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_ref); } @@ -32757,13 +32770,13 @@ 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; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t m = 0; m < val_constr.datalen; m++) { uint32_t val_conv_12 = val_vals[m]; - void* val_conv_12_ptr = (void*)(((uint64_t)val_conv_12) & ~1); + void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1); CHECK_ACCESS(val_conv_12_ptr); LDKNetAddress val_conv_12_conv = *(LDKNetAddress*)(val_conv_12_ptr); - val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uint64_t)val_conv_12) & ~1)); + val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1)); val_constr.data[m] = val_conv_12_conv; } NodeAnnouncementInfo_set_addresses(&this_ptr_conv, val_constr); @@ -32775,12 +32788,12 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_get_announcement_m this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKNodeAnnouncement ret_var = NodeAnnouncementInfo_get_announcement_message(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32809,20 +32822,20 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn features_arg_conv = NodeFeatures_clone(&features_arg_conv); LDKThreeBytes rgb_arg_ref; CHECK(rgb_arg->arr_len == 3); - memcpy(rgb_arg_ref.data, rgb_arg->elems, 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); + memcpy(alias_arg_ref.data, alias_arg->elems, 32); FREE(alias_arg); 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; + uint32_t* addresses_arg_vals = addresses_arg->elems /* XXX addresses_arg leaks */; 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*)(((uint64_t)addresses_arg_conv_12) & ~1); + void* addresses_arg_conv_12_ptr = (void*)(((uintptr_t)addresses_arg_conv_12) & ~1); CHECK_ACCESS(addresses_arg_conv_12_ptr); LDKNetAddress addresses_arg_conv_12_conv = *(LDKNetAddress*)(addresses_arg_conv_12_ptr); addresses_arg_constr.data[m] = addresses_arg_conv_12_conv; @@ -32833,11 +32846,11 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn 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); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32846,22 +32859,22 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn static inline uintptr_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg) { LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint32_t arg) { LDKNodeAnnouncementInfo arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = NodeAnnouncementInfo_clone_ptr(&arg_conv); + intptr_t ret_val = NodeAnnouncementInfo_clone_ptr(&arg_conv); return ret_val; } @@ -32871,11 +32884,11 @@ uint32_t __attribute__((export_name("TS_NodeAnnouncementInfo_clone"))) TS_NodeA orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32888,7 +32901,7 @@ int8_tArray __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_No obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = NodeAnnouncementInfo_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -32897,10 +32910,10 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ"); *ret_conv = NodeAnnouncementInfo_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_NodeInfo_free"))) TS_NodeInfo_free(uint32_t this_obj) { @@ -32922,7 +32935,7 @@ 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; + int64_t* val_vals = val->elems /* XXX val leaks */; 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; @@ -32936,12 +32949,12 @@ uint32_t __attribute__((export_name("TS_NodeInfo_get_lowest_inbound_channel_fee this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKRoutingFees ret_var = NodeInfo_get_lowest_inbound_channel_fees(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -32968,12 +32981,12 @@ uint32_t __attribute__((export_name("TS_NodeInfo_get_announcement_info"))) TS_N this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKNodeAnnouncementInfo ret_var = NodeInfo_get_announcement_info(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33001,7 +33014,7 @@ 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; + int64_t* channels_arg_vals = channels_arg->elems /* XXX channels_arg leaks */; 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; @@ -33017,11 +33030,11 @@ uint32_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_ CHECK_INNER_FIELD_ACCESS_OR_NULL(announcement_info_arg_conv); announcement_info_arg_conv = NodeAnnouncementInfo_clone(&announcement_info_arg_conv); LDKNodeInfo ret_var = NodeInfo_new(channels_arg_constr, lowest_inbound_channel_fees_arg_conv, announcement_info_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33030,22 +33043,22 @@ uint32_t __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_ static inline uintptr_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg) { LDKNodeInfo ret_var = NodeInfo_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint32_t arg) { LDKNodeInfo arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = NodeInfo_clone_ptr(&arg_conv); + intptr_t ret_val = NodeInfo_clone_ptr(&arg_conv); return ret_val; } @@ -33055,11 +33068,11 @@ uint32_t __attribute__((export_name("TS_NodeInfo_clone"))) TS_NodeInfo_clone(ui orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKNodeInfo ret_var = NodeInfo_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33072,7 +33085,7 @@ int8_tArray __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = NodeInfo_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -33081,10 +33094,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ"); *ret_conv = NodeInfo_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGraph_write(uint32_t obj) { @@ -33093,7 +33106,7 @@ int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGra obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = NetworkGraph_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -33102,22 +33115,22 @@ int8_tArray __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGra uint32_t __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ"); *ret_conv = NetworkGraph_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_new(int8_tArray genesis_hash) { LDKThirtyTwoBytes genesis_hash_ref; CHECK(genesis_hash->arr_len == 32); - memcpy(genesis_hash_ref.data, genesis_hash->elems, 32); + memcpy(genesis_hash_ref.data, genesis_hash->elems, 32); FREE(genesis_hash); LDKNetworkGraph ret_var = NetworkGraph_new(genesis_hash_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33130,11 +33143,11 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_read_only"))) TS_NetworkGr this_arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKReadOnlyNetworkGraph ret_var = NetworkGraph_read_only(&this_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33152,7 +33165,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_node_from_announcem CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_node_from_announcement(&this_arg_conv, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_NetworkGraph_update_node_from_unsigned_announcement"))) TS_NetworkGraph_update_node_from_unsigned_announcement(uint32_t this_arg, uint32_t msg) { @@ -33166,7 +33179,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_node_from_unsigned_ CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_node_from_unsigned_announcement(&this_arg_conv, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_announcement"))) TS_NetworkGraph_update_channel_from_announcement(uint32_t this_arg, uint32_t msg, uint32_t chain_access) { @@ -33178,7 +33191,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_announ msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); - void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1); + void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); CHECK_ACCESS(chain_access_ptr); LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr); // Warning: we may need a move here but no clone is available for LDKCOption_AccessZ @@ -33187,7 +33200,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_announ } LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel_from_announcement(&this_arg_conv, &msg_conv, chain_access_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_unsigned_announcement"))) TS_NetworkGraph_update_channel_from_unsigned_announcement(uint32_t this_arg, uint32_t msg, uint32_t chain_access) { @@ -33199,7 +33212,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_unsign msg_conv.inner = (void*)(msg & (~1)); msg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); - void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1); + void* chain_access_ptr = (void*)(((uintptr_t)chain_access) & ~1); CHECK_ACCESS(chain_access_ptr); LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr); // Warning: we may need a move here but no clone is available for LDKCOption_AccessZ @@ -33208,7 +33221,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_from_unsign } LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel_from_unsigned_announcement(&this_arg_conv, &msg_conv, chain_access_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_NetworkGraph_close_channel_from_update"))) TS_NetworkGraph_close_channel_from_update(uint32_t this_arg, int64_t short_channel_id, jboolean is_permanent) { @@ -33226,7 +33239,7 @@ void __attribute__((export_name("TS_NetworkGraph_fail_node"))) TS_NetworkGraph_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKPublicKey _node_id_ref; CHECK(_node_id->arr_len == 33); - memcpy(_node_id_ref.compressed_form, _node_id->elems, 33); + memcpy(_node_id_ref.compressed_form, _node_id->elems, 33); FREE(_node_id); NetworkGraph_fail_node(&this_arg_conv, _node_id_ref, is_permanent); } @@ -33249,7 +33262,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel"))) TS_Netw CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel(&this_arg_conv, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned"))) TS_NetworkGraph_update_channel_unsigned(uint32_t this_arg, uint32_t msg) { @@ -33263,7 +33276,7 @@ uint32_t __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned")) CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv); LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ"); *ret_conv = NetworkGraph_update_channel_unsigned(&this_arg_conv, &msg_conv); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) TS_ReadOnlyNetworkGraph_get_addresses(uint32_t this_arg, int8_tArray pubkey) { @@ -33273,10 +33286,10 @@ uint32_t __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv); LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 33); - memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); + memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey); LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ"); *ret_copy = ReadOnlyNetworkGraph_get_addresses(&this_arg_conv, pubkey_ref); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -33293,7 +33306,7 @@ int8_tArray __attribute__((export_name("TS_RouteHop_get_pubkey"))) TS_RouteHop_ 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, RouteHop_get_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -33305,7 +33318,7 @@ void __attribute__((export_name("TS_RouteHop_set_pubkey"))) TS_RouteHop_set_pub CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); RouteHop_set_pubkey(&this_ptr_conv, val_ref); } @@ -33315,11 +33328,11 @@ uint32_t __attribute__((export_name("TS_RouteHop_get_node_features"))) TS_Route this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKNodeFeatures ret_var = RouteHop_get_node_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33362,11 +33375,11 @@ uint32_t __attribute__((export_name("TS_RouteHop_get_channel_features"))) TS_Ro this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKChannelFeatures ret_var = RouteHop_get_channel_features(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33423,7 +33436,7 @@ void __attribute__((export_name("TS_RouteHop_set_cltv_expiry_delta"))) TS_Route uint32_t __attribute__((export_name("TS_RouteHop_new"))) TS_RouteHop_new(int8_tArray pubkey_arg, uint32_t node_features_arg, int64_t short_channel_id_arg, uint32_t channel_features_arg, int64_t fee_msat_arg, int32_t cltv_expiry_delta_arg) { LDKPublicKey pubkey_arg_ref; CHECK(pubkey_arg->arr_len == 33); - memcpy(pubkey_arg_ref.compressed_form, pubkey_arg->elems, 33); + memcpy(pubkey_arg_ref.compressed_form, pubkey_arg->elems, 33); FREE(pubkey_arg); LDKNodeFeatures node_features_arg_conv; node_features_arg_conv.inner = (void*)(node_features_arg & (~1)); node_features_arg_conv.is_owned = (node_features_arg & 1) || (node_features_arg == 0); @@ -33435,11 +33448,11 @@ uint32_t __attribute__((export_name("TS_RouteHop_new"))) TS_RouteHop_new(int8_t CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_features_arg_conv); channel_features_arg_conv = ChannelFeatures_clone(&channel_features_arg_conv); LDKRouteHop ret_var = RouteHop_new(pubkey_arg_ref, node_features_arg_conv, short_channel_id_arg, channel_features_arg_conv, fee_msat_arg, cltv_expiry_delta_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33448,22 +33461,22 @@ uint32_t __attribute__((export_name("TS_RouteHop_new"))) TS_RouteHop_new(int8_t static inline uintptr_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg) { LDKRouteHop ret_var = RouteHop_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint32_t arg) { LDKRouteHop arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = RouteHop_clone_ptr(&arg_conv); + intptr_t ret_val = RouteHop_clone_ptr(&arg_conv); return ret_val; } @@ -33473,11 +33486,11 @@ uint32_t __attribute__((export_name("TS_RouteHop_clone"))) TS_RouteHop_clone(ui orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRouteHop ret_var = RouteHop_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33512,7 +33525,7 @@ int8_tArray __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = RouteHop_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -33521,10 +33534,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ"); *ret_conv = RouteHop_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_Route_free"))) TS_Route_free(uint32_t this_obj) { @@ -33542,20 +33555,20 @@ ptrArray __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths( CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCVec_CVec_RouteHopZZ ret_var = Route_get_paths(&this_ptr_conv); ptrArray ret_arr = NULL; - ret_arr = init_ptrArray(ret_var.datalen); + ret_arr = init_ptrArray(ret_var.datalen, __LINE__); uint32_tArray *ret_arr_ptr = (uint32_tArray*)(((uint8_t*)ret_arr) + 4); 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); + 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); 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]; - uint64_t ret_conv_12_conv_10_ref = 0; - CHECK((((uint64_t)ret_conv_12_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_12_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_12_conv_10_ref = 0; + CHECK((((uintptr_t)ret_conv_12_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_12_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_12_conv_10_var); - ret_conv_12_conv_10_ref = (uint64_t)ret_conv_12_conv_10_var.inner; + ret_conv_12_conv_10_ref = (uintptr_t)ret_conv_12_conv_10_var.inner; if (ret_conv_12_conv_10_var.is_owned) { ret_conv_12_conv_10_ref |= 1; } @@ -33581,7 +33594,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; + uint32_tArray* val_vals = (void*) val->elems /* XXX val leaks */; for (size_t m = 0; m < val_constr.datalen; m++) { uint32_tArray val_conv_12 = val_vals[m]; LDKCVec_RouteHopZ val_conv_12_constr; @@ -33590,7 +33603,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; + uint32_t* val_conv_12_vals = val_conv_12->elems /* XXX val_conv_12 leaks */; 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; @@ -33611,12 +33624,12 @@ uint32_t __attribute__((export_name("TS_Route_get_payee"))) TS_Route_get_payee( this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPayee ret_var = Route_get_payee(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33644,7 +33657,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; + uint32_tArray* paths_arg_vals = (void*) paths_arg->elems /* XXX paths_arg leaks */; 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; @@ -33653,7 +33666,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; + uint32_t* paths_arg_conv_12_vals = paths_arg_conv_12->elems /* XXX paths_arg_conv_12 leaks */; 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; @@ -33671,11 +33684,11 @@ uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat CHECK_INNER_FIELD_ACCESS_OR_NULL(payee_arg_conv); payee_arg_conv = Payee_clone(&payee_arg_conv); LDKRoute ret_var = Route_new(paths_arg_constr, payee_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33684,22 +33697,22 @@ uint32_t __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat static inline uintptr_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg) { LDKRoute ret_var = Route_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint32_t arg) { LDKRoute arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = Route_clone_ptr(&arg_conv); + intptr_t ret_val = Route_clone_ptr(&arg_conv); return ret_val; } @@ -33709,11 +33722,11 @@ uint32_t __attribute__((export_name("TS_Route_clone"))) TS_Route_clone(uint32_t orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRoute ret_var = Route_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33766,7 +33779,7 @@ int8_tArray __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint3 obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = Route_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -33775,10 +33788,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ"); *ret_conv = Route_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_RouteParameters_free"))) TS_RouteParameters_free(uint32_t this_obj) { @@ -33795,11 +33808,11 @@ uint32_t __attribute__((export_name("TS_RouteParameters_get_payee"))) TS_RouteP this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPayee ret_var = RouteParameters_get_payee(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33860,11 +33873,11 @@ uint32_t __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParamet CHECK_INNER_FIELD_ACCESS_OR_NULL(payee_arg_conv); payee_arg_conv = Payee_clone(&payee_arg_conv); LDKRouteParameters ret_var = RouteParameters_new(payee_arg_conv, final_value_msat_arg, final_cltv_expiry_delta_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33873,22 +33886,22 @@ uint32_t __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParamet static inline uintptr_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg) { LDKRouteParameters ret_var = RouteParameters_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint32_t arg) { LDKRouteParameters arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = RouteParameters_clone_ptr(&arg_conv); + intptr_t ret_val = RouteParameters_clone_ptr(&arg_conv); return ret_val; } @@ -33898,11 +33911,11 @@ uint32_t __attribute__((export_name("TS_RouteParameters_clone"))) TS_RouteParam orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRouteParameters ret_var = RouteParameters_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33915,7 +33928,7 @@ int8_tArray __attribute__((export_name("TS_RouteParameters_write"))) TS_RoutePa obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = RouteParameters_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -33924,10 +33937,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ"); *ret_conv = RouteParameters_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_Payee_free"))) TS_Payee_free(uint32_t this_obj) { @@ -33943,7 +33956,7 @@ int8_tArray __attribute__((export_name("TS_Payee_get_pubkey"))) TS_Payee_get_pu 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, Payee_get_pubkey(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -33955,7 +33968,7 @@ void __attribute__((export_name("TS_Payee_set_pubkey"))) TS_Payee_set_pubkey(ui CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); Payee_set_pubkey(&this_ptr_conv, val_ref); } @@ -33965,12 +33978,12 @@ uint32_t __attribute__((export_name("TS_Payee_get_features"))) TS_Payee_get_fea this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKInvoiceFeatures ret_var = Payee_get_features(&this_ptr_conv); - uint64_t ret_ref = 0; - if ((uint64_t)ret_var.inner > 4096) { - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -33998,15 +34011,15 @@ uint32_tArray __attribute__((export_name("TS_Payee_get_route_hints"))) TS_Payee CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCVec_RouteHintZ ret_var = Payee_get_route_hints(&this_ptr_conv); uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t l = 0; l < ret_var.datalen; l++) { LDKRouteHint ret_conv_11_var = ret_var.data[l]; - uint64_t ret_conv_11_ref = 0; - CHECK((((uint64_t)ret_conv_11_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_11_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_11_ref = 0; + CHECK((((uintptr_t)ret_conv_11_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_11_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var); - ret_conv_11_ref = (uint64_t)ret_conv_11_var.inner; + ret_conv_11_ref = (uintptr_t)ret_conv_11_var.inner; if (ret_conv_11_var.is_owned) { ret_conv_11_ref |= 1; } @@ -34028,7 +34041,7 @@ void __attribute__((export_name("TS_Payee_set_route_hints"))) TS_Payee_set_rout val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements"); else val_constr.data = NULL; - uint32_t* val_vals = val->elems; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t l = 0; l < val_constr.datalen; l++) { uint32_t val_conv_11 = val_vals[l]; LDKRouteHint val_conv_11_conv; @@ -34048,7 +34061,7 @@ uint32_t __attribute__((export_name("TS_Payee_get_expiry_time"))) TS_Payee_get_ CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = Payee_get_expiry_time(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -34057,17 +34070,17 @@ void __attribute__((export_name("TS_Payee_set_expiry_time"))) TS_Payee_set_expi 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*)(((uint64_t)val) & ~1); + 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*)(((uint64_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); Payee_set_expiry_time(&this_ptr_conv, val_conv); } uint32_t __attribute__((export_name("TS_Payee_new"))) TS_Payee_new(int8_tArray pubkey_arg, uint32_t features_arg, uint32_tArray route_hints_arg, uint32_t expiry_time_arg) { LDKPublicKey pubkey_arg_ref; CHECK(pubkey_arg->arr_len == 33); - memcpy(pubkey_arg_ref.compressed_form, pubkey_arg->elems, 33); + memcpy(pubkey_arg_ref.compressed_form, pubkey_arg->elems, 33); FREE(pubkey_arg); LDKInvoiceFeatures features_arg_conv; features_arg_conv.inner = (void*)(features_arg & (~1)); features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0); @@ -34079,7 +34092,7 @@ uint32_t __attribute__((export_name("TS_Payee_new"))) TS_Payee_new(int8_tArray 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; + uint32_t* route_hints_arg_vals = route_hints_arg->elems /* XXX route_hints_arg leaks */; 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; @@ -34089,16 +34102,16 @@ uint32_t __attribute__((export_name("TS_Payee_new"))) TS_Payee_new(int8_tArray 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; } - void* expiry_time_arg_ptr = (void*)(((uint64_t)expiry_time_arg) & ~1); + 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*)(((uint64_t)expiry_time_arg) & ~1)); + expiry_time_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)expiry_time_arg) & ~1)); LDKPayee ret_var = Payee_new(pubkey_arg_ref, features_arg_conv, route_hints_arg_constr, expiry_time_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34107,22 +34120,22 @@ uint32_t __attribute__((export_name("TS_Payee_new"))) TS_Payee_new(int8_tArray static inline uintptr_t Payee_clone_ptr(LDKPayee *NONNULL_PTR arg) { LDKPayee ret_var = Payee_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_Payee_clone_ptr"))) TS_Payee_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_Payee_clone_ptr"))) TS_Payee_clone_ptr(uint32_t arg) { LDKPayee arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = Payee_clone_ptr(&arg_conv); + intptr_t ret_val = Payee_clone_ptr(&arg_conv); return ret_val; } @@ -34132,11 +34145,11 @@ uint32_t __attribute__((export_name("TS_Payee_clone"))) TS_Payee_clone(uint32_t orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKPayee ret_var = Payee_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34171,7 +34184,7 @@ int8_tArray __attribute__((export_name("TS_Payee_write"))) TS_Payee_write(uint3 obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = Payee_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -34180,22 +34193,22 @@ int8_tArray __attribute__((export_name("TS_Payee_write"))) TS_Payee_write(uint3 uint32_t __attribute__((export_name("TS_Payee_read"))) TS_Payee_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ"); *ret_conv = Payee_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_Payee_from_node_id"))) TS_Payee_from_node_id(int8_tArray pubkey) { LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 33); - memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); + memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey); LDKPayee ret_var = Payee_from_node_id(pubkey_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34205,13 +34218,13 @@ uint32_t __attribute__((export_name("TS_Payee_from_node_id"))) TS_Payee_from_no uint32_t __attribute__((export_name("TS_Payee_for_keysend"))) TS_Payee_for_keysend(int8_tArray pubkey) { LDKPublicKey pubkey_ref; CHECK(pubkey->arr_len == 33); - memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); + memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey); LDKPayee ret_var = Payee_for_keysend(pubkey_ref); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34233,15 +34246,15 @@ uint32_tArray __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_g CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCVec_RouteHintHopZ ret_var = RouteHint_get_a(&this_ptr_conv); uint32_tArray ret_arr = NULL; - ret_arr = init_uint32_tArray(ret_var.datalen); + ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__); uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4); for (size_t o = 0; o < ret_var.datalen; o++) { LDKRouteHintHop ret_conv_14_var = ret_var.data[o]; - uint64_t ret_conv_14_ref = 0; - CHECK((((uint64_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_t ret_conv_14_ref = 0; + CHECK((((uintptr_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. + CHECK((((uintptr_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var); - ret_conv_14_ref = (uint64_t)ret_conv_14_var.inner; + ret_conv_14_ref = (uintptr_t)ret_conv_14_var.inner; if (ret_conv_14_var.is_owned) { ret_conv_14_ref |= 1; } @@ -34263,7 +34276,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; + uint32_t* val_vals = val->elems /* XXX val leaks */; for (size_t o = 0; o < val_constr.datalen; o++) { uint32_t val_conv_14 = val_vals[o]; LDKRouteHintHop val_conv_14_conv; @@ -34283,7 +34296,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; + uint32_t* a_arg_vals = a_arg->elems /* XXX a_arg leaks */; 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; @@ -34294,11 +34307,11 @@ uint32_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint a_arg_constr.data[o] = a_arg_conv_14_conv; } LDKRouteHint ret_var = RouteHint_new(a_arg_constr); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34307,22 +34320,22 @@ uint32_t __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint static inline uintptr_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg) { LDKRouteHint ret_var = RouteHint_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint32_t arg) { LDKRouteHint arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = RouteHint_clone_ptr(&arg_conv); + intptr_t ret_val = RouteHint_clone_ptr(&arg_conv); return ret_val; } @@ -34332,11 +34345,11 @@ uint32_t __attribute__((export_name("TS_RouteHint_clone"))) TS_RouteHint_clone( orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRouteHint ret_var = RouteHint_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34371,7 +34384,7 @@ int8_tArray __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_wri obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = RouteHint_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -34380,10 +34393,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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ"); *ret_conv = RouteHint_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_RouteHintHop_free"))) TS_RouteHintHop_free(uint32_t this_obj) { @@ -34399,7 +34412,7 @@ int8_tArray __attribute__((export_name("TS_RouteHintHop_get_src_node_id"))) TS_ 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(33); + int8_tArray ret_arr = init_int8_tArray(33, __LINE__); memcpy(ret_arr->elems, RouteHintHop_get_src_node_id(&this_ptr_conv).compressed_form, 33); return ret_arr; } @@ -34411,7 +34424,7 @@ void __attribute__((export_name("TS_RouteHintHop_set_src_node_id"))) TS_RouteHi CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKPublicKey val_ref; CHECK(val->arr_len == 33); - memcpy(val_ref.compressed_form, val->elems, 33); + memcpy(val_ref.compressed_form, val->elems, 33); FREE(val); RouteHintHop_set_src_node_id(&this_ptr_conv, val_ref); } @@ -34438,11 +34451,11 @@ uint32_t __attribute__((export_name("TS_RouteHintHop_get_fees"))) TS_RouteHintH this_ptr_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKRoutingFees ret_var = RouteHintHop_get_fees(&this_ptr_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34486,7 +34499,7 @@ uint32_t __attribute__((export_name("TS_RouteHintHop_get_htlc_minimum_msat"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RouteHintHop_get_htlc_minimum_msat(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -34495,10 +34508,10 @@ void __attribute__((export_name("TS_RouteHintHop_set_htlc_minimum_msat"))) TS_R 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*)(((uint64_t)val) & ~1); + 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*)(((uint64_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); RouteHintHop_set_htlc_minimum_msat(&this_ptr_conv, val_conv); } @@ -34509,7 +34522,7 @@ uint32_t __attribute__((export_name("TS_RouteHintHop_get_htlc_maximum_msat"))) CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv); LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z"); *ret_copy = RouteHintHop_get_htlc_maximum_msat(&this_ptr_conv); - uint64_t ret_ref = (uint64_t)ret_copy; + uintptr_t ret_ref = (uintptr_t)ret_copy; return ret_ref; } @@ -34518,36 +34531,36 @@ void __attribute__((export_name("TS_RouteHintHop_set_htlc_maximum_msat"))) TS_R 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*)(((uint64_t)val) & ~1); + 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*)(((uint64_t)val) & ~1)); + val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1)); RouteHintHop_set_htlc_maximum_msat(&this_ptr_conv, val_conv); } uint32_t __attribute__((export_name("TS_RouteHintHop_new"))) TS_RouteHintHop_new(int8_tArray src_node_id_arg, int64_t short_channel_id_arg, uint32_t fees_arg, int16_t cltv_expiry_delta_arg, uint32_t htlc_minimum_msat_arg, uint32_t htlc_maximum_msat_arg) { LDKPublicKey src_node_id_arg_ref; CHECK(src_node_id_arg->arr_len == 33); - memcpy(src_node_id_arg_ref.compressed_form, src_node_id_arg->elems, 33); + memcpy(src_node_id_arg_ref.compressed_form, src_node_id_arg->elems, 33); FREE(src_node_id_arg); LDKRoutingFees fees_arg_conv; fees_arg_conv.inner = (void*)(fees_arg & (~1)); fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0); CHECK_INNER_FIELD_ACCESS_OR_NULL(fees_arg_conv); fees_arg_conv = RoutingFees_clone(&fees_arg_conv); - void* htlc_minimum_msat_arg_ptr = (void*)(((uint64_t)htlc_minimum_msat_arg) & ~1); + void* htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)htlc_minimum_msat_arg) & ~1); CHECK_ACCESS(htlc_minimum_msat_arg_ptr); LDKCOption_u64Z htlc_minimum_msat_arg_conv = *(LDKCOption_u64Z*)(htlc_minimum_msat_arg_ptr); - htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)htlc_minimum_msat_arg) & ~1)); - void* htlc_maximum_msat_arg_ptr = (void*)(((uint64_t)htlc_maximum_msat_arg) & ~1); + htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_minimum_msat_arg) & ~1)); + 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*)(((uint64_t)htlc_maximum_msat_arg) & ~1)); + htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat_arg) & ~1)); LDKRouteHintHop ret_var = RouteHintHop_new(src_node_id_arg_ref, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg, htlc_minimum_msat_arg_conv, htlc_maximum_msat_arg_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34556,22 +34569,22 @@ uint32_t __attribute__((export_name("TS_RouteHintHop_new"))) TS_RouteHintHop_ne static inline uintptr_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg) { LDKRouteHintHop ret_var = RouteHintHop_clone(arg); -uint64_t ret_ref = 0; -CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. -CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. +uintptr_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 = (uint64_t)ret_var.inner; +ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } return ret_ref; } -int64_t __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint32_t arg) { +intptr_t __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint32_t arg) { LDKRouteHintHop arg_conv; arg_conv.inner = (void*)(arg & (~1)); arg_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv); - int64_t ret_val = RouteHintHop_clone_ptr(&arg_conv); + intptr_t ret_val = RouteHintHop_clone_ptr(&arg_conv); return ret_val; } @@ -34581,11 +34594,11 @@ uint32_t __attribute__((export_name("TS_RouteHintHop_clone"))) TS_RouteHintHop_ orig_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv); LDKRouteHintHop ret_var = RouteHintHop_clone(&orig_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34620,7 +34633,7 @@ int8_tArray __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintH obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = RouteHintHop_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -34629,16 +34642,16 @@ 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; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ"); *ret_conv = RouteHintHop_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArray our_node_pubkey, uint32_t params, uint32_t network, uint32_tArray first_hops, uint32_t logger, uint32_t scorer) { LDKPublicKey our_node_pubkey_ref; CHECK(our_node_pubkey->arr_len == 33); - memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); + memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); FREE(our_node_pubkey); LDKRouteParameters params_conv; params_conv.inner = (void*)(params & (~1)); params_conv.is_owned = false; @@ -34655,7 +34668,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; + uint32_t* first_hops_vals = first_hops->elems /* XXX first_hops leaks */; 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; @@ -34666,21 +34679,21 @@ uint32_t __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra } first_hops_ptr = &first_hops_constr; } - void* logger_ptr = (void*)(((uint64_t)logger) & ~1); + void* logger_ptr = (void*)(((uintptr_t)logger) & ~1); CHECK_ACCESS(logger_ptr); LDKLogger logger_conv = *(LDKLogger*)(logger_ptr); - void* scorer_ptr = (void*)(((uint64_t)scorer) & ~1); + void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1); if (!(scorer & 1)) { CHECK_ACCESS(scorer_ptr); } LDKScore* scorer_conv = (LDKScore*)scorer_ptr; LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ"); *ret_conv = find_route(our_node_pubkey_ref, ¶ms_conv, &network_conv, first_hops_ptr, logger_conv, scorer_conv); if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); } - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } void __attribute__((export_name("TS_Score_free"))) TS_Score_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKScore this_ptr_conv = *(LDKScore*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -34689,7 +34702,7 @@ void __attribute__((export_name("TS_Score_free"))) TS_Score_free(uint32_t this_ void __attribute__((export_name("TS_LockableScore_free"))) TS_LockableScore_free(uint32_t this_ptr) { if ((this_ptr & 1) != 0) return; - void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1); + void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1); CHECK_ACCESS(this_ptr_ptr); LDKLockableScore this_ptr_conv = *(LDKLockableScore*)(this_ptr_ptr); FREE((void*)this_ptr); @@ -34705,15 +34718,15 @@ void __attribute__((export_name("TS_MultiThreadedLockableScore_free"))) TS_Mult } uint32_t __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_MultiThreadedLockableScore_new(uint32_t score) { - void* score_ptr = (void*)(((uint64_t)score) & ~1); + void* score_ptr = (void*)(((uintptr_t)score) & ~1); CHECK_ACCESS(score_ptr); LDKScore score_conv = *(LDKScore*)(score_ptr); LDKMultiThreadedLockableScore ret_var = MultiThreadedLockableScore_new(score_conv); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34815,11 +34828,11 @@ void __attribute__((export_name("TS_ScoringParameters_set_failure_penalty_half_ uint32_t __attribute__((export_name("TS_ScoringParameters_new"))) TS_ScoringParameters_new(int64_t base_penalty_msat_arg, int64_t failure_penalty_msat_arg, int16_t overuse_penalty_start_1024th_arg, int64_t overuse_penalty_msat_per_1024th_arg, int64_t failure_penalty_half_life_arg) { LDKScoringParameters ret_var = ScoringParameters_new(base_penalty_msat_arg, failure_penalty_msat_arg, overuse_penalty_start_1024th_arg, overuse_penalty_msat_per_1024th_arg, failure_penalty_half_life_arg); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; } @@ -34832,7 +34845,7 @@ int8_tArray __attribute__((export_name("TS_ScoringParameters_write"))) TS_Scori obj_conv.is_owned = false; CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv); LDKCVec_u8Z ret_var = ScoringParameters_write(&obj_conv); - int8_tArray ret_arr = init_int8_tArray(ret_var.datalen); + 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; @@ -34841,19 +34854,19 @@ int8_tArray __attribute__((export_name("TS_ScoringParameters_write"))) TS_Scori uint32_t __attribute__((export_name("TS_ScoringParameters_read"))) TS_ScoringParameters_read(int8_tArray ser) { LDKu8slice ser_ref; ser_ref.datalen = ser->arr_len; - ser_ref.data = ser->elems; + ser_ref.data = ser->elems /* XXX ser leaks */; LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ"); *ret_conv = ScoringParameters_read(ser_ref); - return (uint64_t)ret_conv; + return (uintptr_t)ret_conv; } uint32_t __attribute__((export_name("TS_ScoringParameters_default"))) TS_ScoringParameters_default() { LDKScoringParameters ret_var = ScoringParameters_default(); - uint64_t ret_ref = 0; - CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this. - CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this. + uintptr_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 = (uint64_t)ret_var.inner; + ret_ref = (uintptr_t)ret_var.inner; if (ret_var.is_owned) { ret_ref |= 1; }